销售订单-完善新增时关联sid

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

@@ -104,4 +104,11 @@ public class BusSalesOrder extends BaseEntity {
     private String type;
     @ApiModelProperty("单台开票金额")
     private BigDecimal oneBillMoney; // 单台开票金额
+
+    @ApiModelProperty(value = "客户类型key")
+    private String customerClassKey;
+    @ApiModelProperty(value = "客户类型")
+    private String customerClass;
+    @ApiModelProperty(value = "客户头像")
+    private String customerPhoto;
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java

@@ -92,6 +92,7 @@ public class BusDepositFictitiousService extends MybatisBaseService<BusDepositFi
         for (int i = 0; i < busDepositFictitiousDtoList.size(); i++) {
             BusDepositFictitious busDepositFictitious = new BusDepositFictitious();
             BeanUtil.copyProperties(busDepositFictitiousDtoList.get(i), busDepositFictitious, "sid");
+            busDepositFictitious.setDepositSid(sid);
             baseMapper.insert(busDepositFictitious);
         }
     }

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

@@ -134,8 +134,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     private SysUserFeign sysUserFeign;
+    @Autowired
     private FlowableFeign flowableFeign;
+    @Autowired
     private FlowTaskFeign flowTaskFeign;
+    @Autowired
     private SysFormLinkFeign sysFormLinkFeign;
     @Autowired
     private BaseVehmodelConfigFeign baseVehmodelConfigFeign;
@@ -405,9 +408,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
             //判断补交金额和订金合计-本次结转金额
             String makeUpDeposit = dto.getBusSalesOrderDeposit().getMakeUpDeposit();
-            if (new BigDecimal(makeUpDeposit).compareTo(new BigDecimal(depositAll).subtract(depositBig)) != 0) {
+            if(StringUtils.isNotBlank(makeUpDeposit)){
-                return rb.setMsg("订金信息中需补交订金数值计算错误");
+                if (new BigDecimal(makeUpDeposit).compareTo(new BigDecimal(depositAll).subtract(depositBig)) != 0) {
+                    return rb.setMsg("订金信息中需补交订金数值计算错误");
+                }
             }
+
         }
         return rb.success();
     }
@@ -500,32 +506,32 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         baseMapper.insert(busSalesOrder);
         String sid = busSalesOrder.getSid();
         //主车车型信息保存
-        busSalesOrderModelService.saveModel(busSalesOrderModelDto, dto.getSid());
+        busSalesOrderModelService.saveModel(busSalesOrderModelDto, sid);
         if ("1".equals(dto.getType())) {
             //现车车辆信息
-            busSalesOrderVehicleService.saveVehicle(list, dto.getSid());
+            busSalesOrderVehicleService.saveVehicle(list, sid);
         } else if ("2".equals(dto.getType())) {
             //采购订单信息
-            busSalesVehicleOrderService.saveOrder(vehicleList, dto.getSid());
+            busSalesVehicleOrderService.saveOrder(vehicleList, sid);
         }
         //是否含有上装信息
         String isTop = dto.getIsTop();
         if ("1".equals(isTop)) {
-            busSalesOrderMakeupService.saveMake(busSalesOrderMakeupDto, dto.getSid());
+            busSalesOrderMakeupService.saveMake(busSalesOrderMakeupDto, sid);
         }
         //价格信息
-        busSalesOrderPriceService.saveOrderPrice(busSalesOrderPriceDto, dto.getSid());
+        busSalesOrderPriceService.saveOrderPrice(busSalesOrderPriceDto, sid);
         //主车优惠明细
-        busSalesOrderDiscountService.saveDiscount(busSalesOrderDiscountDto, dto.getSid());
+        busSalesOrderDiscountService.saveDiscount(busSalesOrderDiscountDto, sid);
         //是否有保险说明
         String isInsurance = dto.getIsInsurance();
         if ("1".equals(isInsurance)) {
-            busSalesOrderInsuranceService.saveInsurance(busSalesOrderInsuranceDto, dto.getSid());
+            busSalesOrderInsuranceService.saveInsurance(busSalesOrderInsuranceDto, sid);
         }
-        busSalesOrderDepositService.saveOrderDepo(busSalesOrderDepositDto, dto.getSid());
+        String depositSid = busSalesOrderDepositService.saveOrderDepo(busSalesOrderDepositDto, sid);
         if ("01".equals(busSalesOrderDepositDto.getDepositTypeKey())) {
             //现交订金
-            busDepositFictitiousService.saveFictitious(busDepositFictitiousDtoList, dto.getSid());
+            busDepositFictitiousService.saveFictitious(busDepositFictitiousDtoList, depositSid);
         }
         return sid;
 
@@ -1206,10 +1212,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 busSalesOrderInsuranceService.deleteByOrderSid(sid);
             }
             BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(sid);
-            busSalesOrderDepositService.deleteByOrderSid(sid);
+            if(busSalesOrderDeposit != null){
-            if ("02".equals(busSalesOrderDeposit.getDepositTypeKey())) {
+                busSalesOrderDepositService.deleteByOrderSid(sid);
-                busDepositFictitiousService.deleteByDepositSid(busSalesOrderDeposit.getSid());
+                if ("02".equals(busSalesOrderDeposit.getDepositTypeKey())) {
+                    busDepositFictitiousService.deleteByDepositSid(busSalesOrderDeposit.getSid());
+                }
             }
+
         }
         return rb.success().setMsg("删除成功");
     }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java

@@ -79,10 +79,12 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
         return vo;
     }
 
-    public void saveOrderDepo(BusSalesOrderDepositDto busSalesOrderDepositDto, String sid) {
+    public String saveOrderDepo(BusSalesOrderDepositDto busSalesOrderDepositDto, String sid) {
         BusSalesOrderDeposit busSalesOrderDeposit = new BusSalesOrderDeposit();
         BeanUtil.copyProperties(busSalesOrderDepositDto, busSalesOrderDeposit, "sid");
+        busSalesOrderDeposit.setSalesOrderSid(sid);
         baseMapper.insert(busSalesOrderDeposit);
+        return busSalesOrderDeposit.getSid();
     }
 
     public void updateOrderDepo(BusSalesOrderDepositDto busSalesOrderDepositDto, String sid) {

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

@@ -87,6 +87,7 @@ public class BusSalesOrderDiscountService extends MybatisBaseService<BusSalesOrd
         for (int i = 0; i < busSalesOrderDiscountList.size(); i++) {
             BusSalesOrderDiscount busSalesOrderDiscount = new BusSalesOrderDiscount();
             BeanUtil.copyProperties(busSalesOrderDiscountList.get(i), busSalesOrderDiscount, "sid");
+            busSalesOrderDiscount.setSalesOrderSid(sid);
             baseMapper.insert(busSalesOrderDiscount);
         }
     }

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

@@ -87,6 +87,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
             BusSalesOrderModel busSalesOrderModel1 = new BusSalesOrderModel();
             if (busSalesOrderModelDto != null) {
                 BeanUtil.copyProperties(busSalesOrderModelDto, busSalesOrderModel1, "sid");
+                busSalesOrderModel1.setSalesOrderSid(sid);
                 save(busSalesOrderModel1);
             }
         } else {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java

@@ -82,6 +82,7 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
         busSalesOrderPrice.setSingleGuildPrice(guildPriceAll);
         BigDecimal finalPriceAll = new BigDecimal(busSalesOrderPriceDto.getSingleFinalPrice());
         busSalesOrderPrice.setSingleFinalPrice(finalPriceAll);
+        busSalesOrderPrice.setSalesOrderSid(sid);
         baseMapper.insert(busSalesOrderPrice);
     }
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -94,6 +94,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
                 BusSalesOrderVehicleDto busSalesOrderVehicleDto = list.get(i);
                 BusSalesOrderVehicle busSalesOrderVehicle = new BusSalesOrderVehicle();
                 BeanUtil.copyProperties(busSalesOrderVehicleDto, busSalesOrderVehicle, "sid");
+                busSalesOrderVehicle.setSalesOrderSid(sid);
                 save(busSalesOrderVehicle);
             }
         }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java

@@ -93,6 +93,7 @@ public class BusSalesVehicleOrderService extends MybatisBaseService<BusSalesVehi
                 BusSalesVehicleOrderDto busSalesVehicleOrderDto = vehicleList.get(i);
                 BusSalesVehicleOrder busSalesVehicleOrder = new BusSalesVehicleOrder();
                 BeanUtil.copyProperties(busSalesVehicleOrderDto, busSalesVehicleOrder, "sid");
+                busSalesVehicleOrder.setSalesOrderSid(sid);
                 save(busSalesVehicleOrder);
             }
         }