From b6b6330fb029a774dfd103c725ac2705335cd405 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 16 Jan 2024 16:37:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LoanBePadsincereApplyService.java         | 65 ++++++++++---------
 .../LoanRepaymentPlanDetailsMapper.xml        |  1 +
 .../AppBeCollectionVehDetailsVo.java          |  4 ++
 .../becollection/BeCollectionService.java     |  8 ++-
 4 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java
index 85a73cea21..5ba11d90a3 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java
@@ -554,11 +554,11 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
                     checkWord.add("期数不能为空");
                     break;
                 }
-                if (StringUtils.isNotBlank(excelInfo.getPeriod())){
+                if (StringUtils.isNotBlank(excelInfo.getPeriod())) {
                     String period = excelInfo.getPeriod();
                     Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
                     boolean matches = pattern.matcher(period).matches();
-                    if (!matches){
+                    if (!matches) {
                         checkWord.add("期数必须为数字");
                         break;
                     }
@@ -567,11 +567,11 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
                     checkWord.add("逾期本金不能为空");
                     break;
                 }
-                if (StringUtils.isNotBlank(excelInfo.getBePrincipal())){
+                if (StringUtils.isNotBlank(excelInfo.getBePrincipal())) {
                     String bePrincipal = excelInfo.getBePrincipal();
                     Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
                     boolean matches = pattern.matcher(bePrincipal).matches();
-                    if (!matches){
+                    if (!matches) {
                         checkWord.add("逾期本金必须为数字");
                         break;
                     }
@@ -580,11 +580,11 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
                     checkWord.add("逾期罚息不能为空");
                     break;
                 }
-                if (StringUtils.isNotBlank(excelInfo.getBeDefInter())){
+                if (StringUtils.isNotBlank(excelInfo.getBeDefInter())) {
                     String beDefInter = excelInfo.getBeDefInter();
                     Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
                     boolean matches = pattern.matcher(beDefInter).matches();
-                    if (!matches){
+                    if (!matches) {
                         checkWord.add("逾期罚息必须为数字");
                         break;
                     }
@@ -848,6 +848,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
         ResultBean rb = ResultBean.fireFail();
         String businessSid = bv.getBusinessSid();
         LoanBePadsincereApply loanBePadsincereApply = fetchBySid(businessSid);
+        List<LoanBePadsincereVehDetailsVo> loanBePadsincereVehDetailsVos = loanBePadsincereVehService.selByMainSid(loanBePadsincereApply.getSid());
         Map<String, Object> variables = new HashMap<>();
         Map<String, Object> appMap = new HashMap<>();
         appMap.put("sid", businessSid);
@@ -871,31 +872,33 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
-                FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
-                finPaymentrecordDto.setApplySid("");
-                finPaymentrecordDto.setPayCompanySid("");
-                finPaymentrecordDto.setPayType(0);
-                finPaymentrecordDto.setCreateOrgSid(loanBePadsincereApply.getUseOrgSid());
-                finPaymentrecordDto.setUseOrgSid(loanBePadsincereApply.getUseOrgSid());
-                finPaymentrecordDto.setCostTypeKey("");
-                finPaymentrecordDto.setCostTypeValue("");
-                finPaymentrecordDto.setCostTitleKey("");
-                finPaymentrecordDto.setCostTitleValue("");
-                finPaymentrecordDto.setReceiveBank("");
-                finPaymentrecordDto.setReceiveBankAccount("");
-                finPaymentrecordDto.setReceiveCompany("");
-                finPaymentrecordDto.setCost(0);
-                finPaymentrecordDto.setAccountsReceive(0);
-                finPaymentrecordDto.setBusSid("");
-                finPaymentrecordDto.setPayRemark(loanBePadsincereApply.getPaymentRemarks());
-                finPaymentrecordDto.setPayCode("");
-                finPaymentrecordDto.setCreateBySid(loanBePadsincereApply.getCreateBySid());
-                finPaymentrecordDto.setUpdateBySid(loanBePadsincereApply.getCreateBySid());
-                finPaymentrecordDto.setRemarks(loanBePadsincereApply.getRemarks());
-                finPaymentrecordDto.setPurchaseSystemSid("");
-                finPaymentrecordDto.setPurchaseSystemName("");
-                finPaymentrecordDto.setBusRemarks(loanBePadsincereApply.getPaymentRemarks());
-                finPaymentrecordFeign.save(finPaymentrecordDto);
+                for (LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo : loanBePadsincereVehDetailsVos) {
+                    FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
+                    finPaymentrecordDto.setApplySid(loanBePadsincereApply.getSid());
+                    finPaymentrecordDto.setPayCompanySid("");
+                    finPaymentrecordDto.setPayType(1);
+                    finPaymentrecordDto.setCreateOrgSid(loanBePadsincereApply.getUseOrgSid());
+                    finPaymentrecordDto.setUseOrgSid(loanBePadsincereApply.getUseOrgSid());
+                    finPaymentrecordDto.setCostTypeKey("007");
+                    finPaymentrecordDto.setCostTypeValue("垫款");
+                    finPaymentrecordDto.setCostTitleKey("008");
+                    finPaymentrecordDto.setCostTitleValue("月还");
+                    finPaymentrecordDto.setReceiveBank(loanBePadsincereVehDetailsVo.getBankCollectionAcc());
+                    finPaymentrecordDto.setReceiveBankAccount(loanBePadsincereVehDetailsVo.getBankCollectionNum());
+                    finPaymentrecordDto.setReceiveCompany("");
+                    finPaymentrecordDto.setCost(Integer.parseInt(loanBePadsincereVehDetailsVo.getPadMoney()));
+                    finPaymentrecordDto.setAccountsReceive(Integer.parseInt(loanBePadsincereVehDetailsVo.getPadMoney()));
+                    finPaymentrecordDto.setBusSid(loanBePadsincereApply.getSid());
+                    finPaymentrecordDto.setPayRemark(loanBePadsincereApply.getPaymentRemarks());
+                    finPaymentrecordDto.setPayCode("");
+                    finPaymentrecordDto.setCreateBySid(loanBePadsincereApply.getCreateBySid());
+                    finPaymentrecordDto.setUpdateBySid(loanBePadsincereApply.getCreateBySid());
+                    finPaymentrecordDto.setRemarks(loanBePadsincereApply.getRemarks());
+                    finPaymentrecordDto.setPurchaseSystemSid("");
+                    finPaymentrecordDto.setPurchaseSystemName("");
+                    finPaymentrecordDto.setBusRemarks(loanBePadsincereApply.getPaymentRemarks());
+                    finPaymentrecordFeign.save(finPaymentrecordDto);
+                }
             } else {
                 //极光推送
                 loanBePadsincereApply = fetchBySid(businessSid);
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
index f432f29145..401656f3b5 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
@@ -53,6 +53,7 @@
           AND lrpd.period = #{period}
           AND lrpd.bankContractNo = #{bankContractNo}
           AND DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') &lt; CURDATE()
+          AND lrh.`updateState` = '1'
         GROUP BY lrpd.`sid`
         HAVING (yq_total > 0)
     </select>
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionVehDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionVehDetailsVo.java
index 6220469b8c..79c7e58ebd 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionVehDetailsVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionVehDetailsVo.java
@@ -56,6 +56,10 @@ public class AppBeCollectionVehDetailsVo implements Vo {
 
     @ApiModelProperty("是否有担保人")
     private Boolean showDbr = false;
+    @ApiModelProperty("是否有还款协议")
+    private Boolean showXy = false;
+    @ApiModelProperty("是否有远程控制")
+    private Boolean showYckz = false;
     @ApiModelProperty("销售订单车辆sid")
     private String saleVehSid;
     @ApiModelProperty("贷款合同编号")
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java
index 07152ad54c..6c314d01da 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java
@@ -307,9 +307,15 @@ public class BeCollectionService {
             AppBeCollectionVehDetailsVo appBeCollectionVehDetailsVo = new AppBeCollectionVehDetailsVo();
             appBeCollectionVehDetailsVo.setSaleVehSid(loanBeCollectionVehDetail.getSaleVehSid());
             LoanBeCollectionVehDbrDetailsVo loanBeCollectionVehDbrDetailsVo = loanBeCollectionVehFeign.initDbr(loanBeCollectionVehDetail.getSaleVehSid()).getData();
-            if (StringUtils.isNotBlank(loanBeCollectionVehDbrDetailsVo.getPeoName())) {
+            if (StringUtils.isNotBlank(loanBeCollectionVehDbrDetailsVo.getPeoName()) && collMeasures.contains("增加担保人")) {
                 appBeCollectionVehDetailsVo.setShowDbr(true);
             }
+            if (collMeasures.contains("远程控制")){
+                appBeCollectionVehDetailsVo.setShowYckz(true);
+            }
+            if (collMeasures.contains("签订还款协议")){
+                appBeCollectionVehDetailsVo.setShowXy(true);
+            }
             appBeCollectionVehDetailsVo.setContractId(loanBeCollectionVehDetail.getLoanContractNo());
             appBeCollectionVehDetailsVo.setVin(loanBeCollectionVehDetail.getVinNo());
             appBeCollectionVehDetailsVo.setCarNum(loanBeCollectionVehDetail.getCarNum());