完善销售订单的编辑初始化

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java

@@ -118,4 +118,6 @@ public class BusSalesOrderAllDto implements Dto {
     private List<String> vehicleList = new ArrayList<>();
     @ApiModelProperty(value = "优惠包价值")
     private List<String> priceList = new ArrayList<>();
+
+    private String remarks;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java

@@ -121,4 +121,12 @@ public class BusSalesOrderDetailsVo implements Vo {
 
     @ApiModelProperty("单台开票金额")
     private String oneBillMoney; // 单台开票金额
+    @ApiModelProperty(value = "保险备注")
+    private String remarks;
+    @ApiModelProperty(value = "客户类型key")
+    private String customerClassKey;
+    @ApiModelProperty(value = "客户类型")
+    private String customerClass;
+    @ApiModelProperty(value = "客户头像")
+    private String customerPhoto;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDetailsVo.java

@@ -72,5 +72,6 @@ public class BusSalesOrderMakeupDetailsVo implements Vo {
     private String moreConfig;
     @ApiModelProperty("合同上传")
     private String contractPath;
+    private String remarks;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDto.java

@@ -69,5 +69,6 @@ public class BusSalesOrderMakeupDto implements Dto {
     private String moreConfig;
     @ApiModelProperty("合同上传")
     private String contractPath;
+    private String remarks;
 
 }

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

@@ -87,6 +87,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
 import com.yxt.anrui.portal.config.DictCommonType;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.DateUtils;
 import com.yxt.common.base.utils.PagerUtil;
@@ -157,6 +158,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     private BaseVehiclePolicyFeign baseVehiclePolicyFeign;
     @Autowired
     private DictCommonFeign dictCommonFeign;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
 
     /**
      * 构造查询条件
@@ -235,6 +238,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         BusSalesOrderDetailsVo vo = new BusSalesOrderDetailsVo();
         BeanUtil.copyProperties(entity, vo);
         vo.setCreateDate(DateUtil.formatDate(entity.getCreateDate()));
+        if(!entity.getCustomerPhoto().contains(fileUploadComponent.getUrlPrefix())){
+            vo.setCustomerPhoto(fileUploadComponent.getUrlPrefix()+entity.getCustomerPhoto());
+        }else{
+            vo.setCustomerPhoto(entity.getCustomerPhoto());
+        }
         //查询主车车型信息
         BusSalesOrderModelDetailsVo busSalesOrderModelDetailsVo = busSalesOrderModelService.details(entity.getSid());
         if (busSalesOrderModelDetailsVo != null) {
@@ -454,6 +462,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         List<BusDepositFictitiousDto> busDepositFictitiousDtoList = dto.getBusDepositFictitiousList();
         BusSalesOrder busSalesOrder = fetchBySid(dto.getSid());
         BeanUtil.copyProperties(dto, busSalesOrder, "sid");
+        if(dto.getCustomerPhoto().contains(fileUploadComponent.getUrlPrefix())){
+            busSalesOrder.setCustomerPhoto(dto.getCustomerPhoto().replace(fileUploadComponent.getUrlPrefix(),""));
+        }
         baseMapper.updateById(busSalesOrder);
         //主车车型信息保存
         busSalesOrderModelService.saveModel(busSalesOrderModelDto, dto.getSid());

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

@@ -43,7 +43,7 @@
                announcementModel,
                topPrice,
                moreConfig,
-               contractPath
+               contractPath,remarks
         from bus_sales_order_makeup
         where salesOrderSid = #{sid}
     </select>