Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -896,7 +896,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                         // 消息推送
                         messageFeign.pushNoUriMessage(pushMessageQuery);
                     });
-                    Future future8 = pool.submit(() -> {
+                   /* Future future8 = pool.submit(() -> {
                         //发票管理员
                         List<String> recipientSidList = new ArrayList<>();
                         UserQuery userQuery = new UserQuery();
@@ -913,7 +913,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                         pushMessageQuery.setBusinessSid(busDeliveredApply.getSid());
                         // 消息推送
                         messageFeign.pushNoUriMessage(pushMessageQuery);
-                    });
+                    });*/
                     Future future9 = pool.submit(() -> {
                         //优惠包管理员
                         List<String> recipientSidList = new ArrayList<>();

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java

@@ -235,7 +235,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
         }
         //现车下不确定车架号的车辆数量
         String nowCarUnknownVinNum = orderInfo.getNowCarUnknownVinNum();
-        if(StringUtils.isBlank(nowCarUnknownVinNum) || "0".equals(nowCarUnknownVinNum)){
+        if (StringUtils.isBlank(nowCarUnknownVinNum) || "0".equals(nowCarUnknownVinNum)) {
             //添加上装信息===========
             ResultBean<BaseVehicleModel> details = baseVehicleModelFeign.selectDetails(orderInfo.getModelSid());
             if (details.getData() != null) {
@@ -276,7 +276,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                                 }
                                 if (StringUtils.isNotBlank(topSidVin)) {
                                     if (!topSidVin.equals(topSid)) {
-                                        szConfig(salesOrderSid,topSid,topPrice);
+                                        szConfig(salesOrderSid, topSid, topPrice);
                                    /* busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
                                     //新增上装
                                     BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData();
@@ -326,7 +326,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                                     } else {
                                         BusSalesOrderMakeupDetailsVo busSalesOrderMakeupDetailsVo = busSalesOrderMakeupService.details(salesOrderSid);
                                         if (busSalesOrderMakeupDetailsVo == null) {
-                                            szConfig(salesOrderSid,topSid,topPrice);
+                                            szConfig(salesOrderSid, topSid, topPrice);
                                        /* //新增上装
                                         BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData();
                                         BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup();
@@ -377,7 +377,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                                     }
                                 } else {
                                     if (StringUtils.isNotBlank(topSid)) {
-                                        szConfig(salesOrderSid,topSid,topPrice);
+                                        szConfig(salesOrderSid, topSid, topPrice);
                                   /*  busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
                                     //新增上装
                                     BaseVehinstallmodelDetailsVo baseVehinstallmodel = baseVehinstallmodelFeign.fetchDetailsBySid(topSid).getData();
@@ -473,7 +473,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                             busSalesOrderMakeup.setIsMain(0);
                             busSalesOrderMakeupService.insert(busSalesOrderMakeup);
                             busSalesOrderService.updateMakeUp(salesOrderSid, "1");*/
-                                szConfig(salesOrderSid,topSid,topPrice);
+                                szConfig(salesOrderSid, topSid, topPrice);
                             }
                         }
                         if ("1".equals(dto.getState())) {//采购订单
@@ -652,6 +652,30 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
                     busSalesOrderService.updateMakeUp1(salesOrderSid);
                 }
             }
+        } else {
+            //添加上装信息===========
+            ResultBean<BaseVehicleModel> details = baseVehicleModelFeign.selectDetails(orderInfo.getModelSid());
+            if (details.getData() != null) {
+                String vehicleKey = details.getData().getVehicleType();
+                //除牵引外，其他类型的公告型号为必填项
+                if (!BusSalesOrderConstantUtils.VehicleFunctions.TRACTION.getCode().equals(vehicleKey)) {
+                    if (StringUtils.isBlank(orderInfo.getPublicModelSid())) {
+                        return rb.setMsg("公告型号不能为空，如若不能选择请联系相关人员进行添加");
+                    }
+                }
+                //（是否开启上装需要根据车辆功能载货、自卸、搅拌车、专用车的开启，且为必填）
+                if (BusSalesOrderConstantUtils.VehicleFunctions.DUMP.getCode().equals(vehicleKey) ||
+                        BusSalesOrderConstantUtils.VehicleFunctions.TRUCK.getCode().equals(vehicleKey) ||
+                        BusSalesOrderConstantUtils.VehicleFunctions.MIXER.getCode().equals(vehicleKey)) {
+                    //删除上装信息
+                    busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
+                    busSalesOrderService.updateMakeUp1(salesOrderSid);
+                } else {
+                    //删除上装信息
+                    busSalesOrderMakeupService.deleteBySalesOrderSid(salesOrderSid);
+                    busSalesOrderService.updateMakeUp1(salesOrderSid);
+                }
+            }
         }
 
         String state = dto.getState();
@@ -685,12 +709,12 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
         int num = 0;
         if ("0".equals(state)) {//现车
             type = "1";
-            if(StringUtils.isNotBlank(nowCarUnknownVinNum) && !"0".equals(nowCarUnknownVinNum)){//不确定车架号
+            if (StringUtils.isNotBlank(nowCarUnknownVinNum) && !"0".equals(nowCarUnknownVinNum)) {//不确定车架号
                 num = Integer.valueOf(nowCarUnknownVinNum).intValue();
                 busSalesOrder = busSalesOrderService.fetchBySid(salesOrderSid);
                 busSalesOrder.setNowCarUnknownVinNum(nowCarUnknownVinNum);
                 busSalesOrderService.updateById(busSalesOrder);
-            }else{
+            } else {
                 busSalesOrder = busSalesOrderService.fetchBySid(salesOrderSid);
                 busSalesOrder.setNowCarUnknownVinNum(nowCarUnknownVinNum);
                 busSalesOrderService.updateById(busSalesOrder);

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateDetailsVo.java

@@ -18,6 +18,7 @@ public class LoanTemplateDetailsVo implements Vo {
     private static final long serialVersionUID = 3033920198621775406L;
 
     private String sid;
+
     @ApiModelProperty("用户sid")
     private String userSid;
     @ApiModelProperty("组织全路径sid")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsVo.java

@@ -20,6 +20,8 @@ public class LoanTemplateSolutionsVo implements Vo {
     private String isPack;
     @ApiModelProperty("产品政策名称")
     private String policyName;
+    @ApiModelProperty("产品政策sid")
+    private String policySid;
     @ApiModelProperty("融资项目总额")
     private String loanTotal;
     @ApiModelProperty("主车发票价")

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@@ -870,6 +870,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         //抵顶首年保险费
         String offsetPremium = dto.getOffsetPremium();
         loanSolutionsDetail.setOffsetPremium(StringUtils.isNotBlank(offsetPremium) ? new BigDecimal(offsetPremium) : BigDecimal.ZERO);
+        //抵顶购置税
+        String offsetPurchasetax = dto.getOffsetPurchasetax();
+        loanSolutionsDetail.setOffsetPurchasetax(StringUtils.isNotBlank(offsetPurchasetax)?new BigDecimal(offsetPurchasetax) : BigDecimal.ZERO);
         String proxyTotal = dto.getProxyTotal();
         loanSolutionsDetail.setProxyTotal(StringUtils.isNotBlank(proxyTotal) ? new BigDecimal(proxyTotal) : BigDecimal.ZERO);
         String offsetTotal = dto.getOffsetTotal();