完善认款顺序规则和推送计提凭证规则

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

@@ -4567,6 +4567,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 );
             }
         }
+        qw.apply("t.noReceivable > 0");
         qw.eq("1", "1");
         qw.orderBy(true, true, "t.loanContractNo")
                 .orderBy(true, true, "t.vin")
@@ -4722,6 +4723,21 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     }
                 }
             }
+            for (AppFinSelectedReceivablesDetailedRskDto f : finSelectedReceivablesDetailedDtos) {
+                if (v.getProjectName().equals("月还") || v.getProjectName().equals("资方逾期利息")) {
+                    if (v.getVin().equals(f.getVin()) && v.getLoanContractNo().equals(f.getLoanContractNo())) {
+                        if (f.getProjectName().equals("月还") || f.getProjectName().equals("资方逾期利息")) {
+                            if (Integer.valueOf(f.getPeriod()) > Integer.valueOf(v.getPeriod())) {
+                                BigDecimal noReceivable = v.getNoReceivable();
+                                BigDecimal confirmMoney = v.getConfirmMoney();
+                                if (confirmMoney.compareTo(noReceivable) < 0) {
+                                    return rb.setMsg("您的认款顺序与公司认款规则不一致");
+                                }
+                            }
+                        }
+                    }
+                }
+            }
         }
         //汇款确认书保存
         List<String> payConfirmFiles = dto.getPayConfirmFiles();

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRService.java

@@ -130,6 +130,7 @@ public class FinUncollectedReceivablesDetailedJRService extends MybatisBaseServi
         if (StringUtils.isNotBlank(vinNo)) {
             qw.eq("t.vin", vinNo);
         }
+        qw.apply("t.noReceivable > 0");
         List<AppFinUncollectedReceivablesDetailedRskVo> list = baseMapper.getRskPaymentDetailsListForRule(qw, useOrgSid, purchaseSystemSid);
         return list;
     }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java

@@ -74,7 +74,7 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper<LoanRepayment
 
     CheckPayStateVo checkPayState(@Param("pSid") String pSid);
 
-    LoanPlanDetailsVoForFundVoucher pushFund(@Param("sid") String sid);
+    LoanPlanDetailsVoForFundVoucher pushFund(@Param("busVinSid") String busVinSid);
 
     List<LoanPlanDetailsVoForLateVoucher> selPushLaterVoucherOnBuckle(@Param("planSids") List<String> planSids);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml

@@ -656,29 +656,32 @@
     </select>
     <select id="pushFund"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanPlanDetailsVoForFundVoucher">
-        SELECT c.*,
+        SELECT
+            c.*,
             ( c.reveivableMoney - c.fund ) AS duePushMoney
-        FROM (
-                 SELECT b.*
-                 FROM (
-                          SELECT a.*,
-                                 IFNULL((SELECT SUM(fund)
-                                         FROM loan_push_fund_history AS ph
-                                         WHERE ph.busVinSid = a.busVinSid), 0) AS fund
-                          FROM (
-                                   SELECT p.sid,
-                                          p.busVinSid,
-                                          p.useOrgSid,
-                                          p.useOrgName,
-                                          SUM(j.reveivableMoney) AS reveivableMoney
-                                   FROM anrui_fin.fin_uncollected_receivables_detailed_jr AS j
-                                            LEFT JOIN loan_repayment_plan_details AS p ON j.busSid = p.sid
-                                   WHERE j.payCostTitleKey = '006'
-                                   GROUP BY p.busVinSid
+        FROM
+            (
+                SELECT
+                    b.*
+                FROM
+                    (
+                        SELECT
+                            a.*,
+                            IFNULL(( SELECT SUM( fund ) FROM loan_push_fund_history AS ph WHERE ph.busVinSid = #{busVinSid} ), 0 ) AS fund
+                        FROM
+                            (
+                                SELECT
+                                    IFNULL( SUM( jr.reveivableMoney ), 0 ) AS reveivableMoney
+                                FROM
+                                    anrui_fin.fin_uncollected_receivables_detailed_jr AS jr
+                                        LEFT JOIN loan_repayment_plan_details AS p ON p.sid = jr.busSid
+                                WHERE
+                                    jr.payCostTitleKey = '006'
+                                  AND p.busVinSid = #{busVinSid}
                             ) AS a
                     ) AS b
-                 WHERE b.reveivableMoney - b.fund > 0
-                   AND b.sid = #{sid}
+                WHERE
+                    b.reveivableMoney - b.fund > 0
             ) c
     </select>
     <select id="selPushLaterVoucherOnBuckle"

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java

@@ -206,10 +206,11 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
 
     public ResultBean pushFund(String sid) {
         ResultBean rb = ResultBean.fireFail();
-        LoanPlanDetailsVoForFundVoucher v = baseMapper.pushFund(sid);
+        LoanRepaymentPlanDetails planDetails = fetchBySid(sid);
+        if (null != planDetails) {
+            LoanPlanDetailsVoForFundVoucher v = baseMapper.pushFund(planDetails.getBusVinSid());
             if (null != v) {
                 List<LoanPushFundHistory> fundHistoryList = new ArrayList<>();
-            LoanRepaymentPlanDetails planDetails = fetchBySid(sid);
                 GeneralVoucher generalVoucher = new GeneralVoucher();
                 List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
                 SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(planDetails.getUseOrgSid()).getData();
@@ -286,10 +287,12 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
                     voucherDetails.add(voucherDetail);
                 }
                 LoanPushFundHistory loanPushFundHistory = new LoanPushFundHistory();
-            BeanUtil.copyProperties(v, loanPushFundHistory, "id", "sid", "fund");
                 if (null != v.getDuePushMoney()) {
                     loanPushFundHistory.setFund(v.getDuePushMoney());
                 }
+                loanPushFundHistory.setBusVinSid(planDetails.getBusVinSid());
+                loanPushFundHistory.setUseOrgName(planDetails.getUseOrgName());
+                loanPushFundHistory.setUseOrgSid(planDetails.getUseOrgSid());
                 fundHistoryList.add(loanPushFundHistory);
                 generalVoucher.setVoucherDetails(voucherDetails);
                 finKingDeeFeign.saveFundVoucher(generalVoucher);
@@ -298,6 +301,8 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
                     loanPushFundHistoryService.saveLists(fundHistoryList);
                 }
             }
+        }
+
         return rb.success();
     }