From b1c64c1f9e326222985c369619cb493624e94a34 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 24 Jan 2024 09:48:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E4=BB=98=E6=AC=BE=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=BD=AC=E4=BB=98=E8=AE=B0=E5=BD=95=E5=8F=8A?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E9=80=80=E6=96=99=E5=8D=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinPaymentrecordService.java | 16 ++++- .../LoanTransferPaymentApplyFeign.java | 10 ++++ ...LoanTransferPaymentApplyFeignFallback.java | 10 ++++ .../LoanTransferPaymentApplyRest.java | 10 ++++ .../LoanTransferPaymentApplyService.java | 58 ++++++++++++++++--- .../LoanTransferPaymentRecordMapper.java | 2 + .../LoanTransferPaymentRecordMapper.xml | 9 ++- .../LoanTransferPaymentRecordService.java | 4 ++ .../ScmApplyInboundVehQueryMapper.java | 4 +- 9 files changed, 110 insertions(+), 13 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index f0befe8bd4..37cdfa5550 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -76,6 +76,7 @@ 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.anrui.riskcenter.api.loantransferpaymentapply.LoanTransferPaymentApplyFeign; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.ConstantUtils; @@ -166,6 +167,8 @@ public class FinPaymentrecordService extends MybatisBaseService listPageVo(PagerQuery pq) { FinPaymentrecordQuery query = pq.getParams(); @@ -366,7 +369,7 @@ public class FinPaymentrecordService extends MybatisBaseService loanBePadsincereVehDetailsVos = loanBePadsincereVehFeign.selByMainSid(finPaymentrecord.getBusSid()).getData(); for (LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo : loanBePadsincereVehDetailsVos) { log.info("车辆sid++++++++++++++++++++++++++++++++++++++++++" + loanBePadsincereVehDetailsVo.getBusVinSid()); @@ -375,7 +378,7 @@ public class FinPaymentrecordService extends MybatisBaseService { + loanTransferPaymentApplyFeign.pushPaymentRecord(finPaymentrecord.getBusSid(), finPaymentrecord.getSid()); + }); + Future future2 = pool.submit(() -> { + loanTransferPaymentApplyFeign.pushPaymentVoucher(finPaymentrecord.getBusSid(), finPaymentrecord.getSid()); + }); } } catch (Exception e) { e.printStackTrace(); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeign.java index fd5c41209f..21141c1492 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeign.java @@ -54,6 +54,16 @@ public interface LoanTransferPaymentApplyFeign { public ResultBean deleteBySids(@RequestBody String[] sids); + @ApiOperation("推送转付记录") + @PostMapping("/pushPaymentRecord") + @ResponseBody + public ResultBean pushPaymentRecord(@RequestParam("sid") String sid, @RequestParam("paySid") String paySid); + + @ApiOperation("推送财务代付款凭证") + @PostMapping("/pushPaymentVoucher") + @ResponseBody + public ResultBean pushPaymentVoucher(@RequestParam("sid") String sid, @RequestParam("paySid") String paySid); + //---------------------------流程--------------------------------------- @ApiOperation("提交") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeignFallback.java index ddeeca1a69..5cb14eb0c4 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantransferpaymentapply/LoanTransferPaymentApplyFeignFallback.java @@ -40,6 +40,16 @@ public class LoanTransferPaymentApplyFeignFallback implements LoanTransferPaymen return null; } + @Override + public ResultBean pushPaymentRecord(String sid, String paySid) { + return null; + } + + @Override + public ResultBean pushPaymentVoucher(String sid, String paySid) { + return null; + } + @Override public ResultBean submitRecordApplication(SubmitTransferDto dto) { return null; diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyRest.java index 91fc8518bf..54778b99b9 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyRest.java @@ -54,6 +54,16 @@ public class LoanTransferPaymentApplyRest implements LoanTransferPaymentApplyFei return loanTransferPaymentApplyService.deleteBySids(sids); } + @Override + public ResultBean pushPaymentRecord(String sid, String paySid) { + return loanTransferPaymentApplyService.pushPaymentRecord(sid,paySid); + } + + @Override + public ResultBean pushPaymentVoucher(String sid, String paySid) { + return loanTransferPaymentApplyService.pushPaymentVoucher(sid,paySid); + } + @Override public ResultBean submitRecordApplication(SubmitTransferDto dto) { return loanTransferPaymentApplyService.submitRecordApplication(dto); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java index 4c19e7f6f7..39103693de 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java @@ -187,6 +187,9 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService saveTransferPayment(LoanTransferPaymentApplyDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = ""; + if (StringUtils.isBlank(dto.getPayFormKey())) { + return rb.setMsg("请选择财务付款形式"); + } if (StringUtils.isNotBlank(dto.getSid())) { sid = dto.getSid(); LoanTransferPaymentApply updateEntity = fetchBySid(sid); @@ -629,11 +632,11 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService setConOrNumber = new HashSet<>(); for (LoanTransferPaymentRecord applyRecord : loanTransferPaymentRecords) { LoanRepaymentHistory repaymentHistory = loanRepaymentHistoryService.fetchBySid(applyRecord.getRepaymentHistorySid()); -// if (null != repaymentHistory) { -// repaymentHistory.setPaymentStateKey("003"); -// repaymentHistory.setPaymentState("已转付"); -// repaymentHistory.setTransferDate(new DateTime()); -// loanRepaymentHistoryService.updateById(repaymentHistory); + if (null != repaymentHistory) { + repaymentHistory.setPaymentStateKey("003"); + repaymentHistory.setPaymentState("已转付"); + repaymentHistory.setTransferDate(new DateTime()); + loanRepaymentHistoryService.updateById(repaymentHistory); // //推送转付还款记录 // LoanRepaymentHistory transfer = new LoanRepaymentHistory(); // transfer.setScheduleSid(repaymentHistory.getScheduleSid()); @@ -656,7 +659,7 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService records = loanTransferPaymentRecordService.selByMainSid(businessSid); + public ResultBean pushPaymentRecord(String sid, String paySid) { + ResultBean rb = ResultBean.fireFail(); + List records = loanTransferPaymentRecordService.selByMainSidAndPaySid(sid, paySid); + if (!records.isEmpty()) { + for (LoanTransferPaymentRecord applyRecord : records) { + LoanRepaymentHistory repaymentHistory = loanRepaymentHistoryService.fetchBySid(applyRecord.getRepaymentHistorySid()); + if (null != repaymentHistory) { + //推送转付还款记录 + LoanRepaymentHistory transfer = new LoanRepaymentHistory(); + transfer.setScheduleSid(repaymentHistory.getScheduleSid()); + transfer.setPlanDetailSid(repaymentHistory.getPlanDetailSid()); + transfer.setReturnWay("转付"); + transfer.setReturnWayKey("03"); + transfer.setActualDate(new Date()); + transfer.setDataTime(new DateTime()); + transfer.setBuckleKey("001"); + transfer.setBuckle("未申请"); + transfer.setUpdateState("1"); + transfer.setUpdateTime(new DateTime()); + BigDecimal money = new BigDecimal(0); + if (null != applyRecord.getTransferPrincipal()) { + money = applyRecord.getTransferPrincipal(); + } + if (null != applyRecord.getDefaultInterest()) { + money = applyRecord.getDefaultInterest().add(money); + } + String amount = String.valueOf(money); + transfer.setActualMoney(new BigDecimal("-" + amount)); + loanRepaymentHistoryService.insert(transfer); + } + } + } + return rb.success(); + } + + public ResultBean pushPaymentVoucher(String sid, String paySid) { + ResultBean rb = ResultBean.fireFail(); + List records = loanTransferPaymentRecordService.selByMainSidAndPaySid(sid, paySid); if (!records.isEmpty()) { PaymentVoucher paymentVoucher = new PaymentVoucher(); List voucherDetails = new ArrayList<>(); @@ -889,6 +928,7 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService selByMainSid(String mainSid); LoanTransferPaymentRecord selByBankContractNo(String bankContractNo); + + List selByMainSidAndPaySid(@Param("sid") String sid, @Param("paySid") String paySid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordMapper.xml index 0cd9056059..c310d43514 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordMapper.xml @@ -21,7 +21,14 @@ LEFT JOIN loan_repayment_plan_details AS p ON h.planDetailSid = p.sid LEFT JOIN loan_transfer_payment_record AS r ON h.sid = r.repaymentHistorySid WHERE p.bankContractNo = #{bankContractNo} - and r.state = 1 + and r.state = 1 ORDER BY r.createTime DESC LIMIT 1 + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordService.java index d272380066..e2ec9cc311 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentrecord/LoanTransferPaymentRecordService.java @@ -27,4 +27,8 @@ public class LoanTransferPaymentRecordService extends MybatisBaseService selByMainSidAndPaySid(String sid, String paySid) { + return baseMapper.selByMainSidAndPaySid(sid,paySid); + } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryMapper.java index 7455ba5971..9fb5fc19d4 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundvehquery/ScmApplyInboundVehQueryMapper.java @@ -67,6 +67,6 @@ public interface ScmApplyInboundVehQueryMapper extends BaseMapper fetchByMainSid(String cgrkdSid); - @Select("SELECT * FROM scm_apply_inbound_veh_query WHERE vinNo LIKE #{vinNo}") - ScmApplyInboundVehQueryDetailsVo fetchDetailsByVinNo(String vinNo); + @Select("SELECT * FROM scm_apply_inbound_veh_query WHERE vinNo LIKE CONCAT('%',#{vinNo},'%')") + ScmApplyInboundVehQueryDetailsVo fetchDetailsByVinNo(@Param("vinNo") String vinNo); } \ No newline at end of file