Merge remote-tracking branch 'origin/master'

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

@@ -14,8 +14,8 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -31,25 +31,25 @@ public class BusSalesOrderAllDto implements Dto {
 
     private String sid;
     @ApiModelProperty(value = "用户sid", required = true)
-    @NotBlank(message = "用户sid不能为空")
+    @NotBlank(message = "参数错误：用户sid")
     private String userSid;
     @ApiModelProperty(value = "销售部门sid", required = true)
-    @NotBlank(message = "销售部门sid不能为空")
+    @NotBlank(message = "参数错误：销售部门sid")
     private String orgSid;
     @ApiModelProperty(value = "销售部门", required = true)
-    @NotBlank(message = "销售部门不能为空")
+    @NotBlank(message = "参数错误：销售部门")
     private String orgName;
     @ApiModelProperty(value = "客户名称", required = true)
     @NotBlank(message = "客户名称不能为空")
     private String customerName;
     @ApiModelProperty(value = "客户sid", required = true)
-    @NotBlank(message = "客户sid不能为空")
+    @NotBlank(message = "参数错误：客户sid")
     private String customerSid;
     @ApiModelProperty(value = "销售专员", required = true)
     @NotBlank(message = "销售专员不能为空")
     private String staffName;
     @ApiModelProperty(value = "销售专员sid", required = true)
-    @NotBlank(message = "销售专员sid不能为空")
+    @NotBlank(message = "参数错误：销售专员sid")
     private String staffSid;
     @ApiModelProperty(value = "客户联系电话", required = true)
     @NotBlank(message = "客户联系电话不能为空")
@@ -83,7 +83,7 @@ public class BusSalesOrderAllDto implements Dto {
     @NotBlank(message = "销售订单车辆类型不能为空")
     private String type;
     @ApiModelProperty(value = "主车车型信息")
-    @NotNull(message = "车型信息不能为空")
+    @Valid
     private BusSalesOrderModelDto busSalesOrderModel;
     @ApiModelProperty(value = "现车车辆信息")
     private List<BusSalesOrderVehicleDto> busSalesOrderVehicleList;
@@ -92,12 +92,14 @@ public class BusSalesOrderAllDto implements Dto {
     @ApiModelProperty(value = "上装配置信息")
     private BusSalesOrderMakeupDto busSalesOrderMakeup;
     @ApiModelProperty(value = "价格信息")
+    @Valid
     private BusSalesOrderPriceDto busSalesOrderPrice;
     @ApiModelProperty(value = "主车优惠明细")
     private List<BusSalesOrderDiscountDto> busSalesOrderDiscountList;
     @ApiModelProperty(value = "保险说明")
     private BusSalesOrderInsuranceDto busSalesOrderInsurance;
     @ApiModelProperty(value = "订金信息")
+    @Valid
     private BusSalesOrderDepositDto busSalesOrderDeposit;
     @ApiModelProperty(value = "虚拟订单和订金关联信息")
     private List<BusDepositFictitiousDto> busDepositFictitiousList;

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

@@ -33,6 +33,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
+
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderFeign.java <br/>
@@ -62,7 +64,7 @@ public interface BusSalesOrderFeign {
     @ApiOperation("新增或修改")
     @PostMapping("/saveOrUpdate")
     @ResponseBody
-    public ResultBean<String> save(@RequestBody BusSalesOrderAllDto dto);
+    public ResultBean<String> save(@Valid @RequestBody BusSalesOrderAllDto dto);
 
     @ApiOperation("删除/批量删除")
     @DeleteMapping("/delBySids")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositDto.java

@@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderDepositDto.java <br/>
@@ -49,13 +51,17 @@ import lombok.Data;
 public class BusSalesOrderDepositDto implements Dto {
 
     private static final long serialVersionUID = -5178085916707721474L;
-    @ApiModelProperty("单台订金")
+    @ApiModelProperty(value = "单台订金", required = true)
+    @NotBlank(message = "参数错误：订金信息单台订金不能为空")
     private String deposit;
-    @ApiModelProperty("订金合计")
+    @ApiModelProperty(value = "订金合计", required = true)
+    @NotBlank(message = "参数错误：订金信息订金合计不能为空")
     private String depositAll;
-    @ApiModelProperty("订金交纳方式")
+    @ApiModelProperty(value = "订金交纳方式", required = true)
+    @NotBlank(message = "参数错误：订金信息订金交纳方式不能为空")
     private String depositType;
-    @ApiModelProperty("订金交纳方式key")
+    @ApiModelProperty(value = "订金交纳方式key", required = true)
+    @NotBlank(message = "参数错误：订金交纳方式key")
     private String depositTypeKey;
     @ApiModelProperty("需补交订金")
     private String makeUpDeposit;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceDto.java

@@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /**
@@ -52,18 +54,24 @@ import java.util.Date;
 public class BusSalesOrderPriceDto implements Dto {
 
     private static final long serialVersionUID = -1959772405551004198L;
-    @ApiModelProperty("单台指导价（主车加上装）")
+    @ApiModelProperty(value = "单台指导价（主车加上装）", required = true)
+    @NotBlank(message = "参数错误：价格信息单台指导价不能为空")
     private String singleGuildPrice;
-    @ApiModelProperty("单台成交价（主车加上装）")
+    @ApiModelProperty(value = "单台成交价（主车加上装）", required = true)
+    @NotBlank(message = "参数错误：价格信息单台成交价不能为空")
     private String singleFinalPrice;
     @ApiModelProperty("台数")
+    @NotNull(message = "参数错误：价格信息台数不能为空")
     private Integer quantity;
     @ApiModelProperty("车价合计")
+    @NotBlank(message = "参数错误：车价合计不能为空")
     private String priceSum;
     @ApiModelProperty("计划提车地点")
+    @NotBlank(message = "参数错误：计划提车地点不能为空")
     private String plannedPickUpLocation;
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty("计划提车日期")
+    @NotNull(message = "参数错误：计划提车日期不能为空")
     private Date plannedPickUpDate;
 
 }

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

@@ -315,6 +315,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         //验证台数是否正确
         //初始化台数
         int vehicleNum = 0;
+        //判断和价格信息中的台数是否一致
+        int quantity = dto.getBusSalesOrderPrice().getQuantity();
         if ("1".equals(dto.getType())) {
             //现车
             vehicleNum = dto.getBusSalesOrderVehicleList().size();
@@ -325,9 +327,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             for (int i = 0; i < busSalesVehicleOrderList.size(); i++) {
                 vehicleNum = vehicleNum + busSalesVehicleOrderList.get(i).getUsingNum();
             }
+        }else{
+            vehicleNum = quantity;
         }
-        //判断和价格信息中的台数是否一致
-        int quantity = dto.getBusSalesOrderPrice().getQuantity();
+
         if (vehicleNum != quantity) {
             return rb.setMsg("选择的台数与价格信息中的台数数值不一致");
         }
@@ -342,9 +345,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         //包含上装
         if ("1".equals(dto.getIsTop())) {
             //上装价格
-            String topPrice = dto.getBusSalesOrderMakeup().getTopPrice();
-            singleGuildPriceBig.add(new BigDecimal(topPrice));
-            singleFinalPriceBig.add(new BigDecimal(topPrice));
+            BusSalesOrderMakeupDto busSalesOrderMakeup = dto.getBusSalesOrderMakeup();
+            String topPrice = busSalesOrderMakeup.getTopPrice();
+//            String topPrice = dto.getBusSalesOrderMakeup().getTopPrice();
+            singleGuildPriceBig = singleGuildPriceBig.add(new BigDecimal(topPrice));
+            singleFinalPriceBig = singleFinalPriceBig.add(new BigDecimal(topPrice));
         }
         //单台指导价（主车+上装价格）
         String singleGuildPrice = dto.getBusSalesOrderPrice().getSingleGuildPrice();