From 53f3ed19081dfd97c096293978657ebfca76d8b1 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 28 Jun 2023 14:32:11 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseDiscountpackageMapper.xml             |  2 +-
 .../app/model/AppNowCarListVo.java            |  3 +
 .../bussalesorder/app/model/AppNowCarVo.java  |  3 +
 .../bussalesorder/BusSalesOrderService.java   | 84 ++++++++++++++++++-
 .../saleOrders/model/NowCarVo.java            |  3 +
 5 files changed, 92 insertions(+), 3 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.xml
index bf1d151f54..4998ded878 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.xml
@@ -75,7 +75,7 @@
         where bd.vehSid = #{vinSid}
           and bbd.useOrg = #{orgSid}
           and bbd.nodeState = '已办结'
-          and bbd.salesPolicyKey = '0001'
+          and bbd.salesPolicyKey = '0001' and bbd.effectiveDate>NOW()
     </select>
 
     <select id="selectAppDiscountpackageListByOrgSid"
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarListVo.java
index 3c4cd328c1..7ecb947799 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarListVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarListVo.java
@@ -31,4 +31,7 @@ public class AppNowCarListVo implements Vo {
     @ApiModelProperty("采购系统名称")
     private String purchaseSystemName;
 
+    @ApiModelProperty("是否有促销标签")
+    private boolean promotion;
+
 }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarVo.java
index 04bb888d6a..bbe723df49 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarVo.java
@@ -29,4 +29,7 @@ public class AppNowCarVo implements Vo {
     private String purchaseSystemSid;
     @ApiModelProperty("采购系统名称")
     private String purchaseSystemName;
+
+    @ApiModelProperty("是否有促销标签")
+    private boolean promotion;
 }
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 660c5fd80a..eb7958dfee 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
@@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandMitQuery;
 import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitFeign;
+import com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackageFeign;
 import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanDetailsVo;
 import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanFeign;
 import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
@@ -308,6 +309,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     private LoanSolutionsOtherpolicyFeign loanSolutionsOtherpolicyFeign;
     @Autowired
     private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
+    @Autowired
+    private BaseDiscountpackageFeign baseDiscountpackageFeign;
 
     /**
      * 构造查询条件
@@ -392,6 +395,21 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 //包含采购系统的车架号
                 List<String> vinList = vinLists.stream().map(v -> v.getVinNo()).collect(Collectors.toList());
                 List<String> orderVinList = busSalesOrderVehicleService.selectList(sid);
+                if(!vinList.isEmpty()){
+                    for (int i = 0; i < vinLists.size(); i++) {
+                        VinListsVo vinListsVo = vinLists.get(i);
+                        BigDecimal initBigDecimalTwo = BigDecimal.ZERO;
+                        //根据sid去查询销售政策的sid，根据销售政策查询销售政策的金额
+                        ResultBean<List<String>> listResultBean = baseDiscountpackageFeign.getMoney(vinListsVo.getVinSid(), entity.getUseOrgSid());
+                        if (listResultBean.getSuccess() && !listResultBean.getData().isEmpty()) {
+                            List<String> stringList = listResultBean.getData();
+                            initBigDecimalTwo = initBigDecimalTwo.add(stringList.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add));
+                        }
+                        if(initBigDecimalTwo.compareTo(BigDecimal.ZERO) != 0){
+                            vinList.set(i,vinList.get(i)+"促销("+initBigDecimalTwo.toString()+"元)");
+                        }
+                    }
+                }
                 modelInfo.setVinList(vinList);
                 modelInfo.setOrderVinList(orderVinList);
             } else {
@@ -1271,6 +1289,31 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
         //计算总指导价-总成交价-总优惠包的价值
         bigDecimalOne = guildPriceAll.subtract(finalPriceAll).add(discountPrice);
+        List<String> vehicleList = new ArrayList<>();
+        BigDecimal initBigDecimalOne = BigDecimal.ZERO;
+        List<String> initBigDecimalOneList = new ArrayList<>();
+        //是否是现车//ToDo:促销政策
+        if ("1".equals(busSalesOrder.getType())) {
+            //根据销售订单sid查询现车的sid集合
+            vehicleList = busSalesOrderVehicleService.selectVehicleSid(sid);
+            //根据现车去查询销售政策的总促销政策之和
+            if (vehicleList.size() > 0) {
+                for (int i = 0; i < vehicleList.size(); i++) {
+                    BigDecimal initBigDecimalTwo = BigDecimal.ZERO;
+                    //根据sid去查询销售政策的sid，根据销售政策查询销售政策的金额
+                    ResultBean<List<String>> listResultBean = baseDiscountpackageFeign.getMoney(vehicleList.get(i), busSalesOrder.getUseOrgSid());
+                    if (listResultBean.getSuccess() && !listResultBean.getData().isEmpty()) {
+                        List<String> stringList = listResultBean.getData();
+                        initBigDecimalTwo = initBigDecimalTwo.add(stringList.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add));
+                    }
+                    initBigDecimalOneList.add(initBigDecimalTwo.toString());
+                }
+            }
+        }
+        if(!initBigDecimalOneList.isEmpty()){
+            String initOne = Collections.min(initBigDecimalOneList);
+            initBigDecimalOne = new BigDecimal(initOne);
+        }
         //查询返利金额
         BusSalesOrderSubmit busSalesOrderSubmit = busSalesOrderSubmitService.selectBySaleOrderSid(sid);
         if (busSalesOrderSubmit != null) {
@@ -1303,8 +1346,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             //ToDo:修改公式计算是否超权限：岗位权限*台数>总指导价-总成交价+总优惠包+总返利
             //销售支持部经理的岗位权限价格
             BigDecimal bigDecimal2 = new BigDecimal(price).multiply(new BigDecimal(quantity));
+            //岗位权限价格*台数
             bigDecimalTwo = bigDecimal2;
-            bigDecimalOne = bigDecimalOne.add(initBigDecimal);
+            //总指导价-总成交价+总优惠包+总返利
+            bigDecimalOne = bigDecimalOne.add(initBigDecimal).subtract(initBigDecimalOne.multiply(new BigDecimal(quantity)));
             if (bigDecimalTwo.compareTo(bigDecimalOne) < 0) {
                 //bigDecimalTwo<bigDecimalOne:超权限
                 isHavePower = true;
@@ -1335,7 +1380,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             bigDecimalTwo = new BigDecimal("0");
             BigDecimal bigDecimal2 = new BigDecimal(price).multiply(new BigDecimal(quantity));
             bigDecimalTwo = bigDecimal2;
-            bigDecimalOne = bigDecimalOne.add(initBigDecimal);
+            bigDecimalOne = bigDecimalOne.add(initBigDecimal).subtract(initBigDecimalOne.multiply(new BigDecimal(quantity)));
             if (bigDecimalTwo.compareTo(bigDecimalOne) < 0) {
                 //bigDecimalTwo<bigDecimalOne
                 isPower = true;
@@ -2218,6 +2263,16 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     //现车信息
                     AppNowCarVo appNowCarVo = new AppNowCarVo();
                     BeanUtil.copyProperties(vehicleOrderVo, appNowCarVo);
+                    //根据sid去查询销售政策的sid，根据销售政策查询销售政策的金额
+                    ResultBean<List<String>> listResultBean = baseDiscountpackageFeign.getMoney(vehicleOrderVo.getCarSid(), busSalesOrder.getUseOrgSid());
+                    if (listResultBean.getSuccess()) {
+                        List<String> stringList = listResultBean.getData();
+                        if(stringList.isEmpty()){
+                            appNowCarVo.setPromotion(false);
+                        }else{
+                            appNowCarVo.setPromotion(true);
+                        }
+                    }
                     //将该车型下的所有现车的车架号组合放入集合中
                     vinNoList.add(vehicleOrderVo.getVin());
                     vinNoMap.put(vehicleOrderVo.getVin(), vehicleOrderVo.getTopSid());
@@ -2538,6 +2593,16 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 for (AppBaseVehicleOrderVo vehicleOrderVo : voList) {
                     AppNowCarVo appNowCarVo = new AppNowCarVo();
                     BeanUtil.copyProperties(vehicleOrderVo, appNowCarVo);
+                    //根据sid去查询销售政策的sid，根据销售政策查询销售政策的金额
+                    ResultBean<List<String>> listResultBean = baseDiscountpackageFeign.getMoney(vehicleOrderVo.getCarSid(), busSalesOrder.getUseOrgSid());
+                    if (listResultBean.getSuccess()) {
+                        List<String> stringList = listResultBean.getData();
+                        if(stringList.isEmpty()){
+                            appNowCarVo.setPromotion(false);
+                        }else{
+                            appNowCarVo.setPromotion(true);
+                        }
+                    }
                     //根据车辆sid查询该车架号的采购系统
                     ResultBean<BasePurchSystemVo> vehicleSelectVoResultBean = baseVehicleFeign.getSystem(vehicleOrderVo.getCarSid());
                     if (vehicleSelectVoResultBean.getData() != null) {
@@ -3315,6 +3380,21 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 //包含采购系统的车架号
                 List<String> vinList = vinLists.stream().map(v -> v.getVinNo()).collect(Collectors.toList());
                 List<String> orderVinList = busSalesOrderVehicleService.selectList(sid);
+                if(!vinList.isEmpty()){
+                    for (int i = 0; i < vinLists.size(); i++) {
+                        VinListsVo vinListsVo = vinLists.get(i);
+                        BigDecimal initBigDecimalTwo = BigDecimal.ZERO;
+                        //根据sid去查询销售政策的sid，根据销售政策查询销售政策的金额
+                        ResultBean<List<String>> listResultBean = baseDiscountpackageFeign.getMoney(vinListsVo.getVinSid(), busSalesOrder.getUseOrgSid());
+                        if (listResultBean.getSuccess() && !listResultBean.getData().isEmpty()) {
+                            List<String> stringList = listResultBean.getData();
+                            initBigDecimalTwo = initBigDecimalTwo.add(stringList.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add));
+                        }
+                        if(initBigDecimalTwo.compareTo(BigDecimal.ZERO) != 0){
+                            vinList.set(i,vinList.get(i)+"，促销("+initBigDecimalTwo.toString()+"元)");
+                        }
+                    }
+                }
                 modelInfo.setVinList(vinList);
                 modelInfo.setOrderVinList(orderVinList);
             } else {
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/NowCarVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/NowCarVo.java
index 16cc4d6ea5..d2ba2f99d5 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/NowCarVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/NowCarVo.java
@@ -37,4 +37,7 @@ public class NowCarVo implements Vo {
     @ApiModelProperty("采购系统名称")
     @JsonProperty("paySystem")
     private String purchaseSystemName;
+
+    @ApiModelProperty("是否有促销标签")
+    private boolean promotion;
 }

From 752365e69239cacf09080d84df4d224219716662 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 28 Jun 2023 14:32:11 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseDiscountpackageMapper.xml             |  2 +-
 .../app/model/AppNowCarListVo.java            |  3 +
 .../bussalesorder/app/model/AppNowCarVo.java  |  3 +
 .../bussalesorder/BusSalesOrderService.java   | 84 ++++++++++++++++++-
 .../saleOrders/model/NowCarVo.java            |  3 +
 5 files changed, 92 insertions(+), 3 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.xml
index bf1d151f54..4998ded878 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.xml
@@ -75,7 +75,7 @@
         where bd.vehSid = #{vinSid}
           and bbd.useOrg = #{orgSid}
           and bbd.nodeState = '已办结'
-          and bbd.salesPolicyKey = '0001'
+          and bbd.salesPolicyKey = '0001' and bbd.effectiveDate>NOW()
     </select>
 
     <select id="selectAppDiscountpackageListByOrgSid"
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarListVo.java
index 3c4cd328c1..7ecb947799 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarListVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarListVo.java
@@ -31,4 +31,7 @@ public class AppNowCarListVo implements Vo {
     @ApiModelProperty("采购系统名称")
     private String purchaseSystemName;
 
+    @ApiModelProperty("是否有促销标签")
+    private boolean promotion;
+
 }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarVo.java
index 04bb888d6a..bbe723df49 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/model/AppNowCarVo.java
@@ -29,4 +29,7 @@ public class AppNowCarVo implements Vo {
     private String purchaseSystemSid;
     @ApiModelProperty("采购系统名称")
     private String purchaseSystemName;
+
+    @ApiModelProperty("是否有促销标签")
+    private boolean promotion;
 }
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 a8c5f32234..5843922a93 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
@@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandMitQuery;
 import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitFeign;
+import com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackageFeign;
 import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanDetailsVo;
 import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanFeign;
 import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
@@ -308,6 +309,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     private LoanSolutionsOtherpolicyFeign loanSolutionsOtherpolicyFeign;
     @Autowired
     private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
+    @Autowired
+    private BaseDiscountpackageFeign baseDiscountpackageFeign;
 
     /**
      * 构造查询条件
@@ -392,6 +395,21 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 //包含采购系统的车架号
                 List<String> vinList = vinLists.stream().map(v -> v.getVinNo()).collect(Collectors.toList());
                 List<String> orderVinList = busSalesOrderVehicleService.selectList(sid);
+                if(!vinList.isEmpty()){
+                    for (int i = 0; i < vinLists.size(); i++) {
+                        VinListsVo vinListsVo = vinLists.get(i);
+                        BigDecimal initBigDecimalTwo = BigDecimal.ZERO;
+                        //根据sid去查询销售政策的sid，根据销售政策查询销售政策的金额
+                        ResultBean<List<String>> listResultBean = baseDiscountpackageFeign.getMoney(vinListsVo.getVinSid(), entity.getUseOrgSid());
+                        if (listResultBean.getSuccess() && !listResultBean.getData().isEmpty()) {
+                            List<String> stringList = listResultBean.getData();
+                            initBigDecimalTwo = initBigDecimalTwo.add(stringList.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add));
+                        }
+                        if(initBigDecimalTwo.compareTo(BigDecimal.ZERO) != 0){
+                            vinList.set(i,vinList.get(i)+"促销("+initBigDecimalTwo.toString()+"元)");
+                        }
+                    }
+                }
                 modelInfo.setVinList(vinList);
                 modelInfo.setOrderVinList(orderVinList);
             } else {
@@ -1271,6 +1289,31 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
         //计算总指导价-总成交价-总优惠包的价值
         bigDecimalOne = guildPriceAll.subtract(finalPriceAll).add(discountPrice);
+        List<String> vehicleList = new ArrayList<>();
+        BigDecimal initBigDecimalOne = BigDecimal.ZERO;
+        List<String> initBigDecimalOneList = new ArrayList<>();
+        //是否是现车//ToDo:促销政策
+        if ("1".equals(busSalesOrder.getType())) {
+            //根据销售订单sid查询现车的sid集合
+            vehicleList = busSalesOrderVehicleService.selectVehicleSid(sid);
+            //根据现车去查询销售政策的总促销政策之和
+            if (vehicleList.size() > 0) {
+                for (int i = 0; i < vehicleList.size(); i++) {
+                    BigDecimal initBigDecimalTwo = BigDecimal.ZERO;
+                    //根据sid去查询销售政策的sid，根据销售政策查询销售政策的金额
+                    ResultBean<List<String>> listResultBean = baseDiscountpackageFeign.getMoney(vehicleList.get(i), busSalesOrder.getUseOrgSid());
+                    if (listResultBean.getSuccess() && !listResultBean.getData().isEmpty()) {
+                        List<String> stringList = listResultBean.getData();
+                        initBigDecimalTwo = initBigDecimalTwo.add(stringList.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add));
+                    }
+                    initBigDecimalOneList.add(initBigDecimalTwo.toString());
+                }
+            }
+        }
+        if(!initBigDecimalOneList.isEmpty()){
+            String initOne = Collections.min(initBigDecimalOneList);
+            initBigDecimalOne = new BigDecimal(initOne);
+        }
         //查询返利金额
         BusSalesOrderSubmit busSalesOrderSubmit = busSalesOrderSubmitService.selectBySaleOrderSid(sid);
         if (busSalesOrderSubmit != null) {
@@ -1303,8 +1346,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             //ToDo:修改公式计算是否超权限：岗位权限*台数>总指导价-总成交价+总优惠包+总返利
             //销售支持部经理的岗位权限价格
             BigDecimal bigDecimal2 = new BigDecimal(price).multiply(new BigDecimal(quantity));
+            //岗位权限价格*台数
             bigDecimalTwo = bigDecimal2;
-            bigDecimalOne = bigDecimalOne.add(initBigDecimal);
+            //总指导价-总成交价+总优惠包+总返利
+            bigDecimalOne = bigDecimalOne.add(initBigDecimal).subtract(initBigDecimalOne.multiply(new BigDecimal(quantity)));
             if (bigDecimalTwo.compareTo(bigDecimalOne) < 0) {
                 //bigDecimalTwo<bigDecimalOne:超权限
                 isHavePower = true;
@@ -1335,7 +1380,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             bigDecimalTwo = new BigDecimal("0");
             BigDecimal bigDecimal2 = new BigDecimal(price).multiply(new BigDecimal(quantity));
             bigDecimalTwo = bigDecimal2;
-            bigDecimalOne = bigDecimalOne.add(initBigDecimal);
+            bigDecimalOne = bigDecimalOne.add(initBigDecimal).subtract(initBigDecimalOne.multiply(new BigDecimal(quantity)));
             if (bigDecimalTwo.compareTo(bigDecimalOne) < 0) {
                 //bigDecimalTwo<bigDecimalOne
                 isPower = true;
@@ -2220,6 +2265,16 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     //现车信息
                     AppNowCarVo appNowCarVo = new AppNowCarVo();
                     BeanUtil.copyProperties(vehicleOrderVo, appNowCarVo);
+                    //根据sid去查询销售政策的sid，根据销售政策查询销售政策的金额
+                    ResultBean<List<String>> listResultBean = baseDiscountpackageFeign.getMoney(vehicleOrderVo.getCarSid(), busSalesOrder.getUseOrgSid());
+                    if (listResultBean.getSuccess()) {
+                        List<String> stringList = listResultBean.getData();
+                        if(stringList.isEmpty()){
+                            appNowCarVo.setPromotion(false);
+                        }else{
+                            appNowCarVo.setPromotion(true);
+                        }
+                    }
                     //将该车型下的所有现车的车架号组合放入集合中
                     vinNoList.add(vehicleOrderVo.getVin());
                     vinNoMap.put(vehicleOrderVo.getVin(), vehicleOrderVo.getTopSid());
@@ -2540,6 +2595,16 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 for (AppBaseVehicleOrderVo vehicleOrderVo : voList) {
                     AppNowCarVo appNowCarVo = new AppNowCarVo();
                     BeanUtil.copyProperties(vehicleOrderVo, appNowCarVo);
+                    //根据sid去查询销售政策的sid，根据销售政策查询销售政策的金额
+                    ResultBean<List<String>> listResultBean = baseDiscountpackageFeign.getMoney(vehicleOrderVo.getCarSid(), busSalesOrder.getUseOrgSid());
+                    if (listResultBean.getSuccess()) {
+                        List<String> stringList = listResultBean.getData();
+                        if(stringList.isEmpty()){
+                            appNowCarVo.setPromotion(false);
+                        }else{
+                            appNowCarVo.setPromotion(true);
+                        }
+                    }
                     //根据车辆sid查询该车架号的采购系统
                     ResultBean<BasePurchSystemVo> vehicleSelectVoResultBean = baseVehicleFeign.getSystem(vehicleOrderVo.getCarSid());
                     if (vehicleSelectVoResultBean.getData() != null) {
@@ -3317,6 +3382,21 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 //包含采购系统的车架号
                 List<String> vinList = vinLists.stream().map(v -> v.getVinNo()).collect(Collectors.toList());
                 List<String> orderVinList = busSalesOrderVehicleService.selectList(sid);
+                if(!vinList.isEmpty()){
+                    for (int i = 0; i < vinLists.size(); i++) {
+                        VinListsVo vinListsVo = vinLists.get(i);
+                        BigDecimal initBigDecimalTwo = BigDecimal.ZERO;
+                        //根据sid去查询销售政策的sid，根据销售政策查询销售政策的金额
+                        ResultBean<List<String>> listResultBean = baseDiscountpackageFeign.getMoney(vinListsVo.getVinSid(), busSalesOrder.getUseOrgSid());
+                        if (listResultBean.getSuccess() && !listResultBean.getData().isEmpty()) {
+                            List<String> stringList = listResultBean.getData();
+                            initBigDecimalTwo = initBigDecimalTwo.add(stringList.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add));
+                        }
+                        if(initBigDecimalTwo.compareTo(BigDecimal.ZERO) != 0){
+                            vinList.set(i,vinList.get(i)+"，促销("+initBigDecimalTwo.toString()+"元)");
+                        }
+                    }
+                }
                 modelInfo.setVinList(vinList);
                 modelInfo.setOrderVinList(orderVinList);
             } else {
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/NowCarVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/NowCarVo.java
index 16cc4d6ea5..d2ba2f99d5 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/NowCarVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/NowCarVo.java
@@ -37,4 +37,7 @@ public class NowCarVo implements Vo {
     @ApiModelProperty("采购系统名称")
     @JsonProperty("paySystem")
     private String purchaseSystemName;
+
+    @ApiModelProperty("是否有促销标签")
+    private boolean promotion;
 }

From dd98020519aa37e787e92e6ff97b1295774b241d Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 28 Jun 2023 15:15:58 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SysFlowableConfigDto.java                 | 29 +++++++++++++++++++
 .../SysFlowableConfigFeign.java               | 13 +++++++++
 .../SysFlowableConfigVo.java                  | 25 ++++++++++++++++
 .../api/sysstaffinfo/SysStaffinfoFeign.java   |  5 ++++
 .../SysStaffinfoFeignFallback.java            |  5 ++++
 .../SysFlowableConfigMapper.java              |  5 ++++
 .../SysFlowableConfigMapper.xml               |  8 +++++
 .../SysFlowableConfigRest.java                | 14 +++++++--
 .../SysFlowableConfigService.java             | 26 +++++++++++++++--
 .../biz/sysstaffinfo/SysStaffinfoMapper.java  |  1 +
 .../biz/sysstaffinfo/SysStaffinfoMapper.xml   |  7 +++++
 .../biz/sysstaffinfo/SysStaffinfoRest.java    |  5 ++++
 .../biz/sysstaffinfo/SysStaffinfoService.java |  7 +++++
 13 files changed, 144 insertions(+), 6 deletions(-)
 create mode 100644 anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigDto.java
 create mode 100644 anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigVo.java

diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigDto.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigDto.java
new file mode 100644
index 0000000000..f8887e11b2
--- /dev/null
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigDto.java
@@ -0,0 +1,29 @@
+package com.yxt.anrui.portal.api.sysflowableconfig;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+/**
+ * @description: 流程设置转办
+ * @author: dimengzhe
+ * @date: 2023/6/28
+ **/
+@Data
+public class SysFlowableConfigDto implements Dto {
+    private static final long serialVersionUID = 5037689220100489101L;
+
+    @ApiModelProperty("当前登录人")
+    @NotBlank(message = "当前登录人不能为空")
+    private String userSid;
+
+    @ApiModelProperty("转办人用户sid")
+    private String changeUserSid;
+
+    private Date startDate;
+
+    private Date endDate;
+}
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigFeign.java
index 09a7e4fbb7..8dc5ebe573 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigFeign.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigFeign.java
@@ -6,6 +6,11 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.validation.Valid;
 
 /**
  * @description: 转办设置
@@ -23,4 +28,12 @@ public interface SysFlowableConfigFeign {
     @ApiOperation("查询是否有转办人 ")
     @GetMapping("/selectByUserSid")
     ResultBean<SysFlowableConfigVvo> selectByUserSid(@SpringQueryMap SysFlowableConfigQuery query);
+
+    @ApiOperation("初始化转办人信息")
+    @GetMapping("/initDetails")
+    ResultBean<SysFlowableConfigVo> initDetails(@RequestParam("userSid")String userSid);
+
+    @ApiOperation("保存修改")
+    @PostMapping("/saveOrUpdate")
+    ResultBean saveOrUpdate(@Valid @RequestBody SysFlowableConfigDto dto);
 }
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigVo.java
new file mode 100644
index 0000000000..556e5c4f49
--- /dev/null
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigVo.java
@@ -0,0 +1,25 @@
+package com.yxt.anrui.portal.api.sysflowableconfig;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 设置流程转办初始化
+ * @author: dimengzhe
+ * @date: 2023/6/28
+ **/
+@Data
+public class SysFlowableConfigVo implements Vo {
+    private static final long serialVersionUID = 4223685847449654287L;
+
+    @ApiModelProperty("当前登录人用户sid")
+    private String userSid;
+    @ApiModelProperty("设置的转办人用户sid")
+    private String changeUserSid;
+    @ApiModelProperty("开始时间")
+    private String startDate;
+    @ApiModelProperty("结束时间")
+    private String endDate;
+
+}
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 656878a0fb..61de446906 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
@@ -153,5 +153,10 @@ public interface SysStaffinfoFeign {
     @GetMapping("/selectStaffLists")
     ResultBean<List<PcSysStaffVo>> selectStaffLists();
 
+    @ApiOperation("获取集团所有在职人员")
+    @ResponseBody
+    @GetMapping("/selectStaffListss")
+    ResultBean<List<PcSysStaffVo>> selectStaffListss();
+
 
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java
index 54f584f640..8f516e152a 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java
@@ -108,4 +108,9 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<PcSysStaffVo>> selectStaffListss() {
+        return null;
+    }
+
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.java
index 3b300e3c94..d0f7fd073e 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.java
@@ -2,6 +2,7 @@ package com.yxt.anrui.portal.biz.sysflowableconfig;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfig;
+import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -15,4 +16,8 @@ import java.util.Date;
 @Mapper
 public interface SysFlowableConfigMapper extends BaseMapper<SysFlowableConfig> {
     SysFlowableConfig selectByUserSid(@Param("userSid") String userSid, @Param("nowDate") Date nowDate);
+
+    SysFlowableConfigVo initDetails(String userSid);
+
+    SysFlowableConfig selectByUserSids(String userSid);
 }
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.xml
index 091c4bdefe..f680bcb64e 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.xml
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.xml
@@ -4,4 +4,12 @@
     <select id="selectByUserSid" resultType="com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfig">
         select * from sys_flowable_config where userSid = #{userSid} and #{nowDate} between startDate and endDate
     </select>
+
+    <select id="initDetails" resultType="com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigVo">
+        select * from sys_flowable_config where userSid = #{userSid}
+    </select>
+
+    <select id="selectByUserSids" resultType="com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfig">
+        select * from sys_flowable_config where userSid = #{userSid}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigRest.java
index faaac787f2..08f0a21b6f 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigRest.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigRest.java
@@ -1,8 +1,6 @@
 package com.yxt.anrui.portal.biz.sysflowableconfig;
 
-import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigFeign;
-import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigQuery;
-import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigVvo;
+import com.yxt.anrui.portal.api.sysflowableconfig.*;
 import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,4 +24,14 @@ public class SysFlowableConfigRest implements SysFlowableConfigFeign {
     public ResultBean<SysFlowableConfigVvo> selectByUserSid(SysFlowableConfigQuery query) {
         return sysFlowableConfigService.selectByUserSid(query);
     }
+
+    @Override
+    public ResultBean<SysFlowableConfigVo> initDetails(String userSid) {
+        return sysFlowableConfigService.initDetails(userSid);
+    }
+
+    @Override
+    public ResultBean saveOrUpdate(SysFlowableConfigDto dto) {
+        return sysFlowableConfigService.saveOrUpdateDto(dto);
+    }
 }
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java
index 1543fc2446..7836b33bc7 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java
@@ -1,9 +1,7 @@
 package com.yxt.anrui.portal.biz.sysflowableconfig;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfig;
-import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigQuery;
-import com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfigVvo;
+import com.yxt.anrui.portal.api.sysflowableconfig.*;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.stereotype.Service;
@@ -27,4 +25,26 @@ public class SysFlowableConfigService extends MybatisBaseService<SysFlowableConf
         BeanUtil.copyProperties(sysFlowableConfig,sysFlowableConfigVvo);
         return rb.success().setData(sysFlowableConfigVvo);
     }
+
+    public ResultBean<SysFlowableConfigVo> initDetails(String userSid) {
+        ResultBean<SysFlowableConfigVo> rb = ResultBean.fireFail();
+        SysFlowableConfigVo sysFlowableConfigVo = baseMapper.initDetails(userSid);
+        return rb.success().setData(sysFlowableConfigVo);
+    }
+
+    public ResultBean saveOrUpdateDto(SysFlowableConfigDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        //查询是否包含该用户的数据
+        SysFlowableConfig sysFlowableConfig = baseMapper.selectByUserSids(dto.getUserSid());
+        if(sysFlowableConfig == null){
+            sysFlowableConfig = new SysFlowableConfig();
+            BeanUtil.copyProperties(dto,sysFlowableConfig,"sid");
+            baseMapper.insert(sysFlowableConfig);
+        }else{
+            BeanUtil.copyProperties(dto,sysFlowableConfig,"sid");
+            baseMapper.insert(sysFlowableConfig);
+            baseMapper.updateById(sysFlowableConfig);
+        }
+        return rb.success();
+    }
 }
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java
index 5e6bdbff87..c53a22f41e 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java
@@ -124,4 +124,5 @@ public interface SysStaffinfoMapper extends BaseMapper<SysStaffinfo> {
     List<AppSysStaffVo> getGressionUserList(@Param("userOrgSid")String userOrgSid);
 
     List<PcSysStaffVo> selectStaffLists();
+    List<PcSysStaffVo> selectStaffListss();
 }
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml
index abe0a3a3bb..38be52eaef 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml
@@ -387,4 +387,11 @@
         from sys_user su
                  left join sys_staffinfo si on su.staffSid = si.sid where su.isAdmin is NULL
     </select>
+
+    <select id="selectStaffLists" resultType="com.yxt.anrui.portal.api.sysstaffinfo.PcSysStaffVo">
+        select su.sid  userSid,
+               si.name staffName
+        from sys_user su
+                 left join sys_staffinfo si on su.staffSid = si.sid where su.isAdmin is NULL and si.personTypeKey != '01'
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java
index acff837bad..ccdfa8209f 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java
@@ -225,5 +225,10 @@ public class SysStaffinfoRest implements SysStaffinfoFeign {
         return sysStaffinfoService.selectStaffLists();
     }
 
+    @Override
+    public ResultBean<List<PcSysStaffVo>> selectStaffListss() {
+        return sysStaffinfoService.selectStaffListss();
+    }
+
 
 }
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java
index 3cbf75fbc3..692d273c99 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java
@@ -801,4 +801,11 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         list.removeAll(Collections.singleton(null));
         return rb.success().setData(list);
     }
+
+    public ResultBean<List<PcSysStaffVo>> selectStaffListss() {
+        ResultBean<List<PcSysStaffVo>> rb = ResultBean.fireFail();
+        List<PcSysStaffVo> list = baseMapper.selectStaffListss();
+        list.removeAll(Collections.singleton(null));
+        return rb.success().setData(list);
+    }
 }
\ No newline at end of file

From 7a468023ac4c830509825a0c1ce667eed8b88fb2 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 28 Jun 2023 16:06:04 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../portal/api/sysflowableconfig/SysFlowableConfigDto.java    | 4 ++--
 .../yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigDto.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigDto.java
index f8887e11b2..50ca6a5da8 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigDto.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigDto.java
@@ -23,7 +23,7 @@ public class SysFlowableConfigDto implements Dto {
     @ApiModelProperty("转办人用户sid")
     private String changeUserSid;
 
-    private Date startDate;
+    private String startDate;
 
-    private Date endDate;
+    private String endDate;
 }
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml
index 38be52eaef..4da2389b65 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml
@@ -388,7 +388,7 @@
                  left join sys_staffinfo si on su.staffSid = si.sid where su.isAdmin is NULL
     </select>
 
-    <select id="selectStaffLists" resultType="com.yxt.anrui.portal.api.sysstaffinfo.PcSysStaffVo">
+    <select id="selectStaffListss" resultType="com.yxt.anrui.portal.api.sysstaffinfo.PcSysStaffVo">
         select su.sid  userSid,
                si.name staffName
         from sys_user su

From 00579eea59460e876fa0bcb15e1ea5b40b8b695d Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 28 Jun 2023 16:31:20 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sysflowableconfig/SysFlowableConfigMapper.java  |  2 ++
 .../sysflowableconfig/SysFlowableConfigMapper.xml   |  4 ++++
 .../sysflowableconfig/SysFlowableConfigService.java | 13 +++++--------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.java
index d0f7fd073e..69d5ad8ca9 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.java
@@ -20,4 +20,6 @@ public interface SysFlowableConfigMapper extends BaseMapper<SysFlowableConfig> {
     SysFlowableConfigVo initDetails(String userSid);
 
     SysFlowableConfig selectByUserSids(String userSid);
+
+    int deleteBySid(String userSid);
 }
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.xml
index f680bcb64e..f6426eeaa9 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.xml
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigMapper.xml
@@ -12,4 +12,8 @@
     <select id="selectByUserSids" resultType="com.yxt.anrui.portal.api.sysflowableconfig.SysFlowableConfig">
         select * from sys_flowable_config where userSid = #{userSid}
     </select>
+
+    <delete id="deleteBySid">
+        delete from sys_flowable_config where userSid = #{userSid}
+    </delete>
 </mapper>
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java
index 7836b33bc7..0399086d7d 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java
@@ -36,15 +36,12 @@ public class SysFlowableConfigService extends MybatisBaseService<SysFlowableConf
         ResultBean rb = ResultBean.fireFail();
         //查询是否包含该用户的数据
         SysFlowableConfig sysFlowableConfig = baseMapper.selectByUserSids(dto.getUserSid());
-        if(sysFlowableConfig == null){
-            sysFlowableConfig = new SysFlowableConfig();
-            BeanUtil.copyProperties(dto,sysFlowableConfig,"sid");
-            baseMapper.insert(sysFlowableConfig);
-        }else{
-            BeanUtil.copyProperties(dto,sysFlowableConfig,"sid");
-            baseMapper.insert(sysFlowableConfig);
-            baseMapper.updateById(sysFlowableConfig);
+        if(sysFlowableConfig != null){
+            baseMapper.deleteBySid(dto.getUserSid());
         }
+        sysFlowableConfig = new SysFlowableConfig();
+        BeanUtil.copyProperties(dto,sysFlowableConfig,"sid");
+        baseMapper.insert(sysFlowableConfig);
         return rb.success();
     }
 }

From 221cf5a69e86f3e4abe3bd22febcaf614ef062c6 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 28 Jun 2023 16:33:41 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/busdeliveredapply/BusDeliveredApplyService.java          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
index 640707f7bb..eb93b8417b 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
@@ -1053,6 +1053,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 busDiscountpackageHandoverLists.add(busDiscountpackageHandoverListDto);
             }
         }
+        busDiscountpackageHandoverDto.setOrgSidPath(busDeliveredApply.getOrgSidPath());
         busDiscountpackageHandoverDto.setBusDiscountpackageHandoverLists(busDiscountpackageHandoverLists);
         busDiscountpackageHandoverService.saveOrUpdateDto(busDiscountpackageHandoverDto);
     }

From 6de057fb0f58398555f62e5bc63c8a283c3c6396 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Wed, 28 Jun 2023 16:46:14 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E4=BA=A4=E8=BD=A6=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yxt/anrui/base/common/enums/BillTypeEnum.java    | 3 ++-
 .../anrui/buscenter/biz/bushandover/BusHandoverService.java   | 4 ++--
 .../buscenter/biz/bushandoverwait/BusHandoverWaitService.java | 3 ---
 .../busvehicledatahandover/BusVehicleDataHandoverMapper.xml   | 2 +-
 .../busvehicledatahandover/BusVehicleDataHandoverService.java | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java
index 7f395c1451..59b125ba9f 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java
@@ -31,7 +31,8 @@ public enum BillTypeEnum {
     XSDDTCSQ("XSDDTCSQ", "销售订单退车申请"),
     QKTCSQ("QKTCSQ", "欠款提车申请"),
     GCCKSQ("GCCKSQ", "挂车出库申请"),
-    JCZLQRD("JCZLQRD", "交车资料确认单");
+    JCZLQRD("JCZLQRD", "交车资料确认单"),
+    JCECQRD("JCECQRD", "交车资料二次确认单");
 
     private String billType;
     private String billTypeName;
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java
index 2973b0ee86..e13f843f5b 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java
@@ -882,7 +882,7 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
                         sb.append("合格证").append("、");
                         sbKey.append("002").append("、");
                     }
-                    if (prepareVehicle.getOnBoardDataState() > 0) {
+                    if (prepareVehicle.getOnBoardDataState() == 0 || prepareVehicle.getOnBoardDataState() == 1) {
                         BusVehicleInformationHandoverDetailsListVo data = busVehicleInformationHandoverService.detailsByVinSid(handoverWait.getVinSid()).getData();
                         if (null != data) {
                             if (data.getInformations().size() > 0) {
@@ -1596,7 +1596,7 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
                         sb.append("合格证").append("、");
                         sbKey.append("002").append("、");
                     }
-                    if (prepareVehicle.getOnBoardDataState() > 0) {
+                    if (prepareVehicle.getOnBoardDataState() == 0 || prepareVehicle.getOnBoardDataState() == 1) {
                         BusVehicleInformationHandoverDetailsListVo data = busVehicleInformationHandoverService.detailsByVinSid(handoverWait.getVinSid()).getData();
                         if (null != data) {
                             if (data.getInformations().size() > 0) {
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java
index 90495929a9..79158b998e 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java
@@ -46,9 +46,6 @@ public class BusHandoverWaitService extends MybatisBaseService<BusHandoverWaitMa
                 orgPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
                 qw.eq("bh.useOrgSid", orgPath);
             }
-            if (StringUtils.isNotBlank(params.getUserSid())) {
-                qw.eq("bh.createBySid", params.getUserSid());
-            }
             qw.eq("bh.isDelete", 0);
         }
         IPage<BusHandoverWaitVo> pagging = baseMapper.selectPageVo(page, qw, params.getName());
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.xml
index 1a552b9715..660c35129e 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverMapper.xml
@@ -50,7 +50,7 @@
         ORDER BY bvh.createTime DESC
     </select>
     <select id="selectByNo" resultType="com.yxt.anrui.buscenter.api.busvehicledatahandover.AppVinListVo">
-        select vinNo as vin, sid as recordSid,billNo as billId
+        select vinNo as vin, sid as recordSid, billNo as billId
         from bus_vehicle_data_handover
         where contractNo = #{contractNo}
           and completeStateKey = '001'
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java
index 52de68739b..c203b3c0f7 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicledatahandover/BusVehicleDataHandoverService.java
@@ -300,7 +300,7 @@ public class BusVehicleDataHandoverService extends MybatisBaseService<BusVehicle
         String orgCode = resultBean1.getData().getOrgCode();
         BillNo b = new BillNo();
         b.setOrgCode(orgCode);
-        b.setBillType(BillTypeEnum.JCZLQRD.getBillType());
+        b.setBillType(BillTypeEnum.JCECQRD.getBillType());
         String bill = Rule.getBill(b);
         int i = baseMapper.selectNum(bill);
         String billNo = Rule.getBillNo(bill, i);