diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java index 78ffce061c..74331eaf6f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java +++ b/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 vehicleList = new ArrayList<>(); @ApiModelProperty(value = "优惠包价值") private List priceList = new ArrayList<>(); + + private String remarks; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java index 752b18a7ea..01a4c3294c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java +++ b/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; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDetailsVo.java index 8b9571c113..b940870715 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDetailsVo.java +++ b/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; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDto.java index df40a18ee9..e7e61220fb 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDto.java +++ b/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; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index e570cb6d51..a23b273199 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/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 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()); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml index 6094bcd6ec..41d521b7dd 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml +++ b/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}