修改

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -67,6 +67,7 @@ import com.yxt.anrui.fin.api.kingdee.arreceivebill.ARReceivebill;
 import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
 import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService;
 import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedService;
+import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
 import com.yxt.anrui.fin.biz.kingdee.arreceivebill.ArReceivebillService;
 import com.yxt.anrui.fin.biz.kingdee.bdcustomer.BdCustomerService;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
@@ -153,6 +154,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
     private BasePurchaseSystemFeign basePurchaseSystemFeign;
     @Autowired
     private LoanSolutionsFeign loanSolutionsFeign;
+    @Autowired
+    private FinKingDeeService finKingDeeService;
 
     private QueryWrapper<FinCollectionConfirmation> createQueryWrapper(FinCollectionConfirmationQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -3171,8 +3174,20 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 customerQuery.setOrgCode(orgCode);
             }
         }
-        ResultBean<String> customerResultBean = crmCustomerTempFeign.checkCustomerOrUpdate(customerQuery);
-        log.info("推送客户{}", customerResultBean);
+//        ResultBean<String> customerResultBean = crmCustomerTempFeign.checkCustomerOrUpdate(customerQuery);
+//        log.info("推送客户{}", customerResultBean);
+        //根据客户编码查询金蝶中是否存在该客户
+        Boolean aBoolean = finKingDeeService.customerExistState(customerQuery.getCustomerNo()).getData();
+        if (!aBoolean) {//不存在则创建
+            BdCustomer bdCustomer = new BdCustomer();
+            bdCustomer.setFNumber(customerQuery.getCustomerNo());
+            bdCustomer.setFName(customerQuery.getCustomerName());
+            bdCustomer.setTOrgIds(customerQuery.getOrgCode());
+            ResultBean resultBean = bdCustomerService.draftBdCustomer(bdCustomer);
+            log.info("推送客户{}", resultBean);
+        }else{
+            log.info("已存在客户{}",customerQuery.getCustomerNo());
+        }
         return customerQuery.getCustomerNo();
     }
 

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -33,7 +33,7 @@ public enum ProcDefEnum {
     BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:722512"),
     BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"),
     BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:4:1362508"),
-    BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:5:1600004"),
+    BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:6:1602504"),
     BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"),
     BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"),
     SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:1:535004"),

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

@@ -145,6 +145,13 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                         }
                     }
                 }
+            }else{
+                if (StringUtils.isNotBlank(dto.getOffsetPremium())) {
+                    if(new BigDecimal(dto.getOffsetPremium()).compareTo(BigDecimal.ZERO)>0){
+                        return rb.setMsg("抵顶首年保险费不能超过保险费用");
+                    }
+                }
+
             }
             //是否勾选购置税
             if (dto.isPurchaseTaxCb()) {
@@ -160,6 +167,12 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                     }
                 }
 
+            }else{
+                if (StringUtils.isNotBlank(dto.getOffsetPurchasetax())) {
+                    if(new BigDecimal(dto.getOffsetPurchasetax()).compareTo(BigDecimal.ZERO)>0){
+                        return rb.setMsg("抵顶购置税不能超过购置税");
+                    }
+                }
             }
         }