推送金融应收

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

@@ -361,16 +361,10 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
             if ("007".equals(finPaymentrecord.getCostTypeKey())){
                 List<LoanBePadsincereVehDetailsVo> loanBePadsincereVehDetailsVos = loanBePadsincereVehFeign.selByMainSid(finPaymentrecord.getBusSid()).getData();
                 for (LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo : loanBePadsincereVehDetailsVos) {
-                    LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsFeign.selVehSidAndPeriod(loanBePadsincereVehDetailsVo.getBusVinSid(), loanBePadsincereVehDetailsVo.getPeriod()).getData();
-                    System.out.println(planDetails.getBankName());
-                    if (planDetails.getPaymentMoney() == null){
-                        planDetails.setPaymentMoney(new BigDecimal("0"));
-                    }
-                    if (planDetails.getPaymentInterest() == null){
-                        planDetails.setPaymentInterest(new BigDecimal("0"));
-                    }
-                    String paymentMoney = planDetails.getPaymentMoney().add(new BigDecimal(loanBePadsincereVehDetailsVo.getPadMoney())).toString();
-                    String paymentInterest = planDetails.getPaymentInterest().add(new BigDecimal(loanBePadsincereVehDetailsVo.getBankBeInter())).toString();
+                    LoanRepaymentPlanMoneyVo loanRepaymentPlanMoneyVo = loanRepaymentPlanDetailsFeign.selVehSidAndPeriod(loanBePadsincereVehDetailsVo.getBusVinSid(), loanBePadsincereVehDetailsVo.getPeriod()).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();
                     loanRepaymentPlanDetailsFeign.updateVehSidAndPeriod(loanBePadsincereVehDetailsVo.getBusVinSid(), loanBePadsincereVehDetailsVo.getPeriod(),paymentMoney,paymentInterest);
                     //推送金融应收
                     FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();

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<LoanRepaymentPlanDetails> selVehSidAndPeriod(@RequestParam("busVinSid") String busVinSid,@RequestParam("period") String period);
+    ResultBean<LoanRepaymentPlanMoneyVo> selVehSidAndPeriod(@RequestParam("busVinSid") String busVinSid,@RequestParam("period") String period);
 
     @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<LoanRepaymentPlanDetails> selVehSidAndPeriod(String busVinSid, String period) {
+    public ResultBean<LoanRepaymentPlanMoneyVo> selVehSidAndPeriod(String busVinSid, String period) {
         return null;
     }
 

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

@@ -7,6 +7,7 @@ import java.math.BigDecimal;
 @Data
 public class LoanRepaymentPlanMoneyVo {
 
+    private String sid;
     private BigDecimal paymentMoney; //公司垫款金额
     private BigDecimal paymentInterest; //垫资方逾期利息
 

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

@@ -67,7 +67,7 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper<LoanRepayment
 
     LoanRepaymentPlanDetailsForOverDue checkOverDue(@Param("sid") String sid);
 
-    LoanRepaymentPlanDetails selVehSidAndPeriod(@Param("busVinSid") String busVinSid,@Param("period") String period);
+    LoanRepaymentPlanMoneyVo selVehSidAndPeriod(@Param("busVinSid") String busVinSid,@Param("period") String period);
 
     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

@@ -552,9 +552,11 @@
     </update>
 
     <select id="selVehSidAndPeriod"
-            resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails">
+            resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanMoneyVo">
         SELECT
-                *
+                sid,
+                IFNULL(paymentMoney, 0) AS paymentMoney,
+                IFNULL(paymentInterest, 0) AS paymentInterest
         FROM
                 loan_repayment_plan_details
         WHERE busVinSid = #{busVinSid}

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

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

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

@@ -185,7 +185,7 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
     }
 
 
-    public LoanRepaymentPlanDetails selVehSidAndPeriod(String busVinSid, String period) {
+    public LoanRepaymentPlanMoneyVo selVehSidAndPeriod(String busVinSid, String period) {
         return baseMapper.selVehSidAndPeriod(busVinSid, period);
     }