移动端销售订单完善及pc端销售订单完善

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderCountQuery.java

@@ -22,7 +22,7 @@ public class PcBaseVehicleOrderCountQuery implements Query {
     @ApiModelProperty(value = "客户sid")
     private String customerSid;
 
-    @ApiModelProperty(value = "类型：1意向车型选择、2虚拟订单选择、3车型选择")
-    private Integer type;
+/*    @ApiModelProperty(value = "类型：1意向车型选择、2虚拟订单选择、3车型选择")
+    private Integer type;*/
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java

@@ -1,8 +1,6 @@
 package com.yxt.anrui.base.api.basevehiclemodel;
 
-import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixDto;
 import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.FileUploadResult;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
@@ -39,7 +37,8 @@ public interface BaseVehicleModelFeign {
 
     /**
      * 分页查询
-     *listPageByVehmodel
+     * listPageByVehmodel
+     *
      * @param pagerQuery
      * @return
      */
@@ -85,7 +84,7 @@ public interface BaseVehicleModelFeign {
     @ApiOperation("删除、批量删除")
     @DeleteMapping("/deleteBySids")
     @ApiImplicitParam(name = "sids", value = "车型sid，若为多个sid，以逗号分隔")
-    public ResultBean deleteBySids(@RequestParam("sids") String sids,@RequestParam("userSid") String userSid);
+    public ResultBean deleteBySids(@RequestParam("sids") String sids, @RequestParam("userSid") String userSid);
 
     /**
      * 详情
@@ -95,7 +94,7 @@ public interface BaseVehicleModelFeign {
      */
     @ApiOperation("详情")
     @GetMapping("/details/{sid}/{useOrgSid}")
-    public ResultBean<BaseVehicleModelDetailsVo> details(@PathVariable("sid") String sid,@PathVariable("useOrgSid") String useOrgSid);
+    public ResultBean<BaseVehicleModelDetailsVo> details(@PathVariable("sid") String sid, @PathVariable("useOrgSid") String useOrgSid);
 
     /**
      * 修改回显
@@ -105,7 +104,7 @@ public interface BaseVehicleModelFeign {
      */
     @ApiOperation("修改回显")
     @GetMapping("/getAll/{sid}/{userSid}")
-    public ResultBean<BaseVehicleModelSelectVo> getAll(@PathVariable("sid") String sid,@PathVariable("userSid") String userSid);
+    public ResultBean<BaseVehicleModelSelectVo> getAll(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid);
 
 
     /**
@@ -203,4 +202,7 @@ public interface BaseVehicleModelFeign {
     @PostMapping("/selectVehModelByConfigSid")
     public ResultBean<PagerVo<BaseVehicleModelVo>> selectVehModelByConfigSid(@RequestBody PagerQuery<BaseVehicleModelQuery> pagerQuery);
 
+    @ApiOperation("根据车型sid查询车型信息")
+    @GetMapping("/selectDetails/{modelSid}")
+    ResultBean<BaseVehicleModel> selectDetails(@PathVariable(value = "modelSid") String modelSid);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java

@@ -1,7 +1,6 @@
 package com.yxt.anrui.base.api.basevehiclemodel;
 
 import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.FileUploadResult;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
@@ -111,6 +110,11 @@ public class BaseVehicleModelFeignFallback implements BaseVehicleModelFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<BaseVehicleModel> selectDetails(String modelSid) {
+        return null;
+    }
+
 
     /*@Override
     public ResultBean<PagerVo<BaseVehicleModelListVo>> selectPage(PagerQuery<BaseVehicleModelListQuery> query) {

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

@@ -466,7 +466,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     public AppCurrentCarDetailConfigVo getAppCurrentCarDetailConfigVo(String modelSid, String configSid, String userSid) {
         String useOrg = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         AppCurrentCarDetailConfigVo configDetailVo = baseMapper.getAppModelConfig(modelSid, configSid, useOrg);
-        if(configDetailVo != null){
+        if (configDetailVo != null) {
             String date = configDetailVo.getDate();
             if (StringUtils.isNotBlank(date)) {
                 Date date1 = DateUtils.dateStrConvertDate(date, "yyyy-MM-dd");
@@ -1318,7 +1318,10 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (query != null) {
             qw.eq("bv.modelSid", query.getModelSid());//车型sid
             qw.eq("bv.modelConfigSid", query.getModelConfigSid());//配置sid
-            if (query.getType() == 2) {
+            String orgSid = sysStaffOrgFeign.selectSidPathByStaffSid(query.getStaffSid()).getData();
+            qw.eq("bv.useOrg", orgSid);
+            qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode());
+           /* if (query.getType() == 2) {
                 //根据业务员sid和客户sid查询所有的虚拟虚拟订单的车辆
                 PcBusMainDepositVehicleQuery vehicleQuery = new PcBusMainDepositVehicleQuery();
                 vehicleQuery.setCustomerSid(query.getCustomerSid());
@@ -1329,7 +1332,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
                 if (stringList.getSuccess()) {
                     qw.in("bv.sid", stringList.getData());
                 }
-            }
+            }*/
         }
         int count = baseMapper.selectVehicleCount(qw);
         return rb.success().setData(count);
@@ -1339,7 +1342,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     public ResultBean<List<AppBaseVehicleOrderVo>> selectAppList(String modelSid, String configSid, String orgSid) {
         ResultBean<List<AppBaseVehicleOrderVo>> rb = ResultBean.fireFail();
         List<AppBaseVehicleOrderVo> orderVoList = new ArrayList<>();
-        orderVoList = baseMapper.selectAppList(modelSid, configSid, orgSid,VehicleState.StockEnum.STOCK.getCode());
+        orderVoList = baseMapper.selectAppList(modelSid, configSid, orgSid, VehicleState.StockEnum.STOCK.getCode());
         if (orderVoList.isEmpty()) {
             return rb.setData(orderVoList);
         }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java

@@ -7,7 +7,6 @@ import com.yxt.anrui.base.api.basevehiclemodel.*;
 import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendix;
 import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixVo;
 import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
-import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
 import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService;
 import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService;
@@ -117,7 +116,7 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
             return rb.setMsg("文件为空");
         }
         rb = fileUploadComponent.uploadFile(file);
-        FileUploadResult data = (FileUploadResult)rb.getData();
+        FileUploadResult data = (FileUploadResult) rb.getData();
         BaseVehicleModelAppendix baseVehicleModelAppendix = new BaseVehicleModelAppendix();
         baseVehicleModelAppendix.setModelSid(modelSid);
         baseVehicleModelAppendix.setFilePath(data.getFilePath());
@@ -126,17 +125,17 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
     }
 
     @Override
-    public ResultBean deleteBySids(String sids,String userSid) {
+    public ResultBean deleteBySids(String sids, String userSid) {
         List<String> sidList = Arrays.asList(sids.split(","));
         for (String sid : sidList) {
             int i = baseVehmodelConfigService.checkByModelSid(sid);
-            if (i > 0){
+            if (i > 0) {
                 return ResultBean.fireFail().setMsg("该车型已有关联配置，无法删除");
             }
             ResultBean<SysOrganizationVo> useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid);
             String sid1 = useOrgByUserSid.getData().getSid();
             int i1 = baseVehicleModelService.checkByCreateOrgAndModelSid(sid1, sid);
-            if (i1 == 0){
+            if (i1 == 0) {
                 return ResultBean.fireFail().setMsg("该车型不属于当前分公司，无法删除");
             }
             int count = baseVehicleModelService.updateBySidIsDelete(sid);
@@ -153,9 +152,9 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
     }
 
     @Override
-    public ResultBean<BaseVehicleModelDetailsVo> details(String sid,String useOrgSid) {
+    public ResultBean<BaseVehicleModelDetailsVo> details(String sid, String useOrgSid) {
         ResultBean rb = ResultBean.fireFail();
-        BaseVehicleModelDetailsVo vo = baseVehicleModelService.details(sid,useOrgSid);
+        BaseVehicleModelDetailsVo vo = baseVehicleModelService.details(sid, useOrgSid);
         if (vo == null) {
             return rb.setMsg("该车型信息不存在");
         }
@@ -163,20 +162,20 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
     }
 
     @Override
-    public ResultBean<BaseVehicleModelSelectVo> getAll(String sid,String userSid) {
+    public ResultBean<BaseVehicleModelSelectVo> getAll(String sid, String userSid) {
         ResultBean rb = ResultBean.fireFail();
         BaseVehicleModelSelectVo vo = baseVehicleModelService.getAll(sid);
         if (vo == null) {
             return rb.setMsg("该车型信息不存在");
         }
         int i3 = baseVehmodelConfigService.checkByModelSid(sid);
-        if (i3 > 0){
+        if (i3 > 0) {
             return rb.setMsg("该车型已有关联配置，无法修改");
         }
         ResultBean<SysOrganizationVo> useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid);
         String sid1 = useOrgByUserSid.getData().getSid();
         int i4 = baseVehicleModelService.checkByCreateOrgAndModelSid(sid1, sid);
-        if (i4 == 0){
+        if (i4 == 0) {
             return rb.setMsg("该车型不属于当前分公司，无法修改");
         }
         return rb.success().setData(vo);
@@ -279,6 +278,11 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
         return rb.success().setData(pv1);
     }
 
+    @Override
+    public ResultBean<BaseVehicleModel> selectDetails(String modelSid) {
+        return baseVehicleModelService.selectDetails(modelSid);
+    }
+
 
 //    @Override
 //    public ResultBean<PagerVo<BaseVehicleModelListVo>> selectPage(PagerQuery<BaseVehicleModelListQuery> query) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java

@@ -85,7 +85,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
         QueryWrapper<BaseVehicleModelVo> qw = new QueryWrapper<>();
         if (pagerQuery != null) {
             qw.eq("bvm.isDelete", "0");
-            qw.like("bvb.useOrg",pagerQuery.getCreateOrgSId());
+            qw.like("bvb.useOrg", pagerQuery.getCreateOrgSId());
             if (StringUtils.isNotBlank(pagerQuery.getModelSid())) {//车型sid
                 qw.eq("bvm.sid", pagerQuery.getModelSid());
             }
@@ -141,7 +141,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
      * @param sid 车型sid
      * @return
      */
-    public BaseVehicleModelDetailsVo details(String sid,String useOrgSid) {
+    public BaseVehicleModelDetailsVo details(String sid, String useOrgSid) {
         BaseVehicleModel baseVehicleModel = this.fetchBySid(sid);
         BaseVehicleModelDetailsVo baseVehicleModelDetailsVo = baseMapper.details(sid);
         if (StringUtils.isNotBlank(baseVehicleModel.getUseOrg())) {//使用组织sid
@@ -161,8 +161,8 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
         }
         List<BaseModelConfigVo> baseModelConfigVos = new ArrayList<>();
 
-        List<BaseVehmodelConfigVo> baseVehmodelConfigVos = baseVehmodelConfigService.getVehModByModelSid(sid,useOrgSid);
-        if (baseVehmodelConfigVos.size() > 0){
+        List<BaseVehmodelConfigVo> baseVehmodelConfigVos = baseVehmodelConfigService.getVehModByModelSid(sid, useOrgSid);
+        if (baseVehmodelConfigVos.size() > 0) {
             for (BaseVehmodelConfigVo baseVehmodelConfigVo : baseVehmodelConfigVos) {
                 BaseModelConfigVo baseModelConfigVo = new BaseModelConfigVo();
                 String configurationItemsSid = baseVehmodelConfigVo.getConfigurationItemsSid();
@@ -278,9 +278,9 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
         return baseMapper.getList();
     }
 
-    public List<Map<String,String>> getListByVeSid(String vehicleSid,String userSid) {
+    public List<Map<String, String>> getListByVeSid(String vehicleSid, String userSid) {
         ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
-        return baseMapper.getListByVeSid(vehicleSid,resultBean.getData());
+        return baseMapper.getListByVeSid(vehicleSid, resultBean.getData());
     }
 
     public BaseVehicleModelSelectVo getAll(String sid) {
@@ -329,7 +329,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
 
     public List<Map<String, Object>> selectDownPlusByModelName(String modelName) {
         QueryWrapper<Map<String, Object>> qw = new QueryWrapper<>();
-        qw.eq("bvm.isDelete",0);
+        qw.eq("bvm.isDelete", 0);
         if (StringUtils.isNotBlank(modelName)) {
             qw.like("bvm.modelName", modelName);
         }
@@ -502,11 +502,11 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
             String sid1 = entity.getSid();
             BeanUtil.copyProperties(dto, entity);
             entity.setSid(sid1);
-            entity.setModelName(entity.getVehicleTypeValue()+entity.getProductLineValue()+entity.getDriveFormValue()+entity.getGearboxTypeValue()+entity.getVehicleVersionValue()+entity.getPowerValue()+entity.getFuelTypeValue()+entity.getEngineTypeValue()+entity.getEmissionStandardValue()+entity.getMarketSegmentsValue()+entity.getSpecifications()+entity.getDepartmentValue());
+            entity.setModelName(entity.getVehicleTypeValue() + entity.getProductLineValue() + entity.getDriveFormValue() + entity.getGearboxTypeValue() + entity.getVehicleVersionValue() + entity.getPowerValue() + entity.getFuelTypeValue() + entity.getEngineTypeValue() + entity.getEmissionStandardValue() + entity.getMarketSegmentsValue() + entity.getSpecifications() + entity.getDepartmentValue());
             entity.setVehicleAlias(dto.getProductLineValue() + " " + dto.getDriveFormValue() + " " + dto.getVehicleTypeValue() + " " + dto.getPowerValue());
             String modelName = entity.getModelName();
             int i = baseMapper.checkSaveByModelName(modelName);
-            if (i > 0){
+            if (i > 0) {
                 return rb.setMsg("该车型信息已存在");
             }
             entity.setCreateOrg(sid2);
@@ -532,11 +532,11 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
         if (baseVehicleModel == null) {
             return rb.setMsg("该车型信息不存在");
         }
-        dto.setModelName(dto.getVehicleTypeValue()+dto.getProductLineValue()+dto.getDriveFormValue()+dto.getGearboxTypeValue()+dto.getVehicleVersionValue()+dto.getPowerValue()+dto.getFuelTypeValue()+dto.getEngineTypeValue()+dto.getEmissionStandardValue()+dto.getMarketSegmentsValue()+dto.getSpecifications()+dto.getDepartmentValue());
+        dto.setModelName(dto.getVehicleTypeValue() + dto.getProductLineValue() + dto.getDriveFormValue() + dto.getGearboxTypeValue() + dto.getVehicleVersionValue() + dto.getPowerValue() + dto.getFuelTypeValue() + dto.getEngineTypeValue() + dto.getEmissionStandardValue() + dto.getMarketSegmentsValue() + dto.getSpecifications() + dto.getDepartmentValue());
         dto.setVehicleAlias(dto.getProductLineValue() + " " + dto.getDriveFormValue() + " " + dto.getVehicleTypeValue() + " " + dto.getPowerValue());
         String modelName = dto.getModelName();
-        int i = baseMapper.checkUpdateByModelName(modelName,sid);
-        if (i > 0){
+        int i = baseMapper.checkUpdateByModelName(modelName, sid);
+        if (i > 0) {
             return rb.setMsg("该车型信息已存在");
         }
         int i2 = updateBySid(dto.toMap(), sid);
@@ -573,22 +573,22 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
         QueryWrapper<VehModelVo> qw = new QueryWrapper<>();
-        qw.eq("bvm.carBrand",query.getBrandSid());
-        if (StringUtils.isNotBlank(query.getModelName())){
-            qw.like("bvm.modelName",query.getModelName());
+        qw.eq("bvm.carBrand", query.getBrandSid());
+        if (StringUtils.isNotBlank(query.getModelName())) {
+            qw.like("bvm.modelName", query.getModelName());
         }
-        if (StringUtils.isNotBlank(query.getConfigName())){
-            qw.like("bmc.configName",query.getConfigName());
+        if (StringUtils.isNotBlank(query.getConfigName())) {
+            qw.like("bmc.configName", query.getConfigName());
         }
         return qw;
     }
 
     public IPage<BaseVehicleModelVo> selectVehModelByConfigSid(PagerQuery<BaseVehicleModelQuery> pagerQuery) {
         List<BaseVehicleModelVo> baseVehicleModelVos = new ArrayList<>();
-        IPage<BaseVehicleModelVo> baseVehicleModelVo  = new Page<>();
+        IPage<BaseVehicleModelVo> baseVehicleModelVo = new Page<>();
         BaseVehicleModelQuery params = pagerQuery.getParams();
         IPage<BaseVehicleModelQuery> page = PagerUtil.queryToPage(pagerQuery);
-        List<BaseVehmodelConfigVo> baseVehmodelConfigVos = baseVehmodelConfigService.getListByConfigSidAndUseOrgSid(params.getConfigSid(),params.getCreateOrgSId());
+        List<BaseVehmodelConfigVo> baseVehmodelConfigVos = baseVehmodelConfigService.getListByConfigSidAndUseOrgSid(params.getConfigSid(), params.getCreateOrgSId());
         for (BaseVehmodelConfigVo baseVehmodelConfigVo : baseVehmodelConfigVos) {
             String modelSid = baseVehmodelConfigVo.getModelSid();
             params.setModelSid(modelSid);
@@ -610,6 +610,15 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
     }
 
     public int checkByCreateOrgAndModelSid(String sid1, String sid) {
-        return baseMapper.checkByCreateOrgAndModelSid(sid1,sid);
+        return baseMapper.checkByCreateOrgAndModelSid(sid1, sid);
+    }
+
+    public ResultBean<BaseVehicleModel> selectDetails(String modelSid) {
+        ResultBean<BaseVehicleModel> rb = ResultBean.fireFail();
+        BaseVehicleModel baseVehicleModel = fetchBySid(modelSid);
+        if (baseVehicleModel == null) {
+            return rb.setData(new BaseVehicleModel());
+        }
+        return rb.success().setData(baseVehicleModel);
     }
 }

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

@@ -50,9 +50,7 @@ import lombok.Data;
 @ApiModel(value = "销售订单-主车车型 视图数据详情", description = "销售订单-主车车型 视图数据详情")
 public class BusSalesOrderModelDetailsVo implements Vo {
 
-    @ApiModelProperty(value = "类型")
-    private Integer type;
-
+    private static final long serialVersionUID = -6137096646061858887L;
     @ApiModelProperty("车型sid")
     private String modelSid;
     @ApiModelProperty("配置sid")

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

@@ -290,6 +290,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if ("1".equals(entity.getIsTop())) {
             BusSalesOrderMakeupDetailsVo busSalesOrderMakeupDetailsVo = busSalesOrderMakeupService.details(entity.getSid());
             if (busSalesOrderMakeupDetailsVo != null) {
+                if (StringUtils.isNotBlank(busSalesOrderMakeupDetailsVo.getContractPath())) {
+                    List<String> imageList = Arrays.asList(busSalesOrderMakeupDetailsVo.getContractPath().split(","));
+                    if (!imageList.isEmpty()) {
+                        busSalesOrderMakeupDetailsVo.setContractPath(imageList.get(0));
+                    }
+
+                }
                 vo.setBusSalesOrderMakeup(busSalesOrderMakeupDetailsVo);
             }
         }
@@ -1048,7 +1055,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             //查询是否有价格信息
             BusSalesOrderPriceDetailsVo priceDetailsVo = busSalesOrderPriceService.details(saleOrderSid);
             if (priceDetailsVo != null) {
-                if (priceDetailsVo.getSingleFinalPrice() != null) {
+                if (StringUtils.isNotBlank(priceDetailsVo.getSingleFinalPrice()) && StringUtils.isNotBlank(busSalesOrderModelDetailsVo.getFinalPrice())) {
                     vo.setPriceInfoState(1);
                 } else {
                     vo.setPriceInfoState(0);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml

@@ -21,8 +21,7 @@
                guildPrice,
                finalPrice,
                brandName,
-               brandSid,
-               type
+               brandSid
         from bus_sales_order_model
         where salesOrderSid = #{sid}
     </select>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java

@@ -26,6 +26,8 @@
 package com.yxt.anrui.buscenter.biz.bussalesordermodel;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
+import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppOrderInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo;
@@ -78,6 +80,8 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
     private BusSalesOrderPriceService busSalesOrderPriceService;
     @Autowired
     private BusSalesOrderMakeupService busSalesOrderMakeupService;
+    @Autowired
+    private BaseVehicleModelFeign baseVehicleModelFeign;
 
 
     public void saveModel(BusSalesOrderModelDto busSalesOrderModelDto, String sid) {
@@ -141,6 +145,16 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
             return rb.setMsg("该销售订单单据不存在");
         }
         AppOrderInfoDto orderInfo = dto.getOrderInfo();
+        String brandSid = "";
+        String brandName = "";
+        String modelAlias = "";
+        //根据车型sid查询车型的品牌和品牌名称
+        ResultBean<BaseVehicleModel> resultBean = baseVehicleModelFeign.selectDetails(dto.getOrderInfo().getModelSid());
+        if (resultBean.getSuccess()) {
+            brandSid = resultBean.getData().getCarBrand();
+            brandName = resultBean.getData().getBrandName();
+            modelAlias = resultBean.getData().getModelName();
+        }
         //根据销售订单查询车型信息
         BusSalesOrderModel busSalesOrderModel = baseMapper.selectBySalesSid(salesOrderSid);
         if (busSalesOrderModel == null) {
@@ -149,11 +163,17 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                 BeanUtil.copyProperties(orderInfo, busSalesOrderModel1, "sid");
                 busSalesOrderModel1.setSalesOrderSid(salesOrderSid);
                 busSalesOrderModel1.setGuildPrice(new BigDecimal(guildPrice));
+                busSalesOrderModel1.setBrandName(brandName);
+                busSalesOrderModel1.setBrandSid(brandSid);
+                busSalesOrderModel1.setModelConfig(modelAlias);
                 save(busSalesOrderModel1);
             }
         } else {
             BeanUtil.copyProperties(orderInfo, busSalesOrderModel, "sid");
             busSalesOrderModel.setGuildPrice(new BigDecimal(dto.getGuildPrice()));
+            busSalesOrderModel.setBrandSid(brandSid);
+            busSalesOrderModel.setBrandName(brandName);
+            busSalesOrderModel.setModelConfig(modelAlias);
             updateById(busSalesOrderModel);
         }
         //删除现车、采购订单的数据、若类型为现车，添加现车数据，若为采购订单，则新增采购订单数据