移动端-修改部分车型配置代码及完善销售订单价格信息上装信息及主车优惠

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodelappendix/BaseVehicleModelAppendixFeign.java

@@ -46,10 +46,10 @@ public interface BaseVehicleModelAppendixFeign {
     @ApiOperation("新增保存")
     @PostMapping("/save")
     public ResultBean save(@RequestBody BaseVehicleModelAppendixDto dto);
-      
+
     @ApiOperation("修改保存")
     @PostMapping("/update/{sid}")
-    public ResultBean update(@RequestBody BaseVehicleModelAppendixDto dto,@PathVariable("sid") String sid);
+    public ResultBean update(@RequestBody BaseVehicleModelAppendixDto dto, @PathVariable("sid") String sid);
 
     @ApiOperation("删除记录")
     @GetMapping("/del/{ids}")
@@ -58,8 +58,12 @@ public interface BaseVehicleModelAppendixFeign {
     @ApiOperation("获取一条记录")
     @GetMapping("/fetch/{id}")
     public ResultBean<BaseVehicleModelAppendixVo> fetch(@PathVariable("id") String id);
-      
+
     @ApiOperation("获取一条记录")
     @GetMapping("/fetchSid/{sid}")
     public ResultBean<BaseVehicleModelAppendixVo> fetchSid(@PathVariable("sid") String sid);
+
+    @ApiOperation("根据车型sid查询车型图片")
+    @GetMapping("/selectImage/{modelSid}")
+    ResultBean selectImage(@PathVariable(value = "modelSid") String modelSid);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodelappendix/BaseVehicleModelAppendixFeignFallback.java

@@ -67,4 +67,9 @@ public class BaseVehicleModelAppendixFeignFallback implements BaseVehicleModelAp
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口安瑞基础信息模块/basevehiclemodelappendix/fetchSid无法访问");
 	}
+
+	@Override
+	public ResultBean selectImage(String modelSid) {
+		return null;
+	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.base.biz.basevehicle;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
 import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig;
@@ -127,15 +128,18 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         if (count > 0) {
             return rb.setMsg("已存在该车架号的车辆信息");
         }
-        /*List<String> list = dto.getVehiclePhoto();
-        if (list.size() > 0) {
-            int i = baseVehicleAppendixService.saveAppendixFile(list, baseVehicle.getSid(), type);
-            if (i == 0) {
-                return rb.fail().setMsg("附件保存失败");
-            }
-        }*/
-        int i = baseVehicleService.updateBySid(dto.toMap(), sid);
-        if (i == 0) {
+        BeanUtil.copyProperties(dto,baseVehicle);
+        //锁定状态
+        String lockedStateKey = VehicleState.LockEnum.UN_LOCK.getCode();
+        String lockedStateValue = VehicleState.LockEnum.UN_LOCK.getRemarks();
+        baseVehicle.setLockedState(lockedStateKey);
+        baseVehicle.setLockedStateValue(lockedStateValue);
+        baseVehicle.setVehicleState(VehicleState.StockEnum.STOCK.getCode());
+        baseVehicle.setVehicleStateValue(VehicleState.StockEnum.STOCK.getRemarks());
+        baseVehicle.setSettlementStatus(VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
+        boolean isTrue = baseVehicleService.updateById(baseVehicle);
+//        int i = baseVehicleService.updateBySid(dto.toMap(), sid);
+        if (!isTrue) {
             return rb.setMsg("修改失败");
         }
         return rb.success().setMsg("修改成功");

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodelappendix/BaseVehicleModelAppendixMapper.java

@@ -43,4 +43,6 @@ public interface BaseVehicleModelAppendixMapper extends BaseMapper<BaseVehicleMo
 
 	@Select("select * from base_vehicle_model_appendix where modelSid = #{sid}")
 	List<BaseVehicleModelAppendixVo> fetchByVehModelSid(String sid);
+
+    String selectImage(String modelSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodelappendix/BaseVehicleModelAppendixMapper.xml

@@ -1,13 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixVo">
-		SELECT * FROM base_vehicle_model_appendix <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixVo">
-		SELECT * FROM base_vehicle_model_appendix <where> ${ew.sqlSegment} </where>
-	</select>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixVo">
+        SELECT *
+        FROM base_vehicle_model_appendix
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo"
+            resultType="com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixVo">
+        SELECT *
+        FROM base_vehicle_model_appendix
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectImage" resultType="java.lang.String">
+        select filePath
+        FROM base_vehicle_model_appendix
+        where modelSid = #{modelSid}
+        limit 1
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodelappendix/BaseVehicleModelAppendixRest.java

@@ -31,64 +31,69 @@ import java.util.List;
 @RequestMapping("v1/basevehiclemodelappendix")
 public class BaseVehicleModelAppendixRest implements BaseVehicleModelAppendixFeign {
 
-	@Autowired
-	private BaseVehicleModelAppendixService baseVehicleModelAppendixService;
+    @Autowired
+    private BaseVehicleModelAppendixService baseVehicleModelAppendixService;
 
-	@Override
-	public ResultBean<PagerVo<BaseVehicleModelAppendixVo>> listPage(@RequestBody PagerQuery<BaseVehicleModelAppendixQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<BaseVehicleModelAppendixVo> pv = baseVehicleModelAppendixService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
+    @Override
+    public ResultBean<PagerVo<BaseVehicleModelAppendixVo>> listPage(@RequestBody PagerQuery<BaseVehicleModelAppendixQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<BaseVehicleModelAppendixVo> pv = baseVehicleModelAppendixService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+    @Override
+    public ResultBean<List<BaseVehicleModelAppendixVo>> listAll(@RequestBody BaseVehicleModelAppendixQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        List<BaseVehicleModelAppendixVo> list = baseVehicleModelAppendixService.listAllVo(query);
+        return rb.success().setData(list);
+    }
+
+    @Override
+    public ResultBean<List<BaseVehicleModelAppendixVo>> list() {
+        ResultBean rb = ResultBean.fireFail();
+        List<BaseVehicleModelAppendixVo> list = baseVehicleModelAppendixService.listVo();
+        return rb.success().setData(list);
+    }
 
-	@Override
-	public ResultBean<List<BaseVehicleModelAppendixVo>> listAll(@RequestBody BaseVehicleModelAppendixQuery query){
-		ResultBean rb = ResultBean.fireFail();
-		List<BaseVehicleModelAppendixVo> list = baseVehicleModelAppendixService.listAllVo(query);
-		return rb.success().setData(list);
-	}
+    @Override
+    public ResultBean save(BaseVehicleModelAppendixDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        baseVehicleModelAppendixService.saveOrUpdateDto(dto);
+        return rb.success();
+    }
 
-	@Override
-	public ResultBean<List<BaseVehicleModelAppendixVo>> list(){
-		ResultBean rb = ResultBean.fireFail();
-		List<BaseVehicleModelAppendixVo> list = baseVehicleModelAppendixService.listVo();
-		return rb.success().setData(list);
-	}
+    @Override
+    public ResultBean update(BaseVehicleModelAppendixDto dto, String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        baseVehicleModelAppendixService.updateBySid(dto.toMap(), sid);
+        return rb.success();
+    }
 
-	@Override
-	public ResultBean save(BaseVehicleModelAppendixDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		baseVehicleModelAppendixService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
-      
     @Override
-	public ResultBean update(BaseVehicleModelAppendixDto dto,String sid){
-		ResultBean rb = ResultBean.fireFail();
-		baseVehicleModelAppendixService.updateBySid(dto.toMap(),sid);
-		return rb.success();
-	}
+    public ResultBean del(String ids) {
+        ResultBean rb = ResultBean.fireFail();
+        baseVehicleModelAppendixService.delByIds(ids);
+        return rb.success();
+    }
 
-	@Override
-	public ResultBean del(String ids){
-		ResultBean rb = ResultBean.fireFail();
-		baseVehicleModelAppendixService.delByIds(ids);
-		return rb.success();
-	}
+    @Override
+    public ResultBean<BaseVehicleModelAppendixVo> fetch(String id) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseVehicleModelAppendixVo vo = baseVehicleModelAppendixService.fetchByIdVo(id);
+        return rb.success().setData(vo);
+    }
 
-	@Override
-	public ResultBean<BaseVehicleModelAppendixVo> fetch(String id){
-		ResultBean rb = ResultBean.fireFail();
-		BaseVehicleModelAppendixVo vo = baseVehicleModelAppendixService.fetchByIdVo(id);
-		return rb.success().setData(vo);
-	}
+    @Override
+    public ResultBean<BaseVehicleModelAppendixVo> fetchSid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseVehicleModelAppendix baseVehicleModelAppendix = baseVehicleModelAppendixService.fetchBySid(sid);
+        BaseVehicleModelAppendixVo vo = new BaseVehicleModelAppendixVo();
+        BeanUtil.copyProperties(baseVehicleModelAppendix, vo);
+        return rb.success().setData(vo);
+    }
 
-	@Override
-	public ResultBean<BaseVehicleModelAppendixVo> fetchSid(String sid) {
-		ResultBean rb = ResultBean.fireFail();
-		BaseVehicleModelAppendix baseVehicleModelAppendix = baseVehicleModelAppendixService.fetchBySid(sid);
-		BaseVehicleModelAppendixVo vo = new BaseVehicleModelAppendixVo();
-		BeanUtil.copyProperties(baseVehicleModelAppendix, vo);
-		return rb.success().setData(vo);
-	}
+    @Override
+    public ResultBean selectImage(String modelSid) {
+        return baseVehicleModelAppendixService.selectImage(modelSid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodelappendix/BaseVehicleModelAppendixService.java

@@ -7,11 +7,14 @@ import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendix;
 import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixDto;
 import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixQuery;
 import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixVo;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -31,70 +34,88 @@ import java.util.List;
  */
 @Service
 public class BaseVehicleModelAppendixService extends MybatisBaseService<BaseVehicleModelAppendixMapper, BaseVehicleModelAppendix> {
-	public PagerVo<BaseVehicleModelAppendix> listPage(PagerQuery<BaseVehicleModelAppendixQuery> pq) {
-		BaseVehicleModelAppendixQuery query = pq.getParams();
-		QueryWrapper<BaseVehicleModelAppendix> qw = createQueryWrapper(query);
-		IPage<BaseVehicleModelAppendix> page = PagerUtil.queryToPage(pq);
-		IPage<BaseVehicleModelAppendix> pagging = baseMapper.selectPage(page, qw);
-		PagerVo<BaseVehicleModelAppendix> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	public List<BaseVehicleModelAppendix> listAll(BaseVehicleModelAppendixQuery query) {
-		QueryWrapper<BaseVehicleModelAppendix> qw = createQueryWrapper(query);
-		return baseMapper.selectList(qw);
-	}
-	private QueryWrapper<BaseVehicleModelAppendix> createQueryWrapper(BaseVehicleModelAppendixQuery query) {
-		// todo: 这里根据具体业务调整查询条件
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-		QueryWrapper<BaseVehicleModelAppendix> qw = new QueryWrapper<>();
-
-
-		if (StringUtils.isNotBlank(query.getModelSid())) {
-			qw.eq("modelSid", query.getModelSid());
-		}
-
-		if (StringUtils.isNotBlank(query.getFilePath())) {
-			qw.eq("filePath", query.getFilePath());
-		}
-		return qw;
-	}
-	
-	public PagerVo<BaseVehicleModelAppendixVo> listPageVo(PagerQuery<BaseVehicleModelAppendixQuery> pq) {
-		BaseVehicleModelAppendixQuery query = pq.getParams();
-		QueryWrapper<BaseVehicleModelAppendix> qw = createQueryWrapper(query);
-		IPage<BaseVehicleModelAppendix> page = PagerUtil.queryToPage(pq);
-		IPage<BaseVehicleModelAppendixVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<BaseVehicleModelAppendixVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	
-	public List<BaseVehicleModelAppendixVo> listAllVo(BaseVehicleModelAppendixQuery query) {
-		QueryWrapper<BaseVehicleModelAppendix> qw = createQueryWrapper(query);
-		return baseMapper.selectListAllVo(qw);
-	}
-	
-	public List<BaseVehicleModelAppendixVo> listVo() {
-		return baseMapper.selectListVo();
-	}
-	
-	public void saveOrUpdateDto(BaseVehicleModelAppendixDto dto){
-		BaseVehicleModelAppendix entity = new BaseVehicleModelAppendix();
-		dto.fillEntity(entity);
-		this.saveOrUpdate(entity);
-	}
-	
-	public BaseVehicleModelAppendixVo fetchByIdVo(String id){
-		BaseVehicleModelAppendix entity = this.fetchById(id);
-		BaseVehicleModelAppendixVo vo = new BaseVehicleModelAppendixVo();
-		BeanUtil.copyProperties(entity, vo);
-		return vo;
-	}
-
-	public List<BaseVehicleModelAppendixVo> fetchByVehModelSid(String sid) {
-		return baseMapper.fetchByVehModelSid(sid);
-	}
-
-	public void deleteByVehModelSid(String sid) {
-		baseMapper.deleteByVehModelSid(sid);
-	}
+
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+
+    public PagerVo<BaseVehicleModelAppendix> listPage(PagerQuery<BaseVehicleModelAppendixQuery> pq) {
+        BaseVehicleModelAppendixQuery query = pq.getParams();
+        QueryWrapper<BaseVehicleModelAppendix> qw = createQueryWrapper(query);
+        IPage<BaseVehicleModelAppendix> page = PagerUtil.queryToPage(pq);
+        IPage<BaseVehicleModelAppendix> pagging = baseMapper.selectPage(page, qw);
+        PagerVo<BaseVehicleModelAppendix> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public List<BaseVehicleModelAppendix> listAll(BaseVehicleModelAppendixQuery query) {
+        QueryWrapper<BaseVehicleModelAppendix> qw = createQueryWrapper(query);
+        return baseMapper.selectList(qw);
+    }
+
+    private QueryWrapper<BaseVehicleModelAppendix> createQueryWrapper(BaseVehicleModelAppendixQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<BaseVehicleModelAppendix> qw = new QueryWrapper<>();
+
+
+        if (StringUtils.isNotBlank(query.getModelSid())) {
+            qw.eq("modelSid", query.getModelSid());
+        }
+
+        if (StringUtils.isNotBlank(query.getFilePath())) {
+            qw.eq("filePath", query.getFilePath());
+        }
+        return qw;
+    }
+
+    public PagerVo<BaseVehicleModelAppendixVo> listPageVo(PagerQuery<BaseVehicleModelAppendixQuery> pq) {
+        BaseVehicleModelAppendixQuery query = pq.getParams();
+        QueryWrapper<BaseVehicleModelAppendix> qw = createQueryWrapper(query);
+        IPage<BaseVehicleModelAppendix> page = PagerUtil.queryToPage(pq);
+        IPage<BaseVehicleModelAppendixVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<BaseVehicleModelAppendixVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public List<BaseVehicleModelAppendixVo> listAllVo(BaseVehicleModelAppendixQuery query) {
+        QueryWrapper<BaseVehicleModelAppendix> qw = createQueryWrapper(query);
+        return baseMapper.selectListAllVo(qw);
+    }
+
+    public List<BaseVehicleModelAppendixVo> listVo() {
+        return baseMapper.selectListVo();
+    }
+
+    public void saveOrUpdateDto(BaseVehicleModelAppendixDto dto) {
+        BaseVehicleModelAppendix entity = new BaseVehicleModelAppendix();
+        dto.fillEntity(entity);
+        this.saveOrUpdate(entity);
+    }
+
+    public BaseVehicleModelAppendixVo fetchByIdVo(String id) {
+        BaseVehicleModelAppendix entity = this.fetchById(id);
+        BaseVehicleModelAppendixVo vo = new BaseVehicleModelAppendixVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    public List<BaseVehicleModelAppendixVo> fetchByVehModelSid(String sid) {
+        return baseMapper.fetchByVehModelSid(sid);
+    }
+
+    public void deleteByVehModelSid(String sid) {
+        baseMapper.deleteByVehModelSid(sid);
+    }
+
+    public ResultBean selectImage(String modelSid) {
+        ResultBean rb = ResultBean.fireFail();
+        String image = baseMapper.selectImage(modelSid);
+        if (StringUtils.isNotBlank(image)) {
+            if (!image.contains(fileUploadComponent.getUrlPrefix())) {
+                image = fileUploadComponent.getUrlPrefix() + image;
+            }
+            return rb.success().setData(image);
+        }
+        return rb;
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppModelInfoVo.java

@@ -18,5 +18,7 @@ public class AppModelInfoVo implements Vo {
     private String price;
     @ApiModelProperty("数量")
     private String number;
+    @ApiModelProperty(value = "车型sid:后端内部使用")
+    private String modelSid;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/app/AppOrderInfoDto.java

@@ -17,22 +17,16 @@ import java.util.List;
 public class AppOrderInfoDto implements Dto {
     private static final long serialVersionUID = 37103730602607567L;
     @ApiModelProperty(value = "车型sid")
-//    @JsonProperty(value = "modelSid")
     private String modelSid;
     @ApiModelProperty(value = "配置sid")
-//    @JsonProperty(value = "configSid")
     private String modelConfigSid;
     @ApiModelProperty(value = "车型名称")
-//    @JsonProperty(value = "modelName")
     private String modelName;
     @ApiModelProperty(value = "常用配置")
-//    @JsonProperty(value = "commonlyConfig")
     private String config;
     @ApiModelProperty(value = "更多配置")
-//    @JsonProperty(value = "moreConfig")
     private String moreConfig;
     @ApiModelProperty(value = "特殊说明")
-//    @JsonProperty(value = "specialInstructions")
     private String specialConfig;
     @ApiModelProperty(value = "已选择的现车列表")
     private List<AppBusSalesOrderVehicleDto> nowCarList;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -73,7 +73,8 @@
         SELECT bm.modelName       AS model,
                bm.brandName       AS brand,
                p.singleFinalPrice AS price,
-               p.quantity         as number
+               p.quantity         as number,
+               bm.modelSid
         from bus_sales_order_model bm
                  left join bus_sales_order_price p on bm.salesOrderSid = p.salesOrderSid
         where bm.salesOrderSid = #{saleOrderSid}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -36,6 +36,7 @@ import com.yxt.anrui.base.api.basepostprice.BaseOrderPostPriceVo;
 import com.yxt.anrui.base.api.basepostprice.BasePostPriceFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
+import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixFeign;
 import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyFeign;
 import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePriceVo;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
@@ -184,6 +185,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
 
     @Autowired
     private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private BaseVehicleModelAppendixFeign baseVehicleModelAppendixFeign;
 
     /**
      * 构造查询条件
@@ -1194,6 +1197,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 if (StringUtils.isBlank(appModelInfo.getPrice())) {
                     appModelInfo.setPrice("-");
                 }
+                //根据车型查询车型图片
+                ResultBean imageString = baseVehicleModelAppendixFeign.selectImage(appModelInfo.getModelSid());
+                if (imageString.getSuccess()) {
+                    appModelInfo.setCarImage(imageString.getData().toString());
+                }
                 record.setModelInfo(appModelInfo);
             }
             //是否保险

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.java

@@ -100,7 +100,7 @@ public interface BusSalesOrderDiscountMapper extends BaseMapper<BusSalesOrderDis
      * @param numAll         数量
      * @return
      */
-    int updateNum(@Param("sid") String salesOrderSid, @Param("policySid") String salesPolicySid, @Param("num") int numAll);
+    int updateNum(@Param("sid") String salesOrderSid, @Param("policySid") String salesPolicySid, @Param("num") int numAll,@Param("totalValue")String totalValue);
 
     /**
      * 根据销售订单sid查询主车优惠

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.xml

@@ -44,7 +44,8 @@
 
     <update id="updateNum">
         update bus_sales_order_discount
-        set num = #{num}
+        set num        = #{num},
+            totalValue = #{totalValue}
         where salesPolicySid = #{policySid}
           and salesOrderSid = #{sid}
     </update>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountService.java

@@ -138,7 +138,9 @@ public class BusSalesOrderDiscountService extends MybatisBaseService<BusSalesOrd
             save(busSalesOrderDiscount);
         } else {
             int numAll = busSalesOrderDiscount1.getNum() + Integer.parseInt(appDiscountInfoDto.getNum());
-            baseMapper.updateNum(salesOrderSid, salesPolicySid, numAll);
+            BigDecimal bigDecimal = new BigDecimal(appDiscountInfoDto.getPrice());
+            bigDecimal = bigDecimal.multiply(new BigDecimal(String.valueOf(numAll)));
+            baseMapper.updateNum(salesOrderSid, salesPolicySid, numAll,bigDecimal.toString());
         }
 
         return rb.success().setMsg("成功");

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java

@@ -34,13 +34,18 @@ import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetail
 import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDto;
 import com.yxt.anrui.buscenter.api.bussalesordermakeup.app.AppBusSalesOrderMakeUpDto;
 import com.yxt.anrui.buscenter.api.bussalesordermakeup.app.AppBusSalesOrderMakeUpVo;
+import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
+import com.yxt.anrui.buscenter.biz.bussalesordermodel.BusSalesOrderModelService;
+import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
 
@@ -62,6 +67,10 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
 
     @Autowired
     private BusSalesOrderService busSalesOrderService;
+    @Autowired
+    private BusSalesOrderModelService busSalesOrderModelService;
+    @Autowired
+    private BusSalesOrderPriceService busSalesOrderPriceService;
 
     public void saveMake(BusSalesOrderMakeupDto busSalesOrderMakeupDto, String sid) {
         BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup();
@@ -115,6 +124,59 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
             }
             save(busSalesOrderMakeup);
         }
+        //查询该销售订单是否有车型信息
+        BigDecimal bigDecimal = new BigDecimal("0");
+        BigDecimal bigDecimal1 = new BigDecimal("0");
+        BusSalesOrderModelDetailsVo modelDetailsVo = busSalesOrderModelService.details(salesOrderSid);
+        if (modelDetailsVo != null) {
+            if (StringUtils.isNotBlank(modelDetailsVo.getGuildPrice())) {
+                bigDecimal = bigDecimal.add(new BigDecimal(modelDetailsVo.getGuildPrice()));
+            }
+            if (StringUtils.isNotBlank(modelDetailsVo.getFinalPrice())) {
+                bigDecimal1 = bigDecimal1.add(new BigDecimal(modelDetailsVo.getFinalPrice()));
+            }
+        }
+        if (StringUtils.isNotBlank(dto.getTopPrice())) {
+            bigDecimal = bigDecimal.add(new BigDecimal(dto.getTopPrice()));
+            bigDecimal1 = bigDecimal1.add(new BigDecimal(dto.getTopPrice()));
+        }
+        //查询是否有销售订单的价格信息。若有则更新销售指导价、销售成交价
+        BusSalesOrderPrice price = busSalesOrderPriceService.selectBySalesOrderSid(salesOrderSid);
+        if (price != null) {
+            if (!"0".equals(bigDecimal.toString())) {
+                if (!"0".equals(bigDecimal1.toString())) {
+                    price.setSingleFinalPrice(bigDecimal1);
+                    price.setSingleGuildPrice(bigDecimal);
+                    busSalesOrderPriceService.updateById(price);
+                } else {
+                    price.setSingleGuildPrice(bigDecimal);
+                    busSalesOrderPriceService.updateById(price);
+                }
+            } else {
+                if (!"0".equals(bigDecimal1.toString())) {
+                    price.setSingleFinalPrice(bigDecimal1);
+                    busSalesOrderPriceService.updateById(price);
+                }
+            }
+        } else {
+            price = new BusSalesOrderPrice();
+            if (!"0".equals(bigDecimal.toString())) {
+                price.setSalesOrderSid(salesOrderSid);
+                if (!"0".equals(bigDecimal1.toString())) {
+                    price.setSingleFinalPrice(bigDecimal1);
+                    price.setSingleGuildPrice(bigDecimal);
+                    busSalesOrderPriceService.save(price);
+                } else {
+                    price.setSingleGuildPrice(bigDecimal);
+                    busSalesOrderPriceService.save(price);
+                }
+            } else {
+                if (!"0".equals(bigDecimal1.toString())) {
+                    price.setSingleFinalPrice(bigDecimal1);
+                    busSalesOrderPriceService.save(price);
+                }
+            }
+        }
         return rb.success().setMsg("成功");
     }