垫款出纳付款确认优化

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -374,7 +374,8 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 for (LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo : loanBePadsincereVehDetailsVos) {
                     log.info("车辆sid++++++++++++++++++++++++++++++++++++++++++" + loanBePadsincereVehDetailsVo.getBusVinSid());
                     log.info("期数++++++++++++++++++++++++++++++++++++++++++" + loanBePadsincereVehDetailsVo.getPeriod());
-                    LoanRepaymentPlanMoneyVo loanRepaymentPlanMoneyVo = loanRepaymentPlanDetailsFeign.selVehSidAndPeriod(loanBePadsincereVehDetailsVo.getBusVinSid(), loanBePadsincereVehDetailsVo.getPeriod()).getData();
+                    log.info("资方合同号++++++++++++++++++++++++++++++++++++++++++" + loanBePadsincereVehDetailsVo.getBankContractNo());
+                    LoanRepaymentPlanMoneyVo loanRepaymentPlanMoneyVo = loanRepaymentPlanDetailsFeign.selVehSidAndPeriod(loanBePadsincereVehDetailsVo.getBusVinSid(), loanBePadsincereVehDetailsVo.getPeriod(),loanBePadsincereVehDetailsVo.getBankContractNo()).getData();
                     LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsFeign.fetchDetails(loanRepaymentPlanMoneyVo.getSid()).getData();
                     String paymentMoney = loanRepaymentPlanMoneyVo.getPaymentMoney().add(new BigDecimal(loanBePadsincereVehDetailsVo.getPadMoney())).toString();
                     String paymentInterest = loanRepaymentPlanMoneyVo.getPaymentInterest().add(new BigDecimal(loanBePadsincereVehDetailsVo.getBankBeInter())).toString();
@@ -400,7 +401,6 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                     finUncollectedReceivablesDetailedJRService.insert(jr);
                 }
             }
-
             FinPaymentrecord finPaymentrecordOne = null;
             if (new BigDecimal(dto.getCost()).compareTo(finPaymentrecord.getAccountsReceive()) < 0) {//实收金额小于应收金额
                 finPaymentrecordOne = new FinPaymentrecord();

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeign.java

@@ -56,7 +56,7 @@ public interface LoanRepaymentPlanDetailsFeign {
     @ApiOperation("根据销售订单车辆sid及期数查询")
     @GetMapping("/selVehSidAndPeriod")
     @ResponseBody
-    ResultBean<LoanRepaymentPlanMoneyVo> selVehSidAndPeriod(@RequestParam("busVinSid") String busVinSid,@RequestParam("period") String period);
+    ResultBean<LoanRepaymentPlanMoneyVo> selVehSidAndPeriod(@RequestParam("busVinSid") String busVinSid,@RequestParam("period") String period,@RequestParam("bankContractNo") String bankContractNo);
 
     @ApiOperation("根据销售订单车辆sid及期数修改")
     @PostMapping("/updateVehSidAndPeriod")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeignFallback.java

@@ -48,7 +48,7 @@ public class LoanRepaymentPlanDetailsFeignFallback implements LoanRepaymentPlanD
     }
 
     @Override
-    public ResultBean<LoanRepaymentPlanMoneyVo> selVehSidAndPeriod(String busVinSid, String period) {
+    public ResultBean<LoanRepaymentPlanMoneyVo> selVehSidAndPeriod(String busVinSid, String period, String bankContractNo) {
         return null;
     }
 

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

@@ -60,7 +60,7 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper<LoanRepayment
 
     LoanRepaymentPlanDetailsForOverDue checkOverDue(@Param("sid") String sid);
 
-    LoanRepaymentPlanMoneyVo selVehSidAndPeriod(@Param("busVinSid") String busVinSid,@Param("period") String period);
+    LoanRepaymentPlanMoneyVo selVehSidAndPeriod(@Param("busVinSid") String busVinSid,@Param("period") String period,@Param("bankContractNo") String bankContractNo);
 
     void updateVehSidAndPeriod(@Param("busVinSid") String busVinSid,@Param("period") String period,@Param("paymentMoney") String paymentMoney,@Param("paymentInterest") String paymentInterest);
 

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

@@ -537,6 +537,7 @@
         FROM loan_repayment_plan_details lrpd
         WHERE lrpd.busVinSid = #{busVinSid}
           AND lrpd.period = #{period}
+          AND lrpd.bankContractNo = #{bankContractNo}
     </select>
     <select id="selUseOrgSidListForFundVoucher" resultType="java.lang.String">
         SELECT p.useOrgSid

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

@@ -58,9 +58,9 @@ public class LoanRepaymentPlanDetailsRest implements LoanRepaymentPlanDetailsFei
     }
 
     @Override
-    public ResultBean<LoanRepaymentPlanMoneyVo> selVehSidAndPeriod(String busVinSid, String period) {
+    public ResultBean<LoanRepaymentPlanMoneyVo> selVehSidAndPeriod(String busVinSid, String period,String bankContractNo) {
         ResultBean rb = ResultBean.fireFail();
-        LoanRepaymentPlanMoneyVo loanRepaymentPlanMoneyVo = loanRepaymentPlanDetailsService.selVehSidAndPeriod(busVinSid, period);
+        LoanRepaymentPlanMoneyVo loanRepaymentPlanMoneyVo = loanRepaymentPlanDetailsService.selVehSidAndPeriod(busVinSid, period,bankContractNo);
         return rb.success().setData(loanRepaymentPlanMoneyVo);
     }
 

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

@@ -176,8 +176,8 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
     }
 
 
-    public LoanRepaymentPlanMoneyVo selVehSidAndPeriod(String busVinSid, String period) {
+    public LoanRepaymentPlanMoneyVo selVehSidAndPeriod(String busVinSid, String period,String bankContractNo) {
-        return baseMapper.selVehSidAndPeriod(busVinSid, period);
+        return baseMapper.selVehSidAndPeriod(busVinSid, period, bankContractNo);
     }
 
     public void updateVehSidAndPeriod(String busVinSid, String period, String paymentMoney, String paymentInterest) {