测试问题修改

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

@@ -52,8 +52,10 @@ import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDet
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
 import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply;
 import com.yxt.anrui.fin.api.finpaymentrecord.*;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR;
 import com.yxt.anrui.fin.api.kingdee.appaybill.ApPayBill;
 import com.yxt.anrui.fin.biz.finpaymentapply.FinPaymentapplyService;
+import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRService;
 import com.yxt.anrui.fin.biz.kingdee.appaybill.ApPayBillService;
 import com.yxt.anrui.portal.api.flow.FlowableFeign;
 import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
@@ -66,6 +68,14 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.api.sysuser.UserQuery;
+import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.LoanBePadsincereApply;
+import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.LoanBePadsincereApplyDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.LoanBePadsincereApplyFeign;
+import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehFeign;
+import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
+import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsFeign;
+import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanMoneyVo;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.ConstantUtils;
@@ -148,6 +158,14 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
     private BaseVehicleActualDetailsFeign baseVehicleActualDetailsFeign;
     @Autowired
     private MessageListFeign messageListFeign;
+    @Autowired
+    private LoanBePadsincereApplyFeign loanBePadsincereApplyFeign;
+    @Autowired
+    private LoanBePadsincereVehFeign loanBePadsincereVehFeign;
+    @Autowired
+    private LoanRepaymentPlanDetailsFeign loanRepaymentPlanDetailsFeign;
+    @Autowired
+    private FinUncollectedReceivablesDetailedJRService finUncollectedReceivablesDetailedJRService;
 
     public PagerVo<FinPaymentrecordVo> listPageVo(PagerQuery<FinPaymentrecordQuery> pq) {
         FinPaymentrecordQuery query = pq.getParams();
@@ -339,6 +357,41 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         List<String> list = new ArrayList<>();
         for (int i = 0; i < sids.size(); i++) {
             FinPaymentrecord finPaymentrecord = fetchBySid(sids.get(i));
+            //更新还款计划表垫款金额和逾期利息
+            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();
+                    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();
+                    loanRepaymentPlanDetailsFeign.updateVehSidAndPeriod(loanBePadsincereVehDetailsVo.getBusVinSid(), loanBePadsincereVehDetailsVo.getPeriod(),paymentMoney,paymentInterest);
+                    //推送金融应收
+                    FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR();
+                    jr.setCreateBySid(finPaymentrecord.getCreateBySid());
+                    SysUserVo userVo = sysUserFeign.fetchBySid(finPaymentrecord.getCreateBySid()).getData();
+                    jr.setCreateByName(userVo.getName());
+                    jr.setBusSid(planDetails.getSid());
+                    jr.setApplySid(finPaymentrecord.getBusSid());
+                    jr.setCurrentReceivableMoney(new BigDecimal(paymentInterest));
+                    jr.setReveivableMoney(new BigDecimal(paymentInterest));
+                    jr.setPayCostTitleKey("005");
+                    jr.setPayCostTitleValue("资方逾期利息");
+                    jr.setOrgSidPath(planDetails.getOrgSidPath());
+                    jr.setUseOrgName(planDetails.getUseOrgName());
+                    jr.setUseOrgSid(planDetails.getUseOrgSid());
+                    jr.setStaffDeptName(planDetails.getDept());
+                    jr.setStaffName(planDetails.getStaffName());
+                    jr.setStaffDeptSid(planDetails.getDeptSid());
+                    jr.setStaffUserSid(planDetails.getSalesUserSid());
+                    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/loanbepadsincereveh/LoanBePadsincereVehFeign.java

@@ -75,4 +75,9 @@ public interface LoanBePadsincereVehFeign {
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<LoanBePadsincereVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("根据主表sid查询")
+    @GetMapping("/selByMainSid/{sid}")
+    @ResponseBody
+    ResultBean<List<LoanBePadsincereVehDetailsVo>> selByMainSid(@PathVariable("applySid") String applySid);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehFeignFallback.java

@@ -69,4 +69,9 @@ public class LoanBePadsincereVehFeignFallback implements LoanBePadsincereVehFeig
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-riskcenter/loanbepadsincereveh/fetchDetailsBySid无法访问");
 	}
+
+	@Override
+	public ResultBean<List<LoanBePadsincereVehDetailsVo>> selByMainSid(String applySid) {
+		return null;
+	}
 }

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

@@ -53,4 +53,13 @@ public interface LoanRepaymentPlanDetailsFeign {
     @ResponseBody
     public ResultBean<LoanRepaymentPlanDetailsForOverDue> checkOverDue(@RequestParam("sid") String sid);
 
+    @ApiOperation("根据销售订单车辆sid及期数查询")
+    @GetMapping("/selVehSidAndPeriod")
+    @ResponseBody
+    ResultBean<LoanRepaymentPlanDetails> selVehSidAndPeriod(@RequestParam("busVinSid") String busVinSid,@RequestParam("period") String period);
+
+    @ApiOperation("根据销售订单车辆sid及期数修改")
+    @PostMapping("/updateVehSidAndPeriod")
+    @ResponseBody
+    ResultBean updateVehSidAndPeriod(@RequestParam("busVinSid") String busVinSid,@RequestParam("period") String period,@RequestParam("paymentMoney") String paymentMoney,@RequestParam("paymentInterest") String paymentInterest);
 }

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

@@ -46,4 +46,14 @@ public class LoanRepaymentPlanDetailsFeignFallback implements LoanRepaymentPlanD
     public ResultBean<LoanRepaymentPlanDetailsForOverDue> checkOverDue(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean<LoanRepaymentPlanDetails> selVehSidAndPeriod(String busVinSid, String period) {
+        return null;
+    }
+
+    @Override
+    public ResultBean updateVehSidAndPeriod(String busVinSid, String period, String paymentMoney, String paymentInterest) {
+        return null;
+    }
 }

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

@@ -0,0 +1,13 @@
+package com.yxt.anrui.riskcenter.api.loanrepaymentplandetails;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class LoanRepaymentPlanMoneyVo {
+
+    private BigDecimal paymentMoney; //公司垫款金额
+    private BigDecimal paymentInterest; //垫资方逾期利息
+
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java

@@ -61,6 +61,7 @@ import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDetai
 import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDto;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
+import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanMoneyVo;
 import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentScheduleDetailsVo;
 import com.yxt.anrui.riskcenter.biz.loanbepadsincereveh.LoanBePadsincereVehService;
 import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
@@ -910,7 +911,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 for (LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo : loanBePadsincereVehDetailsVos) {
                     FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
-                    finPaymentrecordDto.setApplySid(loanBePadsincereApply.getSid());
+                    finPaymentrecordDto.setApplySid("");
                     finPaymentrecordDto.setPayCompanySid("");
                     finPaymentrecordDto.setPayType(1);
                     finPaymentrecordDto.setCreateOrgSid(loanBePadsincereApply.getUseOrgSid());

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehRest.java

@@ -97,4 +97,11 @@ public class LoanBePadsincereVehRest implements LoanBePadsincereVehFeign {
 		LoanBePadsincereVehDetailsVo vo = loanBePadsincereVehService.fetchDetailsVoBySid(sid);
 		return rb.success().setData(vo);
 	}
+
+	@Override
+	public ResultBean<List<LoanBePadsincereVehDetailsVo>> selByMainSid(String applySid) {
+		ResultBean rb = ResultBean.fireFail();
+		List<LoanBePadsincereVehDetailsVo> loanBePadsincereVehDetailsVos = loanBePadsincereVehService.selByMainSid(applySid);
+		return rb.success().setData(loanBePadsincereVehDetailsVos);
+	}
 }

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

@@ -66,4 +66,8 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper<LoanRepayment
     String getOtherBankName(@Param("sid") String sid);
 
     LoanRepaymentPlanDetailsForOverDue checkOverDue(@Param("sid") String sid);
+
+    LoanRepaymentPlanDetails 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

@@ -536,4 +536,24 @@
         WHERE c.planSid = #{sid}
 
     </select>
+
+    <update id="updateVehSidAndPeriod">
+        UPDATE
+                loan_repayment_plan_details
+        SET
+                paymentMoney = #{paymentMoney},
+                paymentInterest = #{paymentInterest}
+        WHERE busVinSid = #{busVinSid}
+          AND period = #{period}
+    </update>
+
+    <select id="selVehSidAndPeriod"
+            resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails">
+        SELECT
+                *
+        FROM
+                loan_repayment_plan_details
+        WHERE busVinSid = #{busVinSid}
+          AND period = #{period}
+    </select>
 </mapper>

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

@@ -56,4 +56,18 @@ public class LoanRepaymentPlanDetailsRest implements LoanRepaymentPlanDetailsFei
     public ResultBean<LoanRepaymentPlanDetailsForOverDue> checkOverDue(String sid) {
         return loanRepaymentPlanDetailsService.checkOverDue(sid);
     }
+
+    @Override
+    public ResultBean<LoanRepaymentPlanDetails> selVehSidAndPeriod(String busVinSid, String period) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanRepaymentPlanDetails loanRepaymentPlanDetails = loanRepaymentPlanDetailsService.selVehSidAndPeriod(busVinSid, period);
+        return rb.success().setData(loanRepaymentPlanDetails);
+    }
+
+    @Override
+    public ResultBean updateVehSidAndPeriod(String busVinSid, String period, String paymentMoney, String paymentInterest) {
+        ResultBean rb = ResultBean.fireFail();
+        loanRepaymentPlanDetailsService.updateVehSidAndPeriod(busVinSid, period, paymentMoney, paymentInterest);
+        return rb.success();
+    }
 }

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

@@ -72,6 +72,7 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
     private LoanRepaymentHistoryService loanRepaymentHistoryService;
     @Autowired
     private LoanRepaymentScheduleService loanRepaymentScheduleService;
+
     @Transactional(rollbackFor = Exception.class)
     public ResultBean<String> savePlanDetails(LoanRepaymentPlanDetailsDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
@@ -184,4 +185,11 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
     }
 
 
+    public LoanRepaymentPlanDetails selVehSidAndPeriod(String busVinSid, String period) {
+        return baseMapper.selVehSidAndPeriod(busVinSid, period);
+    }
+
+    public void updateVehSidAndPeriod(String busVinSid, String period, String paymentMoney, String paymentInterest) {
+        baseMapper.updateVehSidAndPeriod(busVinSid, period, paymentMoney, paymentInterest);
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionRecordInit.java

@@ -60,5 +60,5 @@ public class AppBeCollectionRecordInit {
     private List<String> files = new ArrayList<>();
 
     @ApiModelProperty("协议书模板下载地址")
-    private String xysDownLoadUrl = "D:\\anrui\\upload\\template\\协议书模板.pdf";
+    private String xysDownLoadUrl;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java

@@ -66,6 +66,7 @@ import com.yxt.anrui.terminal.api.risk.becollection.flowable.*;
 import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.AppFinanceForm;
 import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.AppLoanHomeVisitVo;
 import com.yxt.anrui.terminal.biz.base.common.CommonService;
+import com.yxt.common.base.config.component.DocPdfComponent;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -108,6 +109,8 @@ public class BeCollectionService {
     private CommonService commonService;
     @Autowired
     private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
+    @Autowired
+    private DocPdfComponent docPdfComponent;
 
     public ResultBean agreeCreditInfo(CompleteBeCollectionDto dto) {
         ResultBean rb = ResultBean.fireFail();
@@ -531,6 +534,8 @@ public class BeCollectionService {
             appBeCollectionRecordVehInits.add(appBeCollectionRecordVehInit);
         }
         appBeCollectionRecordInit.setAppBeCollectionRecordVehInitList(appBeCollectionRecordVehInits);
+        String prefixTemplateUrl = docPdfComponent.getPrefixTemplateUrl();
+        appBeCollectionRecordInit.setXysDownLoadUrl(prefixTemplateUrl + "协议书模板.pdf");
         return rb.success().setData(appBeCollectionRecordInit);
     }