销售订单保存修改

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousDto.java

@@ -31,8 +31,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusDepositFictitiousDto.java <br/>
@@ -56,9 +54,9 @@ public class BusDepositFictitiousDto implements Dto {
     @ApiModelProperty("订金信息sid")
     private String depositSid;
     @ApiModelProperty("订金剩余金额")
-    private BigDecimal depositPrice;
+    private String depositPrice;
     @ApiModelProperty("本次结转金额")
-    private BigDecimal price;
+    private String price;
     @ApiModelProperty("款项支付委托书")
     private String payPath;
 

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

@@ -1,5 +1,6 @@
 package com.yxt.anrui.buscenter.api.bussalesorder;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDto;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDto;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDto;
@@ -13,6 +14,7 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -25,8 +27,45 @@ public class BusSalesOrderAllDto implements Dto {
     private static final long serialVersionUID = -734571880207951780L;
 
     private String sid;
-    @ApiModelProperty(value = "销售定单主表信息")
-    private BusSalesOrderDto busSalesOrder;
+    //===============================销售订单主表信息
+    @ApiModelProperty("销售部门sid")
+    private String orgSid;
+    @ApiModelProperty("销售部门")
+    private String orgName;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("客户sid")
+    private String customerSid;
+    @ApiModelProperty("销售专员")
+    private String staffName;
+    @ApiModelProperty("销售专员sid")
+    private String staffSid;
+    @ApiModelProperty("客户联系电话")
+    private String mobile;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("制单日期")
+    private Date createDate;
+    @ApiModelProperty("开票类型key")
+    private String billingTypeKey;
+    @ApiModelProperty("开票类型value")
+    private String billingType;
+    @ApiModelProperty("付款方式key")
+    private String payTypeKey;
+    @ApiModelProperty("付款方式value")
+    private String payType;
+    @ApiModelProperty("挂靠公司sid")
+    private String affiliatedCompanySid;
+    @ApiModelProperty("挂靠公司名称")
+    private String affiliatedCompany;
+    @ApiModelProperty("公司是否入保")
+    private String isInsurance;
+    @ApiModelProperty("补充说明")
+    private String notes;
+    @ApiModelProperty("是否包含上装")
+    private String isTop;
+    @ApiModelProperty("销售订单车辆类型：1现车、2订单、3排产")
+    private String type;
+    //==============================
     @ApiModelProperty(value = "主车车型信息")
     private BusSalesOrderModelDto busSalesOrderModel;
     @ApiModelProperty(value = "现车车辆信息")

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

@@ -26,14 +26,10 @@
 package com.yxt.anrui.buscenter.api.bussalesorder;
 
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderDto.java <br/>
@@ -53,43 +49,7 @@ public class BusSalesOrderDto implements Dto {
 
     private static final long serialVersionUID = 4012251859977808326L;
 
-    @ApiModelProperty("销售部门sid")
-    private String orgSid;
-    @ApiModelProperty("销售部门")
-    private String orgName;
-    @ApiModelProperty("客户名称")
-    private String customerName;
-    @ApiModelProperty("客户sid")
-    private String customerSid;
-    @ApiModelProperty("销售专员")
-    private String staffName;
-    @ApiModelProperty("销售专员sid")
-    private String staffSid;
-    @ApiModelProperty("客户联系电话")
-    private String mobile;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty("制单日期")
-    private Date createDate;
-    @ApiModelProperty("开票类型key")
-    private String billingTypeKey;
-    @ApiModelProperty("开票类型value")
-    private String billingType;
-    @ApiModelProperty("付款方式key")
-    private String payTypeKey;
-    @ApiModelProperty("付款方式value")
-    private String payType;
-    @ApiModelProperty("挂靠公司sid")
-    private String affiliatedCompanySid;
-    @ApiModelProperty("挂靠公司名称")
-    private String affiliatedCompany;
-    @ApiModelProperty("公司是否入保")
-    private String isInsurance;
-    @ApiModelProperty("补充说明")
-    private String notes;
-    @ApiModelProperty("是否包含上装")
-    private String isTop;
-    @ApiModelProperty("销售订单车辆类型：1现车、2订单、3排产")
-    private String type;
+
 
 
 

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

@@ -171,8 +171,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     }
 
     public void save(BusSalesOrderAllDto dto) {
-        //销售订单主表
-        BusSalesOrderDto busSalesOrderDto = dto.getBusSalesOrder();
         //主车车型信息
         BusSalesOrderModelDto busSalesOrderModelDto = dto.getBusSalesOrderModel();
         //现车车辆信息
@@ -192,18 +190,18 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         //虚拟订单和订金关联信息
         List<BusDepositFictitiousDto> busDepositFictitiousDtoList = dto.getBusDepositFictitiousList();
         BusSalesOrder busSalesOrder = new BusSalesOrder();
-        BeanUtil.copyProperties(busSalesOrderDto, busSalesOrder, "sid");
+        BeanUtil.copyProperties(dto, busSalesOrder, "sid");
         //主车车型信息保存
         busSalesOrderModelService.saveModel(busSalesOrderModelDto, dto.getSid());
-        if ("1".equals(busSalesOrderDto.getType())) {
+        if ("1".equals(dto.getType())) {
             //现车车辆信息
             busSalesOrderVehicleService.saveVehicle(list, dto.getSid());
-        } else if ("2".equals(busSalesOrderDto.getType())) {
+        } else if ("2".equals(dto.getType())) {
             //采购订单信息
             busSalesVehicleOrderService.saveOrder(vehicleList, dto.getSid());
         }
         //是否含有上装信息
-        String isTop = busSalesOrderDto.getIsTop();
+        String isTop = dto.getIsTop();
         if ("1".equals(isTop)) {
             busSalesOrderMakeupService.saveMake(busSalesOrderMakeupDto, dto.getSid());
         }
@@ -212,7 +210,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         //主车优惠明细
         busSalesOrderDiscountService.saveDiscount(busSalesOrderDiscountDto, dto.getSid());
         //是否有保险说明
-        String isInsurance = busSalesOrderDto.getIsInsurance();
+        String isInsurance = dto.getIsInsurance();
         if ("1".equals(isInsurance)) {
             busSalesOrderInsuranceService.saveInsurance(busSalesOrderInsuranceDto, dto.getSid());
         }