From 9984f447cd39dda65a1d863f0efc5fd7ba39860e Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Fri, 30 Aug 2024 09:26:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E6=B8=85=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=80=80=E8=BF=98=E8=B5=84=E6=96=B9=E5=9E=AB=E6=AC=BE?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E5=92=8C=E8=BF=98=E6=AC=BE=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinCollectionConfirmationService.java     |  1 +
 .../LoanRepaymentHistoryMapper.xml            |  7 ++-
 .../loansettleapply/LoanSettleApplyMapper.xml |  2 +-
 .../LoanSettleApplyService.java               | 50 +++++++++----------
 4 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
index 5b72a77b11..d4fca866f3 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
@@ -5655,6 +5655,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         for (AppFinSelectedReceivablesDetailedRskDto v : finSelectedReceivablesDetailedDtos) {
             //已选
             FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
+            finSelectedReceivablesDetailed.setRemarks("间还");
             // BeanUtil.copyProperties(v, finSelectedReceivablesDetailed, "sid");
             if (StringUtils.isNotBlank(v.getVin())) {
                 String[] splitVin = v.getVin().split("/");
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml
index edae0fd4a1..d0b261934d 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml
@@ -398,7 +398,7 @@
         j.reveivableMoney AS dueMoney,
         s.subscriptionDate AS actualDate,
         s.subscriptionMoney AS actualMoney,
-        '' AS returnWay,
+        s.remarks AS returnWay,
         '' AS dataTime,
         '' AS updateTime,
         '' AS updateState,
@@ -416,6 +416,11 @@
         WHERE
         s.receivablesName = '资金占用费'
         OR s.receivablesName = '资方逾期利息'
+        OR s.receivablesName = '资方退还垫款'
+        OR s.receivablesName = '其他费用'
+        OR s.receivablesName = '合同违约金'
+        OR s.receivablesName = '名义价'
+        OR s.receivablesName = '结清时资方逾期利息'
         AND s.auditState = 3
         ) AS a
         <where>
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml
index b593cd8caa..bbb84e106e 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyMapper.xml
@@ -333,7 +333,7 @@ FROM (
             loan_repayment_plan_details AS p
                 LEFT JOIN anrui_fin.fin_uncollected_receivables_detailed_jr as jr ON p.sid = jr.busSid
                 LEFT JOIN anrui_fin.fin_selected_receivables_detailed as s ON jr.sid = s.receivablesSid
-        WHERE p.busVinSid = #{busVinSid} AND s.auditState = '3' AND s.createTime > #{formatDate}
+        WHERE p.busVinSid = #{busVinSid} AND s.auditState = '3' AND s.createTime > #{formatDate} and s.receivablesName != '资方退还垫款'
     </select>
     <select id="selDueMoneyByBusVinSidAndCloseDate" resultType="java.lang.String">
         SELECT
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
index 9448e188ed..86e0b0b19e 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
@@ -1361,31 +1361,31 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
             fin.setOrgSidPath(loanSettleApply.getOrgSidPath());
             selectList.add(fin);
         }
-        //资方退还垫款应收
-        List<PlanNoReturnMoney> p7 = baseMapper.selNoReturnJrMoneyByBusVinSidAndKeyDesc(busVinSid, "007");
-        p7.removeAll(Collections.singleton(null));
-        if (!p7.isEmpty() && p7.size() > 0) {
-            for (PlanNoReturnMoney m : p7) {
-                BigDecimal money = new BigDecimal(m.getMoney());
-                String sid = m.getSid();
-                LoanRepaymentPlanDetails pd = loanRepaymentPlanDetailsService.fetchBySid(sid);
-                FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed();
-                fin.setCreateBySid(userSid);
-                fin.setRemarks("减免");
-                fin.setVIN(pd.getVinNo());
-                fin.setUseOrgSid(pd.getUseOrgSid());
-                fin.setReceivablesName("资方退还垫款");
-                fin.setSubscriptionMoney(money);
-                fin.setSubscriptionDate(DateUtil.today());
-                fin.setAuditState(3);
-                fin.setAuditDate(DateUtil.today());
-                fin.setReceivablesSid(m.getJrSid());
-                fin.setKxState("01");
-                fin.setUseOrgName(pd.getUseOrgName());
-                fin.setOrgSidPath(loanSettleApply.getOrgSidPath());
-                selectList.add(fin);
-            }
-        }
+//        //资方退还垫款应收
+//        List<PlanNoReturnMoney> p7 = baseMapper.selNoReturnJrMoneyByBusVinSidAndKeyDesc(busVinSid, "007");
+//        p7.removeAll(Collections.singleton(null));
+//        if (!p7.isEmpty() && p7.size() > 0) {
+//            for (PlanNoReturnMoney m : p7) {
+//                BigDecimal money = new BigDecimal(m.getMoney());
+//                String sid = m.getSid();
+//                LoanRepaymentPlanDetails pd = loanRepaymentPlanDetailsService.fetchBySid(sid);
+//                FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed();
+//                fin.setCreateBySid(userSid);
+//                fin.setRemarks("减免");
+//                fin.setVIN(pd.getVinNo());
+//                fin.setUseOrgSid(pd.getUseOrgSid());
+//                fin.setReceivablesName("资方退还垫款");
+//                fin.setSubscriptionMoney(money);
+//                fin.setSubscriptionDate(DateUtil.today());
+//                fin.setAuditState(3);
+//                fin.setAuditDate(DateUtil.today());
+//                fin.setReceivablesSid(m.getJrSid());
+//                fin.setKxState("01");
+//                fin.setUseOrgName(pd.getUseOrgName());
+//                fin.setOrgSidPath(loanSettleApply.getOrgSidPath());
+//                selectList.add(fin);
+//            }
+//        }
         //对应的垫款金额、资方逾期利息设置0
         List<LoanRepaymentPlanDetails> ps = baseMapper.selectPlanListByBusVinSid(busVinSid);
         ps.removeAll(Collections.singleton(null));