资方直还导入问题、更新推送资方退还垫款

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJR.java

@@ -63,7 +63,7 @@ public class FinUncollectedReceivablesDetailedJR extends BaseEntity {
     @ApiModelProperty("款项名称value")
     private String payCostTitleValue;
     @ApiModelProperty("应收金额（不变）")
-    private String reveivableMoney;
+    private BigDecimal reveivableMoney;
     @ApiModelProperty("当前应收金额")
     private BigDecimal currentReceivableMoney; // 当前应收金额
     @ApiModelProperty("认款状态")

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

@@ -3771,6 +3771,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                             jr.setCreateByName(userVo.getName());
                                             jr.setBusSid(planSid);
                                             jr.setCurrentReceivableMoney(new BigDecimal(v.getSubscriptionMoney()));
+                                            jr.setReveivableMoney(new BigDecimal(v.getSubscriptionMoney()));
                                             jr.setPayCostTitleKey("007");
                                             jr.setPayCostTitleValue("资方退还垫款");
                                             jr.setOrgSidPath(planDetails.getOrgSidPath());

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

@@ -135,8 +135,8 @@ public class FinUncollectedReceivablesDetailedJRService extends MybatisBaseServi
     public ResultBean updateAll(String sid, String type, BigDecimal fundDay) {
         ResultBean rb = ResultBean.fireFail();
         FinUncollectedReceivablesDetailedJR finUncollectedReceivablesDetailedJR = baseMapper.selectByType(sid, type);
-        BigDecimal bigDecimal = new BigDecimal(finUncollectedReceivablesDetailedJR.getReveivableMoney()).add(fundDay);
-        finUncollectedReceivablesDetailedJR.setReveivableMoney(bigDecimal.toString());
+        BigDecimal bigDecimal =finUncollectedReceivablesDetailedJR.getReveivableMoney().add(fundDay);
+        finUncollectedReceivablesDetailedJR.setReveivableMoney(bigDecimal);
         baseMapper.updateById(finUncollectedReceivablesDetailedJR);
         return rb.success();
     }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java

@@ -636,26 +636,28 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                 List<LoanRepaymentPlanDetails> planDetails = loanRepaymentPlanDetailsService.selPlanByNoAndPeriod(repaymentExcelInfo.getBankContractNo(), repaymentExcelInfo.getPeriod());
                 if (!planDetails.isEmpty()) {
                     for (LoanRepaymentPlanDetails planDetail : planDetails) {
-//                        String check = loanRepaymentPlanDetailsService.InsertForCheckPaymentAndBank(planDetail.getSid());
-
-
-                        LoanRepaymentHistory repaymentHistory = new LoanRepaymentHistory();
-                        repaymentHistory.setBuckle("未申请");
-                        repaymentHistory.setBuckleKey("001");
-                        repaymentHistory.setScheduleSid(planDetail.getScheduleSid());
-                        repaymentHistory.setPlanDetailSid(planDetail.getSid());
-                        repaymentHistory.setReturnWay("直还");
-                        repaymentHistory.setReturnWayKey("01");
-                        try {
-                            repaymentHistory.setActualDate(sdf.parse(repaymentExcelInfo.getRealReturnTime()));
-                        } catch (ParseException e) {
-                            e.printStackTrace();
+                        String check = loanRepaymentPlanDetailsService.InsertForCheckPaymentAndBank(planDetail.getSid());
+                        if (StringUtils.isNotBlank(check)) {
+                            if (!check.equals("0")) {
+                                LoanRepaymentHistory repaymentHistory = new LoanRepaymentHistory();
+                                repaymentHistory.setBuckle("未申请");
+                                repaymentHistory.setBuckleKey("001");
+                                repaymentHistory.setScheduleSid(planDetail.getScheduleSid());
+                                repaymentHistory.setPlanDetailSid(planDetail.getSid());
+                                repaymentHistory.setReturnWay("直还");
+                                repaymentHistory.setReturnWayKey("01");
+                                try {
+                                    repaymentHistory.setActualDate(sdf.parse(repaymentExcelInfo.getRealReturnTime()));
+                                } catch (ParseException e) {
+                                    e.printStackTrace();
+                                }
+                                BigDecimal realMoney = new BigDecimal(repaymentExcelInfo.getRealMoney());
+                                BigDecimal divide = realMoney.divide(new BigDecimal(planDetails.size()), 2, BigDecimal.ROUND_HALF_UP);
+                                repaymentHistory.setActualMoney(divide);
+                                repaymentHistory.setDataTime(new DateTime());
+                                baseMapper.insert(repaymentHistory);
+                            }
                         }
-                        BigDecimal realMoney = new BigDecimal(repaymentExcelInfo.getRealMoney());
-                        BigDecimal divide = realMoney.divide(new BigDecimal(planDetails.size()), 2, BigDecimal.ROUND_HALF_UP);
-                        repaymentHistory.setActualMoney(divide);
-                        repaymentHistory.setDataTime(new DateTime());
-                        baseMapper.insert(repaymentHistory);
                     }
                 }
             }
@@ -780,6 +782,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                                         FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
                                         jr.setBusSid(planDetails.getSid());
                                         jr.setCurrentReceivableMoney(amount);
+                                        jr.setReveivableMoney(amount);
                                         jr.setPayCostTitleKey("007");
                                         jr.setPayCostTitleValue("资方退还垫款");
                                         jr.setOrgSidPath(planDetails.getOrgSidPath());

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

@@ -185,7 +185,8 @@
                  LEFT JOIN loan_solutions as s ON p.salesOrderSid = s.salesOrderSid
                  LEFT JOIN loan_fin_policy as py ON s.policySid = py.sid
                  LEFT JOIN loan_fin_bank as b ON b.sid = py.bankSid
-            AND s.isDelete = 0
+            where
+                  s.isDelete = 0
             and p.sid = #{pSid}
     </select>
     <select id="selDifference" resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.DifferenceVo">
@@ -217,18 +218,20 @@
         WHERE a.sid = #{pSid}
     </select>
     <select id="InsertForCheckPaymentAndBank" resultType="java.lang.String">
-        SELECT CASE
-                   WHEN p.paymentMoney > 0
-                       AND b.reAdvances = 0
-                       THEN
-                       '0'
-                   ELSE '1'
-                   END as h
-        FROM loan_repayment_plan_details as p
-                 LEFT JOIN loan_solutions as s ON p.salesOrderSid = s.salesOrderSid
-                 LEFT JOIN loan_fin_policy as py ON s.policySid = py.sid
-                 LEFT JOIN loan_fin_bank as b ON b.sid = py.bankSid
-            AND s.isDelete = 0
-            and p.sid = #{sid}
+        SELECT
+            CASE
+                WHEN
+                        IFNULL(p.paymentMoney,0) > 0
+                        AND b.reAdvances = 0 THEN
+                    '0' ELSE '1'
+                END AS h
+        FROM
+            loan_repayment_plan_details AS p
+                LEFT JOIN loan_solutions AS s ON p.salesOrderSid = s.salesOrderSid
+                LEFT JOIN loan_fin_policy AS py ON s.policySid = py.sid
+                LEFT JOIN loan_fin_bank AS b ON b.sid = py.bankSid
+        WHERE
+            p.sid = #{sid}
+          AND s.isDelete = 0
     </select>
 </mapper>