From a8d6f4e650964e4e5eeee4b43191a485ad7c0320 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Thu, 19 May 2022 11:42:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BF=AE=E5=A4=8D=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E6=96=B0=E5=A2=9E=E3=80=81=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseSalesDicountQuery.java                |  5 +++
 .../BaseDiscountpackageService.java           |  3 ++
 .../busmaindeposit/pc/PcBusDepositQuery.java  |  5 +++
 .../api/busmaindeposit/pc/PcBusDepositVo.java |  2 +
 .../busmaindeposit/BusMainDepositMapper.xml   |  3 +-
 .../busmaindeposit/BusMainDepositService.java |  3 ++
 .../bussalesorder/BusSalesOrderService.java   | 38 +++++++++++--------
 .../BusSalesOrderDepositMapper.xml            |  2 +-
 .../BusSalesOrderInsuranceService.java        |  1 +
 .../BusSalesOrderMakeupService.java           |  1 +
 .../BusSalesOrderVehicleService.java          | 16 ++++----
 11 files changed, 53 insertions(+), 26 deletions(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseSalesDicountQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseSalesDicountQuery.java
index f53dd764d1..114740c29a 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseSalesDicountQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseSalesDicountQuery.java
@@ -4,6 +4,9 @@ import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Author dimengzhe
  * @Date 2022/5/10 10:02
@@ -30,4 +33,6 @@ public class BaseSalesDicountQuery implements Query {
 
     @ApiModelProperty("结束有效期")
     private String getEffectiveEndDate;
+    @ApiModelProperty(value = "已选择的销售政策的sid数组")
+    private List<String> sidList = new ArrayList<>();
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java
index 3881266b0a..47d8cbbced 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java
@@ -299,6 +299,9 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
             if (StringUtils.isNotBlank(params.getGetEffectiveStartDate()) && StringUtils.isNotBlank(params.getGetEffectiveEndDate())) {
                 qw.between("effectiveDate", params.getGetEffectiveStartDate(), params.getGetEffectiveEndDate());
             }
+            if (params.getSidList().size() != 0) {
+                qw.notIn("sid", params.getSidList());
+            }
         }
         return qw;
     }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusDepositQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusDepositQuery.java
index 5e54b614a8..f77bb3b8c6 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusDepositQuery.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusDepositQuery.java
@@ -4,6 +4,9 @@ import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Author dimengzhe
  * @Date 2022/5/12 9:22
@@ -24,4 +27,6 @@ public class PcBusDepositQuery implements Query {
     private String staffSid;
     @ApiModelProperty(value = "客户sid")
     private String customerSid;
+    @ApiModelProperty(value = "已选择的虚拟订金单sid数组")
+    private List<String> sidList = new ArrayList<>();
 }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusDepositVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusDepositVo.java
index 17f6013431..a08338c387 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusDepositVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/pc/PcBusDepositVo.java
@@ -17,6 +17,8 @@ public class PcBusDepositVo implements Vo {
 
     @ApiModelProperty(value = "节点状态")
     private String nodeState;
+    @ApiModelProperty(value = "sid")
+    private String sid;
 
     @ApiModelProperty(value = "单据类型")
     private String depositBillType;
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml
index ef5d74806c..e1de5f28a7 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml
@@ -178,7 +178,8 @@
     </select>
 
     <select id="depositPageList" resultType="com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusDepositVo">
-        select bmd.nodeState,
+        select bmd.sid,
+               bmd.nodeState,
                bmd.depositBillType,
                bmd.billNo,
                bmd.createDate,
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
index 1dd6e2c3f9..465918771d 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
@@ -1522,6 +1522,9 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             if (StringUtils.isNotBlank(query.getCreateDateStart()) && StringUtils.isNotBlank(query.getCreateDateEnd())) {
                 qw.between("bmd.createDate", query.getCreateDateStart(), query.getCreateDateEnd());
             }
+            if (query.getSidList().size() > 0) {
+                qw.notIn("bmd.sid", query.getSidList());
+            }
         }
         qw.eq("bd.staffSid", query.getStaffSid());
         qw.eq("bc.customerSid", query.getCustomerSid());
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 1c5b880b99..9d90417990 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
@@ -338,7 +338,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             for (int i = 0; i < busSalesVehicleOrderList.size(); i++) {
                 vehicleNum = vehicleNum + busSalesVehicleOrderList.get(i).getUsingNum();
             }
-        }else{
+        } else {
             vehicleNum = quantity;
         }
 
@@ -388,7 +388,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 String price = busSalesOrderDiscountList.get(i).getPrice();
                 Integer num = busSalesOrderDiscountList.get(i).getNum();
                 String totalValue = busSalesOrderDiscountList.get(i).getTotalValue();
-                if(StringUtils.isNotBlank(price) && StringUtils.isNotBlank(totalValue) && num != 0){
+                if (StringUtils.isNotBlank(price) && StringUtils.isNotBlank(totalValue) && num != 0) {
                     if (new BigDecimal(totalValue).compareTo(new BigDecimal(price).multiply(new BigDecimal(num.toString()))) != 0) {
                         return rb.setMsg("主车优惠明细中总价值数值计算错误");
                     }
@@ -403,11 +403,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
         if ("02".equals(dto.getBusSalesOrderDeposit().getDepositTypeKey())) {
             List<BusDepositFictitiousDto> busDepositFictitiousList = dto.getBusDepositFictitiousList();
+            //本次结转金额之和
             BigDecimal depositBig = new BigDecimal("0");
             if (busDepositFictitiousList.size() > 0) {
                 for (int i = 0; i < busDepositFictitiousList.size(); i++) {
                     String depositPrice = busDepositFictitiousList.get(i).getDepositPrice();
                     String price = busDepositFictitiousList.get(i).getPrice();
+                    if (StringUtils.isBlank(price)) {
+                        return rb.setMsg("虚拟订单中存在本次结转金额为空的情况");
+                    }
                     if (new BigDecimal(price).compareTo(new BigDecimal(depositPrice)) > 0) {
                         return rb.setMsg("虚拟订单中存在本次结转金额大于订金剩余金额的数据");
                     }
@@ -416,7 +420,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
             //判断补交金额和订金合计-本次结转金额
             String makeUpDeposit = dto.getBusSalesOrderDeposit().getMakeUpDeposit();
-            if(StringUtils.isNotBlank(makeUpDeposit)){
+            if (StringUtils.isNotBlank(makeUpDeposit)) {
+                if(depositBig.compareTo(new BigDecimal(depositAll))>0){
+                    return rb.setMsg("本次结转金额之和已超订金合计金额");
+                }
                 if (new BigDecimal(makeUpDeposit).compareTo(new BigDecimal(depositAll).subtract(depositBig)) != 0) {
                     return rb.setMsg("订金信息中需补交订金数值计算错误");
                 }
@@ -539,8 +546,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             busSalesOrderInsuranceService.saveInsurance(busSalesOrderInsuranceDto, sid);
         }
         String depositSid = busSalesOrderDepositService.saveOrderDepo(busSalesOrderDepositDto, sid);
-        if ("01".equals(busSalesOrderDepositDto.getDepositTypeKey())) {
-            //现交订金
+        if ("02".equals(busSalesOrderDepositDto.getDepositTypeKey())) {
+            //结转
             busDepositFictitiousService.saveFictitious(busDepositFictitiousDtoList, depositSid);
         }
         return sid;
@@ -749,12 +756,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 map.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
                 //更新销售订单的状态为已通过的状态:审批通过1
                 //ToDo:
-                updateStateByBusinessSid(1,variables.get("businessSid").toString());
+                updateStateByBusinessSid(1, variables.get("businessSid").toString());
                 //通过后新增合同表中的信息。
 
 
-
-
             }
         }
         map.put("nodeState", nodeState);
@@ -765,11 +770,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
 
     /**
      * 更新销售订单的状态
-     * @param state 状态，审批通过1，不通过2
+     *
+     * @param state       状态，审批通过1，不通过2
      * @param businessSid
      */
     private void updateStateByBusinessSid(int state, String businessSid) {
-        baseMapper.updateStateByBusinessSid(state,businessSid);
+        baseMapper.updateStateByBusinessSid(state, businessSid);
     }
 
     public ResultBean reject(BusSalesOrderFlowDto dto) {
@@ -800,7 +806,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(dto.getInstanceId());
         if (listResultBean.getData().size() == 0) {
             //更新销售订单的状态为不通过
-            updateStateByBusinessSid(2,dto.getBusinessSid());
+            updateStateByBusinessSid(2, dto.getBusinessSid());
         }
         ResultBean resultBean = flowTaskFeign.breakProcess(flowTaskVo);
         if (!resultBean.getSuccess()) {
@@ -1224,9 +1230,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 busSalesOrderInsuranceService.deleteByOrderSid(sid);
             }
             BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(sid);
-            if(busSalesOrderDeposit != null){
+            if (busSalesOrderDeposit != null) {
+                //删除订金信息
                 busSalesOrderDepositService.deleteByOrderSid(sid);
                 if ("02".equals(busSalesOrderDeposit.getDepositTypeKey())) {
+                    //删除订金和虚拟订单关联信息
                     busDepositFictitiousService.deleteByDepositSid(busSalesOrderDeposit.getSid());
                 }
             }
@@ -1235,7 +1243,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         return rb.success().setMsg("删除成功");
     }
 
-    public Map<String, String> generateBillNo(String userSid){
+    public Map<String, String> generateBillNo(String userSid) {
         List<DictCommonVo> commonVoList = dictCommonFeign.getTypeValues(DictCommonType.BILLSTYPE, "0").getData();
         String billsType = "";
         if (commonVoList.size() > 0) {
@@ -1261,8 +1269,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         int i = selectCountByOrgSid(billsType, date, orgSid);
         String num = String.format("%04d", i + 1); // 不足4位补0
         Map<String, String> map = new HashMap<>();
-        map.put("billNo_Num", billsType + orgCode + date.replaceAll("-","") + num);
-        map.put("billNo", billsType + orgCode + date.replaceAll("-",""));
+        map.put("billNo_Num", billsType + orgCode + date.replaceAll("-", "") + num);
+        map.put("billNo", billsType + orgCode + date.replaceAll("-", ""));
         map.put("staffSid", userOrgInfo.getStaffSid());
         map.put("staffName", userOrgInfo.getStaffName());
         map.put("orgSid", orgSid);
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml
index 04ca5911eb..e40f470b32 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml
@@ -21,7 +21,7 @@
 
     <select id="selectByOrderSid" resultType="com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit">
         select *
-        from bus_sales_order_discount
+        from bus_sales_order_deposit
         where salesOrderSid = #{sid}
     </select>
 
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java
index a074dfe53d..0c552e32ef 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java
@@ -76,6 +76,7 @@ public class BusSalesOrderInsuranceService extends MybatisBaseService<BusSalesOr
     public void saveInsurance(BusSalesOrderInsuranceDto busSalesOrderInsuranceDto, String sid) {
         BusSalesOrderInsurance busSalesOrderInsurance = new BusSalesOrderInsurance();
         BeanUtil.copyProperties(busSalesOrderInsuranceDto, busSalesOrderInsurance, "sid");
+        busSalesOrderInsurance.setSalesOrderSid(sid);
         baseMapper.insert(busSalesOrderInsurance);
     }
 
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java
index 015495a52f..1b235ee991 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java
@@ -82,6 +82,7 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
     public void saveMake(BusSalesOrderMakeupDto busSalesOrderMakeupDto, String sid) {
         BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup();
         BeanUtil.copyProperties(busSalesOrderMakeupDto, busSalesOrderMakeup, "sid");
+        busSalesOrderMakeup.setSalesOrderSid(sid);
         baseMapper.insert(busSalesOrderMakeup);
     }
 
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
index a4f689880c..f5c37d19d8 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
@@ -28,10 +28,8 @@ package com.yxt.anrui.buscenter.biz.bussalesordervehicle;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.buscenter.api.bussalesorder.AppNowCar;
 import com.yxt.anrui.buscenter.api.bussalesorder.AppNowCarList;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.*;
-import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrder;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -90,13 +88,13 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         if (stringList.size() > 0) {
             //删除
             baseMapper.deleteBySalesOrderSid(sid);
-            for (int i = 0; i < list.size(); i++) {
-                BusSalesOrderVehicleDto busSalesOrderVehicleDto = list.get(i);
-                BusSalesOrderVehicle busSalesOrderVehicle = new BusSalesOrderVehicle();
-                BeanUtil.copyProperties(busSalesOrderVehicleDto, busSalesOrderVehicle, "sid");
-                busSalesOrderVehicle.setSalesOrderSid(sid);
-                save(busSalesOrderVehicle);
-            }
+        }
+        for (int i = 0; i < list.size(); i++) {
+            BusSalesOrderVehicleDto busSalesOrderVehicleDto = list.get(i);
+            BusSalesOrderVehicle busSalesOrderVehicle = new BusSalesOrderVehicle();
+            BeanUtil.copyProperties(busSalesOrderVehicleDto, busSalesOrderVehicle, "sid");
+            busSalesOrderVehicle.setSalesOrderSid(sid);
+            save(busSalesOrderVehicle);
         }
     }