From 6b81e5dfbfa66d3fbe4381ff1de95bf1db34f973 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Thu, 31 Aug 2023 10:34:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E6=B4=BD=E8=B0=88=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusArrearsCarryVehicleApplyService.java   |  56 ++++--
 .../CrmVehicledemandService.java              | 180 ++++++++++--------
 .../src/main/resources/file/confirm.docx      | Bin 0 -> 13824 bytes
 .../api/loanfinotherPolicy/OtherPolicyVo.java |   5 +-
 4 files changed, 143 insertions(+), 98 deletions(-)
 create mode 100644 anrui-fin/anrui-fin-biz/src/main/resources/file/confirm.docx

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
index b77f60bcaa..37f7477f4e 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java
@@ -2097,18 +2097,24 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         UserRoleQuery userRoleQuery = new UserRoleQuery();
         userRoleQuery.setRoleSid(candidateGroups.get(0));
         List<SysUserVo> sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData();
-        StringBuilder nextNodeUserSids = new StringBuilder();
+        sysUserVos.removeAll(Collections.singleton(null));
+        String nextNodeUserSids = "";
+        if(sysUserVos.size()>0){
+            nextNodeUserSids = String.join(",",sysUserVos.stream().map(v->v.getSid()).collect(Collectors.toList()));
+        }
+       /* StringBuilder nextNodeUserSids = new StringBuilder();
         if (sysUserVos.size() > 0) {
             for (SysUserVo sysUserVo : sysUserVos) {
                 String sid = sysUserVo.getSid();
                 nextNodeUserSids.append(sid).append(",");
             }
-        }
+        }*/
         if (StringUtils.isBlank(nextNodeUserSids)) {
-            return rb.setMsg("下一环节暂无操作人员");
+//            return rb.setMsg("下一环节暂无操作人员");
+            nextNodeUserSids = ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId();
         }
-        String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
-        bv.setNextNodeUserSids(substring);
+//        String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
+        bv.setNextNodeUserSids(nextNodeUserSids);
         if (bv.getTaskId().equals(busArrearsCarryVehicleApply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.handleProsess(bv);
             if (!resultBean1.getSuccess()) {
@@ -2116,21 +2122,33 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             }
             UpdateFlowFieldVo ufVos = resultBean1.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean1.getData()));
+            busArrearsCarryVehicleApply = fetchBySid(bv.getBusinessSid());
             if (!"Event_end".equals(ufVos.getTaskDefKey())) {
-                //极光推送
-                busArrearsCarryVehicleApply = fetchBySid(bv.getBusinessSid());
-                ufVos.setProcInsId(busArrearsCarryVehicleApply.getProcInstId());
-                MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
-                MessageFlowVo messageFlowVo = new MessageFlowVo();
-                BeanUtil.copyProperties(ufVos, messageFlowVo);
-                ufVos.setProcInsId(busArrearsCarryVehicleApply.getProcInstId());
-                messageFlowableQuery.setUfVo(messageFlowVo);
-                messageFlowableQuery.setAppMap(appMap);
-                messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
-                messageFlowableQuery.setModuleName("欠款提车申请");
-                messageFlowableQuery.setMsgContent(busArrearsCarryVehicleApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
-                messageFlowableQuery.setMsgTitle("欠款提车申请");
-                ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+                try {
+                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                            .setNameFormat("demo-pool-%d").build();
+                    ExecutorService pool = new ThreadPoolExecutor(2, 100,
+                            0L, TimeUnit.MILLISECONDS,
+                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+                    BusArrearsCarryVehicleApply finalBusArrearsCarryVehicleApply1 = busArrearsCarryVehicleApply;
+                    Future future1 = pool.submit(() -> {
+                        //极光推送
+                        ufVos.setProcInsId(finalBusArrearsCarryVehicleApply1.getProcInstId());
+                        MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                        MessageFlowVo messageFlowVo = new MessageFlowVo();
+                        BeanUtil.copyProperties(ufVos, messageFlowVo);
+                        ufVos.setProcInsId(finalBusArrearsCarryVehicleApply1.getProcInstId());
+                        messageFlowableQuery.setUfVo(messageFlowVo);
+                        messageFlowableQuery.setAppMap(appMap);
+                        messageFlowableQuery.setBusinessSid(bv.getBusinessSid());
+                        messageFlowableQuery.setModuleName("欠款提车申请");
+                        messageFlowableQuery.setMsgContent(finalBusArrearsCarryVehicleApply1.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                        messageFlowableQuery.setMsgTitle("欠款提车申请");
+                        ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             } else {
                 List<BusArrearsCarryVehicleDetails> carList = busArrearsCarryVehicleDetailsService.selectDetailsByApplySid(bv.getBusinessSid());
                 for (BusArrearsCarryVehicleDetails adCarListDto : carList) {
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java
index 2d2a8c9e23..16534ff805 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java
@@ -396,7 +396,7 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
         } else {
             entity.setVehicleModelOffer(null);
         }
-        if ("1".equals(dto.getPurchaseMethod())) {
+        if ("1".equals(dto.getPurchaseMethod())) {//全款
             if ("1".equals(dto.getFinancePlan())) {
                 entity.setType(null);
                 entity.setTypeKey(null);
@@ -404,41 +404,55 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
             } else {
                 if ("1".equals(dto.getFinTypeKey())) {//资方常规
                     AppCrmSolutions finNormal = dto.getFinNormal();
+                    if (finNormal != null) {
+                        SolutionssDto solutionsDto = new SolutionssDto();
+                        BeanUtil.copyProperties(finNormal, solutionsDto, "sid");
+                        solutionsDto.setSaleOrderSid(sid);
+                        solutionsDto.setShowMore(false);
+                        ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
+                        if (!resultBean.getSuccess()) {
+                            return rb.setMsg(resultBean.getMsg());
+                        }
+                        entity.setTypeKey("1");
+                        entity.setType("资方常规");
+                    }else{
+                        boolean isShowMore = finNormal.isShowMore();
+                        if (isShowMore) {
+                            loanSolutionsFeign.deleteByOrderSid(sid);
+                        }
+                    }
+                } else {//金融定制
+
+                }
+            }
+        } else {//贷款
+            if ("1".equals(dto.getFinTypeKey())) {//资方常规
+                AppCrmSolutions finNormal = dto.getFinNormal();
+                if (finNormal != null) {
                     SolutionssDto solutionsDto = new SolutionssDto();
                     BeanUtil.copyProperties(finNormal, solutionsDto, "sid");
                     solutionsDto.setSaleOrderSid(sid);
-                    solutionsDto.setShowMore(false);
+                    solutionsDto.setShowMore(true);
                     ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
-                    if(!resultBean.getSuccess()){
+                    if (!resultBean.getSuccess()) {
                         return rb.setMsg(resultBean.getMsg());
                     }
                     entity.setTypeKey("1");
                     entity.setType("资方常规");
-                } else {//金融定制
-
-                }
-            }
-        } else {
-            if ("1".equals(dto.getFinTypeKey())) {//资方常规
-                AppCrmSolutions finNormal = dto.getFinNormal();
-                SolutionssDto solutionsDto = new SolutionssDto();
-                BeanUtil.copyProperties(finNormal, solutionsDto, "sid");
-                solutionsDto.setSaleOrderSid(sid);
-                solutionsDto.setShowMore(true);
-                ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
-                if(!resultBean.getSuccess()){
-                    return rb.setMsg(resultBean.getMsg());
-                }
-                entity.setTypeKey("1");
-                entity.setType("资方常规");
-                SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(sid).getData();
-                if (loanSolutions != null) {
-                    if (StringUtils.isBlank(loanSolutions.getTypeKey())) {
-                        entity.setFinancePlan("4");//担保
-                        entity.setFinancePlanValue("担保");//担保
-                    } else {
-                        entity.setFinancePlan("3");//自营非担保
-                        entity.setFinancePlanValue("自营非担保");//自营非担保
+                    SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(sid).getData();
+                    if (loanSolutions != null) {
+                        if (StringUtils.isBlank(loanSolutions.getTypeKey())) {
+                            entity.setFinancePlan("4");//担保
+                            entity.setFinancePlanValue("担保");//担保
+                        } else {
+                            entity.setFinancePlan("3");//自营非担保
+                            entity.setFinancePlanValue("自营非担保");//自营非担保
+                        }
+                    }
+                } else {//若存在
+                    boolean isShowMore = finNormal.isShowMore();
+                    if (!isShowMore) {
+                        loanSolutionsFeign.deleteByOrderSid(sid);
                     }
                 }
             } else {//金融定制
@@ -620,7 +634,7 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
                                 solutionsDto.setShowMore(false);
                             }
                             ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
-                            if(!resultBean.getSuccess()){
+                            if (!resultBean.getSuccess()) {
                                 return rb.setMsg(resultBean.getMsg());
                             }
                         }
@@ -630,32 +644,35 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
                 }
             } else {
                 //新增客户的金融方案
-                if ("1".equals(dto.getTypeKey())) {//资方常规
-                    CrmSolutions crmSolutions = dto.getCrmSolutions();
-                    if (crmSolutions != null) {
-                        SolutionssDto solutionsDto = new SolutionssDto();
-                        BeanUtil.copyProperties(crmSolutions, solutionsDto, "sid");
-                        solutionsDto.setSaleOrderSid(sid);
-                        solutionsDto.setShowMore(true);
-                        ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
-                        if(!resultBean.getSuccess()){
-                            return rb.setMsg(resultBean.getMsg());
+                if(StringUtils.isNotBlank(dto.getTypeKey())){
+                    if ("1".equals(dto.getTypeKey())) {//资方常规
+                        CrmSolutions crmSolutions = dto.getCrmSolutions();
+                        if (crmSolutions != null) {
+                            SolutionssDto solutionsDto = new SolutionssDto();
+                            BeanUtil.copyProperties(crmSolutions, solutionsDto, "sid");
+                            solutionsDto.setSaleOrderSid(sid);
+                            solutionsDto.setShowMore(true);
+                            ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
+                            if (!resultBean.getSuccess()) {
+                                return rb.setMsg(resultBean.getMsg());
+                            }
                         }
+                        crmVehicledemand.setTypeKey("1");
+                        crmVehicledemand.setType("资方常规");
+                    } else {//定制金融
                     }
-                    crmVehicledemand.setTypeKey("1");
-                    crmVehicledemand.setType("资方常规");
-                } else {//定制金融
-                }
-                SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(sid).getData();
-                if (loanSolutions != null) {
-                    if (StringUtils.isBlank(loanSolutions.getTypeKey())) {
-                        crmVehicledemand.setFinancePlan("4");//担保
-                        crmVehicledemand.setFinancePlanValue("担保");//担保
-                    } else {
-                        crmVehicledemand.setFinancePlan("3");//自营非担保
-                        crmVehicledemand.setFinancePlanValue("自营非担保");//自营非担保
+                    SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(sid).getData();
+                    if (loanSolutions != null) {
+                        if (StringUtils.isBlank(loanSolutions.getTypeKey())) {
+                            crmVehicledemand.setFinancePlan("4");//担保
+                            crmVehicledemand.setFinancePlanValue("担保");//担保
+                        } else {
+                            crmVehicledemand.setFinancePlan("3");//自营非担保
+                            crmVehicledemand.setFinancePlanValue("自营非担保");//自营非担保
+                        }
                     }
                 }
+
             }
             baseMapper.insert(crmVehicledemand);
 
@@ -666,7 +683,7 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
             }
             BeanUtil.copyProperties(dto, crmVehicledemand, "sid");
             crmVehicledemand.setCustomerSid(crmCustomerTemp.getSid());
-            if ("1".equals(dto.getPurchaseMethod())) {
+            if ("1".equals(dto.getPurchaseMethod())) {//全款
                 if ("2".equals(dto.getFinancePlan())) {//三方金融
                     if ("1".equals(dto.getTypeKey())) {//资方常规
                         CrmSolutions crmSolutions = dto.getCrmSolutions();
@@ -678,7 +695,7 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
                                 solutionsDto.setShowMore(false);
                             }
                             ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
-                            if(!resultBean.getSuccess()){
+                            if (!resultBean.getSuccess()) {
                                 return rb.setMsg(resultBean.getMsg());
                             }
                         }
@@ -690,36 +707,43 @@ public class CrmVehicledemandService extends MybatisBaseService<CrmVehicledemand
                     crmVehicledemand.setTypeKey(null);
                     loanSolutionsFeign.deleteByOrderSid(sid);
                 }
-            } else {
+            } else {//贷款
                 //新增客户的金融方案
-                if ("1".equals(dto.getTypeKey())) {//资方常规
-                    CrmSolutions crmSolutions = dto.getCrmSolutions();
-                    if (crmSolutions != null) {
-                        SolutionssDto solutionsDto = new SolutionssDto();
-                        BeanUtil.copyProperties(crmSolutions, solutionsDto, "sid");
-                        solutionsDto.setSaleOrderSid(sid);
-                        solutionsDto.setShowMore(true);
-                        ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
-                        if(!resultBean.getSuccess()){
-                            return rb.setMsg(resultBean.getMsg());
+                if(StringUtils.isNotBlank(dto.getTypeKey())){
+                    if ("1".equals(dto.getTypeKey())) {//资方常规
+                        CrmSolutions crmSolutions = dto.getCrmSolutions();
+                        if (crmSolutions != null) {
+                            SolutionssDto solutionsDto = new SolutionssDto();
+                            BeanUtil.copyProperties(crmSolutions, solutionsDto, "sid");
+                            solutionsDto.setSaleOrderSid(sid);
+                            solutionsDto.setShowMore(true);
+                            ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto);
+                            if (!resultBean.getSuccess()) {
+                                return rb.setMsg(resultBean.getMsg());
+                            }
+                        } else {
+                            loanSolutionsFeign.deleteByOrderSid(sid);
                         }
-                    }else{
-                        loanSolutionsFeign.deleteByOrderSid(sid);
+                        crmVehicledemand.setTypeKey("1");
+                        crmVehicledemand.setType("资方常规");
+                    } else {//定制金融
                     }
-                    crmVehicledemand.setTypeKey("1");
-                    crmVehicledemand.setType("资方常规");
-                } else {//定制金融
-                }
-                SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(sid).getData();
-                if (loanSolutions != null) {
-                    if (StringUtils.isBlank(loanSolutions.getTypeKey())) {
-                        crmVehicledemand.setFinancePlan("4");//担保
-                        crmVehicledemand.setFinancePlanValue("担保");//担保
-                    } else {
-                        crmVehicledemand.setFinancePlan("3");//自营非担保
-                        crmVehicledemand.setFinancePlanValue("自营非担保");//自营非担保
+                    SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(sid).getData();
+                    if (loanSolutions != null) {
+                        if (StringUtils.isBlank(loanSolutions.getTypeKey())) {
+                            crmVehicledemand.setFinancePlan("4");//担保
+                            crmVehicledemand.setFinancePlanValue("担保");//担保
+                        } else {
+                            crmVehicledemand.setFinancePlan("3");//自营非担保
+                            crmVehicledemand.setFinancePlanValue("自营非担保");//自营非担保
+                        }
                     }
+                }else{
+                    loanSolutionsFeign.deleteByOrderSid(sid);
+                    crmVehicledemand.setTypeKey(null);
+                    crmVehicledemand.setType(null);
                 }
+
             }
             baseMapper.updateById(crmVehicledemand);
         }
diff --git a/anrui-fin/anrui-fin-biz/src/main/resources/file/confirm.docx b/anrui-fin/anrui-fin-biz/src/main/resources/file/confirm.docx
new file mode 100644
index 0000000000000000000000000000000000000000..db58d7f12aa12900182ab40b30875d77aed947bb
GIT binary patch
literal 13824
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

literal 0
HcmV?d00001

diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/OtherPolicyVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/OtherPolicyVo.java
index 9125634f87..bdcbf17a77 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/OtherPolicyVo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/OtherPolicyVo.java
@@ -14,7 +14,6 @@ public class OtherPolicyVo implements Vo {
     private static final long serialVersionUID = 699706797731138466L;
 
     private String sid;
-
     private String name;
     @ApiModelProperty("年利率")
     private String yearRatio;
@@ -22,4 +21,8 @@ public class OtherPolicyVo implements Vo {
     private String period;
     @ApiModelProperty("期数key")
     private String periodKey;
+    @ApiModelProperty("最高融资额比例")
+    private String maxLoanRatio;
+    @ApiModelProperty("最高融资额")
+    private String maxLoanAmount;
 }