问题修复

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -1043,7 +1043,7 @@
                         or bv.vehicleStateValue = '在途'
                         or bv.vehicleStateValue = '调入'
                 )
-        order by isFictitious desc
+        order by isFictitious,bv.locationName,bv.vinNo desc
     </select>
 
     <select id="selectAppListOne" resultType="com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo">
@@ -1069,7 +1069,7 @@
             </foreach>
         </if>
 
-        order by isFictitious desc
+        order by isFictitious,bv.locationName,bv.vinNo desc
     </select>
 
     <select id="selectImage" resultType="java.lang.String">

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -2038,7 +2038,12 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             if (baseVehicleCertificate == null) {
                 orderVoList.get(i).setCertificate(false);
             } else {
-                orderVoList.get(i).setCertificate(true);
+                if("004".equals(baseVehicleCertificate.getCertificateState())||"002".equals(baseVehicleCertificate.getCertificateState())){
+                    orderVoList.get(i).setCertificate(true);
+                }else{
+                    orderVoList.get(i).setCertificate(false);
+                }
+
             }
             //查询车辆的上装配置
             List<BaseVehinstall> baseVehinstallsList = baseVehinstallService.selectByOrgSidAndVin(orgSid, orderVoList.get(i).getVin());

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -1864,34 +1864,49 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     //添加推送至款项确认的应收未收明细中
                     /* if ("现车".equals(appOrderDetailsVo.getOrderType())) {*/
                     List<VinListsVo> vinList = appOrderModelInfoVo.getVinListsVos();
-                    for (int i = 0; i < vinList.size(); i++) {
-                        UnCollectionDto unCollectionDto = new UnCollectionDto();
-                        //合同sid
-                        unCollectionDto.setContractSid(commonContract.getSid());
-                        //合同编号
-                        unCollectionDto.setContractNo(commonContract.getContractNo());
-                        //客户名称
-                        unCollectionDto.setCustomerName(appOrderDetailsVo.getName());
-                        //客户sid
-                        unCollectionDto.setCustomerSid(appOrderDetailsVo.getCustomerSid());
-                        //客户类型
-                        unCollectionDto.setCustomerClass(appOrderDetailsVo.getCustomerKey());
-                        //客户类型
-                        unCollectionDto.setCustomerClassKey(appOrderDetailsVo.getCustomerType());
-                        //客户头像
-                        unCollectionDto.setCustomerImage(appOrderDetailsVo.getCustomerImage());
-                        unCollectionDto.setReceivablesName("订金");
-                        unCollectionDto.setCustomerPhone(appOrderDetailsVo.getPhone());
-                        unCollectionDto.setUseOrgSid(appOrderDetailsVo.getUseOrgSid());
-                        unCollectionDto.setVinNo(vinList.get(i).getVinNo());
-                        unCollectionDto.setCurrentReceivableMoney(depositInfo.getDeposit());
-                        unCollectionDto.setUserSid(dto.getUserSid());
-                        unCollectionDto.setReveivableMoney(depositInfo.getDeposit());
-                        unCollectionDto.setBusVinSid(vinList.get(i).getSid());
-                        unCollectionDto.setPayType(appOrderDetailsVo.getPayType());
-                        unCollectionDto.setPayTypeKey(appOrderDetailsVo.getPayTypeKey());
-                        finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
+                    //查询是否是结转金额，如果是，则订金金额为补交金额/台数。若为现金则为单台订金
+                    String key = depositInfo.getDepositTypeKey();
+                    BigDecimal bigDecimalKeyAll = new BigDecimal("0");
+                    if("02".equals(key)){
+                        String makeUpAll = depositInfo.getMakeUpDeposit();
+                        if(makeUpAll != null){
+                            bigDecimalKeyAll = bigDecimalKeyAll.add(new BigDecimal(makeUpAll).divide(new BigDecimal(num)));
+                        }
+                    }else{
+                        bigDecimalKeyAll = bigDecimalKeyAll.add(new BigDecimal(depositInfo.getDeposit()));
+                    }
+                    if(bigDecimalKeyAll.compareTo(BigDecimal.ZERO) != 0){
+                        for (int i = 0; i < vinList.size(); i++) {
+                            UnCollectionDto unCollectionDto = new UnCollectionDto();
+                            //合同sid
+                            unCollectionDto.setContractSid(commonContract.getSid());
+                            //合同编号
+                            unCollectionDto.setContractNo(commonContract.getContractNo());
+                            //客户名称
+                            unCollectionDto.setCustomerName(appOrderDetailsVo.getName());
+                            //客户sid
+                            unCollectionDto.setCustomerSid(appOrderDetailsVo.getCustomerSid());
+                            //客户类型
+                            unCollectionDto.setCustomerClass(appOrderDetailsVo.getCustomerKey());
+                            //客户类型
+                            unCollectionDto.setCustomerClassKey(appOrderDetailsVo.getCustomerType());
+                            //客户头像
+                            unCollectionDto.setCustomerImage(appOrderDetailsVo.getCustomerImage());
+                            unCollectionDto.setReceivablesName("订金");
+                            unCollectionDto.setCustomerPhone(appOrderDetailsVo.getPhone());
+                            unCollectionDto.setUseOrgSid(appOrderDetailsVo.getUseOrgSid());
+                            unCollectionDto.setVinNo(vinList.get(i).getVinNo());
+//                            unCollectionDto.setCurrentReceivableMoney(depositInfo.getDeposit());
+                            unCollectionDto.setCurrentReceivableMoney(bigDecimalKeyAll.toString());
+                            unCollectionDto.setUserSid(dto.getUserSid());
+                            unCollectionDto.setReveivableMoney(depositInfo.getDeposit());
+                            unCollectionDto.setBusVinSid(vinList.get(i).getSid());
+                            unCollectionDto.setPayType(appOrderDetailsVo.getPayType());
+                            unCollectionDto.setPayTypeKey(appOrderDetailsVo.getPayTypeKey());
+                            finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
+                        }
                     }
+
                     /*} else {
                         int qualiy = Integer.valueOf(appOrderModelInfoVo.getTotal()).intValue();
                         for (int i = 0; i < qualiy; i++) {

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.buscenter.api.bussalesorder.app.order;
 
+import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -96,4 +97,10 @@ public class AppOrderDetailsVo implements Vo {
     @ApiModelProperty("是否包牌")
     private String licensePlateValue;
     private String staffSid;
+    //中介人1
+    private SubmitVo intermediary1;
+    //中介人2
+    private SubmitVo intermediary2;
+
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java

@@ -29,5 +29,7 @@ public class AppOrderPriceInfoVo implements Vo {
     private String singleGuildPrice;
     @ApiModelProperty("单台整体成交价")
     private String singleFinalPrice;
+    //单车折让
+    private String singleCarDiscountPrice;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/SubmitVo.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.buscenter.api.bussalesordersubmit;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/12/29 14:36
+ * @Description
+ */
+@Data
+public class SubmitVo implements Vo {
+    private static final long serialVersionUID = 971941132986290392L;
+    //中介人
+    private String intermediaryName;
+    //联系电话
+    private String intermediaryMobile;
+    //返利费用
+    private String agencyFee;
+}

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

@@ -90,6 +90,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsV
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto;
 import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit;
 import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmitDto;
+import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDto;
@@ -2573,7 +2574,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if (orderInfo != null) {
             //该车型下的现车的车架号集合
             List<String> vinNoList = new ArrayList<>();
-            Map<String,Object> vinNoMap = new HashMap<>();
+            Map<String, Object> vinNoMap = new HashMap<>();
             String modelSid = orderInfo.getModelSid();
             String configSid = orderInfo.getConfigSid();
             String orgSid = sysStaffOrgFeign.selectSidPathByStaffSid(busSalesOrder.getStaffSid()).getData();
@@ -2585,7 +2586,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 if (!voList.isEmpty()) {
                     for (AppBaseVehicleOrderVo vehicleOrderVo : voList) {
                         vinNoList.add(vehicleOrderVo.getVin());
-                        vinNoMap.put(vehicleOrderVo.getVin(),vehicleOrderVo.getTopSid());
+                        vinNoMap.put(vehicleOrderVo.getVin(), vehicleOrderVo.getTopSid());
                     }
                 }
 
@@ -2604,7 +2605,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     if (!voList.isEmpty()) {
                         for (AppBaseVehicleOrderVo vehicleOrderVo : voList) {
                             vinNoList.add(vehicleOrderVo.getVin());
-                            vinNoMap.put(vehicleOrderVo.getVin(),vehicleOrderVo.getTopSid());
+                            vinNoMap.put(vehicleOrderVo.getVin(), vehicleOrderVo.getTopSid());
                         }
                     }
                 }
@@ -2614,7 +2615,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             List<AppNowCarListVo> nowCarList = busSalesOrderVehicleService.selectAppDetailsVoBySaleOrderSid(sid);
             nowCarList.removeAll(Collections.singleton(null));
             if (!nowCarList.isEmpty()) {
-                boolean isCheck = isCheck(vinNoList, nowCarList,vinNoMap);
+                boolean isCheck = isCheck(vinNoList, nowCarList, vinNoMap);
                 if (isCheck) {
                     isVehicle = false;
                 }
@@ -2818,7 +2819,59 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
             vo.setTotaldiscount(bigDecimalAll.toString());
         }
-
+        /*************************返利信息*******************************************/
+        BusSalesOrderSubmit busSalesOrderSubmit = busSalesOrderSubmitService.selectBySaleOrderSid(sid);
+        if (busSalesOrderSubmit != null) {
+            if (StringUtils.isNotBlank(busSalesOrderSubmit.getDistributorName())) {
+                SubmitVo submitVo = new SubmitVo();
+                submitVo.setIntermediaryName(busSalesOrderSubmit.getDistributorName());
+                submitVo.setIntermediaryMobile(busSalesOrderSubmit.getDistributorMobile());
+                if (busSalesOrderSubmit.getDistributorPrice() != null) {
+                    submitVo.setAgencyFee(busSalesOrderSubmit.getDistributorPrice().toString());
+                }
+                vo.setIntermediary1(submitVo);
+            }
+            if (StringUtils.isNotBlank(busSalesOrderSubmit.getDistributorNameTwo())) {
+                SubmitVo submitVo = new SubmitVo();
+                submitVo.setIntermediaryName(busSalesOrderSubmit.getDistributorNameTwo());
+                submitVo.setIntermediaryMobile(busSalesOrderSubmit.getDistributorMobileTwo());
+                if (busSalesOrderSubmit.getDistributorPriceTwo() != null) {
+                    submitVo.setAgencyFee(busSalesOrderSubmit.getDistributorPriceTwo().toString());
+                }
+                vo.setIntermediary2(submitVo);
+            }
+        }
+        //计算单台折让
+        BigDecimal bigDecimalSing = new BigDecimal("0");
+        if (priceInfo != null) {
+            //销售指导价-成交价+单车优惠包成本+单车返利）：***元（单车优惠包成本是总优惠包价值除以台数）
+            if (StringUtils.isNotBlank(priceInfo.getSingleGuildPrice())) {
+                bigDecimalSing = bigDecimalSing.add(new BigDecimal(priceInfo.getSingleGuildPrice()));
+            }
+            //单台成交价
+            if (StringUtils.isNotBlank(priceInfo.getSingleFinalPrice())) {
+                bigDecimalSing = bigDecimalSing.subtract(new BigDecimal(priceInfo.getSingleFinalPrice()));
+            }
+        }
+        if (StringUtils.isNotBlank(vo.getTotaldiscount())) {
+            if (priceInfo != null) {
+                BigDecimal discountA = new BigDecimal(vo.getTotaldiscount()).divide(new BigDecimal(priceInfo.getNumber()));
+                bigDecimalSing = bigDecimalSing.add(discountA);
+            }
+        }
+        if (busSalesOrderSubmit != null) {
+            BigDecimal agen = new BigDecimal("0");
+            if (busSalesOrderSubmit.getDistributorPrice() != null) {
+                agen = agen.add(busSalesOrderSubmit.getDistributorPrice());
+            }
+            if (busSalesOrderSubmit.getDistributorPriceTwo() != null) {
+                agen = agen.add(busSalesOrderSubmit.getDistributorPriceTwo());
+            }
+            bigDecimalSing = bigDecimalSing.add(agen);
+        }
+        if (priceInfo != null) {
+            priceInfo.setSingleCarDiscountPrice(bigDecimalSing.toString());
+        }
         /***************************订金信息***************************************/
         AppOrderDepositInfoVo depositInfo = busSalesOrderDepositService.selectDeposit(sid);
         if (depositInfo != null) {
@@ -3472,7 +3525,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     }
 
     public int updateMakeUp(String salesOrderSid, String i) {
-       return baseMapper.updateMakeUp(salesOrderSid,i);
+        return baseMapper.updateMakeUp(salesOrderSid, i);
     }
 
     public int updateMakeUp1(String salesOrderSid) {

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@@ -371,7 +371,8 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
                     }
                 }
             }
-            String customerNo = customerNoPrefix + HanZiConverterPinYin.getPinYinFirst(customerTemp.getName()) + customerTemp.getMobile();
+            String customerNo = getPrefix(customerTemp.getStaffSid(),customerTemp.getName(),customerTemp.getMobile());
+//            String customerNo = customerNoPrefix + HanZiConverterPinYin.getPinYinFirst(customerTemp.getName()) + customerTemp.getMobile();
             customerTemp.setCustomerNo(customerNo);
             boolean updateBoolean = updateById(customerTemp);
             if (updateBoolean) {
@@ -762,7 +763,8 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
             }
         }
         //客户编码
-        String customerNo = customerNoPrefix + HanZiConverterPinYin.getPinYinFirst(customerTemp.getName()) + customerTemp.getMobile();
+        String customerNo = getPrefix(customerTemp.getStaffSid(),customerTemp.getName(),customerTemp.getMobile());
+//        String customerNo = customerNoPrefix + HanZiConverterPinYin.getPinYinFirst(customerTemp.getName()) + customerTemp.getMobile();
         customerTemp.setCustomerNo(customerNo);
         save(customerTemp);
         // 增加跟进记录

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java

@@ -86,4 +86,7 @@ public class FinCollectionConfirmationVo implements Vo {
     private String payAccount;
     @ApiModelProperty("付款银行")
     private String payBank;
+
+    @ApiModelProperty("申请人")
+    private String createByName;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java

@@ -84,4 +84,7 @@ public class OrderDetailsVo implements Vo {
     @ApiModelProperty("是否包牌")
     private String licensePlateValue;
 
+    private OrderSubmitVo intermediary1;
+    private OrderSubmitVo intermediary2;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderPriceInfoVo.java

@@ -31,4 +31,7 @@ public class OrderPriceInfoVo implements Vo {
     @ApiModelProperty("单台整体成交价")
     @JsonProperty("overallPrice")
     private String singleFinalPrice;
+
+    //单车折让
+    private String singleCarDiscountPrice;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderSubmitVo.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.order;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/12/29 14:33
+ * @Description
+ */
+@Data
+public class OrderSubmitVo implements Vo {
+    private static final long serialVersionUID = 3355341489590086950L;
+
+    private String intermediaryName;
+
+    private String intermediaryMobile;
+
+    private String agencyFee;
+}