From e8b181292aa1f5f37c86d3653dd2db86f65360aa Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Sat, 18 Jun 2022 17:08:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=B0=83=E5=BC=8F=E5=AE=8C=E5=96=84=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusSalesOrderModelFeign.java                  |  5 +++--
 .../biz/bussalesorder/BusSalesOrderRest.java      |  2 +-
 .../biz/bussalesorder/BusSalesOrderService.java   | 15 ++++++++++++---
 .../BusSalesOrderDepositService.java              |  9 ++++++---
 .../BusSalesOrderPriceService.java                | 13 +++++++++----
 .../api/sysstaffinfo/SysStaffinfoFeign.java       |  2 +-
 .../saleOrders/AppBusSalesOrderFeign.java         |  3 +--
 .../autoservice/saleOrders/topinfo/TopDto.java    |  2 ++
 .../saleOrders/AppBusSalesOrderService.java       |  7 ++++++-
 9 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelFeign.java
index 1dfea117b3..5b18c918e4 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelFeign.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelFeign.java
@@ -30,10 +30,11 @@ import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import javax.validation.Valid;
+
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderModelFeign.java <br/>
@@ -57,7 +58,7 @@ public interface BusSalesOrderModelFeign {
 
     @ApiOperation("保存")
     @PutMapping("/saveOrUpdate")
-    ResultBean save(@RequestBody AppBusSalesOrderModelDto dto);
+    ResultBean save(@Valid @RequestBody AppBusSalesOrderModelDto dto);
 
 
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java
index a13fe8297d..221737d3b6 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java
@@ -159,7 +159,7 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
     @Override
     @ApiOperation("App销售订单分页列表")
     public ResultBean<PagerVo<AppBusSalesOrderVo>> getSaleOrders(PagerQuery<AppBusSalesOrderQuery> pq) {
-        ResultBean rb = ResultBean.fireFail();
+        ResultBean<PagerVo<AppBusSalesOrderVo>> rb = ResultBean.fireFail();
         PagerVo<AppBusSalesOrderVo> pv = busSalesOrderService.getSaleOrders(pq);
         return rb.success().setData(pv);
     }
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 fb70be45ef..bd4c9b33e0 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
@@ -1055,8 +1055,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             //查询是否有价格信息
             BusSalesOrderPriceDetailsVo priceDetailsVo = busSalesOrderPriceService.details(saleOrderSid);
             if (priceDetailsVo != null) {
-                if (StringUtils.isNotBlank(priceDetailsVo.getSingleFinalPrice()) && StringUtils.isNotBlank(busSalesOrderModelDetailsVo.getFinalPrice())) {
-                    vo.setPriceInfoState(1);
+                if (StringUtils.isNotBlank(priceDetailsVo.getSingleFinalPrice())) {
+                    if (busSalesOrderModelDetailsVo != null) {
+                        if (StringUtils.isNotBlank(busSalesOrderModelDetailsVo.getFinalPrice())) {
+                            vo.setPriceInfoState(1);
+                        }
+                    }
                 } else {
                     vo.setPriceInfoState(0);
                 }
@@ -1142,6 +1146,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 qw.eq("bo.staffSid", query.getStaffSid());
             }
         }
+        qw.orderByDesc("bo.id");
         return qw;
     }
 
@@ -1854,12 +1859,16 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         BusSalesOrderPriceDetailsVo busSalesOrderPriceDetailsVo = busSalesOrderPriceService.details(sid);
         if (busSalesOrderModelDetailsVo == null && busSalesOrderPriceDetailsVo == null) {
             isModel = false;
+        } else if (busSalesOrderModelDetailsVo == null) {
+            isModel = false;
+        } else if (busSalesOrderPriceDetailsVo == null) {
+            isModel = false;
         } else {
             if (StringUtils.isBlank(busSalesOrderModelDetailsVo.getModelName()) ||
                     StringUtils.isBlank(busSalesOrderModelDetailsVo.getModelSid()) ||
                     StringUtils.isBlank(busSalesOrderModelDetailsVo.getModelConfigSid()) ||
                     StringUtils.isBlank(busSalesOrderModelDetailsVo.getGuildPrice()) ||
-                    StringUtils.isBlank(busSalesOrderPriceDetailsVo.getQuantity().toString()) ||
+                    StringUtils.isBlank(String.valueOf(busSalesOrderPriceDetailsVo.getQuantity())) ||
                     StringUtils.isBlank(busSalesOrderPriceDetailsVo.getSingleGuildPrice())) {
                 isModel = false;
             }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java
index 8bc05c1d7d..607a6b073b 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java
@@ -58,8 +58,6 @@ import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -161,7 +159,12 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
             vo.setVirtualOrderList(listVos);
         }
         if (busSalesOrderPrice != null) {
-            vo.setCarNumber(busSalesOrderPrice.getQuantity().toString());
+            if(busSalesOrderPrice.getQuantity() != null){
+                vo.setCarNumber(String.valueOf(busSalesOrderPrice.getQuantity()));
+            }else{
+                return rb.setMsg("请先完善车型信息");
+            }
+
         }
         return rb.success().setData(vo);
     }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java
index 6681437c19..82ab482f9d 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java
@@ -29,6 +29,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto;
@@ -131,18 +132,22 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
         }
         AppBusSalesOrderPriceVo vo = new AppBusSalesOrderPriceVo();
         AppBusSalesOrderPriceVo vo1 = baseMapper.getPriceInfo(sid);
+        BusSalesOrderModelDetailsVo detailsVo = busSalesOrderModelService.details(sid);
         BeanUtil.copyProperties(vo1, vo);
         BigDecimal bigDecimalFinalPrice = new BigDecimal("0");
+        if(detailsVo == null){
+            return rb.setMsg("请先完善车型信息");
+        }
         if (vo1 != null) {
             //查询挂车和上装的总价
             BusSalesOrderMakeupDetailsVo busSalesOrderMakeupDetailsVo = busSalesOrderMakeupService.details(sid);
             if (busSalesOrderMakeupDetailsVo != null) {
                 String topPrice = busSalesOrderMakeupDetailsVo.getTopPrice();
-                vo.setTopAndTrailerPrice(topPrice);
-                bigDecimalFinalPrice = bigDecimalFinalPrice.add(new BigDecimal(topPrice));
+                if(StringUtils.isNotBlank(topPrice)){
+                    vo.setTopAndTrailerPrice(topPrice);
+                    bigDecimalFinalPrice = bigDecimalFinalPrice.add(new BigDecimal(topPrice));
+                }
             }
-        } else {
-            return rb.setMsg("请先完善车型信息");
         }
 
         if (StringUtils.isNotBlank(vo.getTransactionPrice())) {
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java
index 2bd3601189..cdb9e161d7 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java
@@ -129,7 +129,7 @@ public interface SysStaffinfoFeign {
 
     @ApiOperation("移动端-销售订单-内部推荐人下拉框")
     @ResponseBody
-    @GetMapping("/getUserList")
+    @PostMapping("/getUserList")
     ResultBean<PagerVo<AppSysStaffVo>> getUserList(@RequestBody PagerQuery<AppSysStaffQuery> pagerQuery);
 
 
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java
index c9b5ebe681..8fcc627221 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java
@@ -26,7 +26,6 @@
 package com.yxt.anrui.terminal.api.autoservice.saleOrders;
 
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeignFallback;
-import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoQuery;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoVo;
@@ -132,7 +131,7 @@ public interface AppBusSalesOrderFeign {
     @ApiOperation("保存上装信息")
     @PutMapping("/save/topInfo")
     @ResponseBody
-    ResultBean saveTopInfo(@RequestBody TopDto dto);
+    ResultBean saveTopInfo(@Valid @RequestBody TopDto dto);
 
     @ApiOperation("初始化上装信息")
     @GetMapping("/init/topInfo/{saleOrderSid}")
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/topinfo/TopDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/topinfo/TopDto.java
index be966526af..a784812db1 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/topinfo/TopDto.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/topinfo/TopDto.java
@@ -5,6 +5,7 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -17,6 +18,7 @@ public class TopDto implements Dto {
     private static final long serialVersionUID = -5639301713184743169L;
 
     @ApiModelProperty(value = "上装名称")
+    @NotBlank(message = "上装名称不能为空")
     private String topName;
     @ApiModelProperty(value = "板材材质")
     @JsonProperty(value = "texture")
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java
index 82d7cb4098..482da66e87 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java
@@ -72,6 +72,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo;
 import com.yxt.anrui.terminal.config.CoverUtils;
+import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -151,7 +152,7 @@ public class AppBusSalesOrderService {
         PagerQuery<AppBusSalesOrderQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
         ResultBean<PagerVo<AppBusSalesOrderVo>> resultBean = busSalesOrderFeign.getSaleOrders(pq);
         PagerVo<BusOrderSalesVo> vo = CoverUtils.selectPagerVo(resultBean.getData());
-        return rb.success().setData(vo);
+        return rb.success().setMsg("").setData(vo);
     }
 
     /**
@@ -260,6 +261,10 @@ public class AppBusSalesOrderService {
     }
 
     public ResultBean saveModelInfo(ModelDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        if(StringUtils.isBlank(dto.getState())){
+            return rb.setMsg("请选择类型");
+        }
         AppBusSalesOrderModelDto appBusSalesOrderModelDto = new AppBusSalesOrderModelDto();
         BeanUtil.copyProperties(dto, appBusSalesOrderModelDto);
         ResultBean resultBean = busSalesOrderModelFeign.save(appBusSalesOrderModelDto);