From eb16ba4d53c656971e77fa1bc543d45cdba5ae07 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 23 Jan 2024 17:11:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=96=B9=E5=88=92=E6=89=A3=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E9=9C=80=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinPaymentrecordFeign.java | 6 + .../FinPaymentrecordFeignFallback.java | 5 + .../FinPaymentrecordRest.java | 5 + .../FinPaymentrecordService.java | 14 +- .../LoanRepaymentHistoryQuery.java | 1 + .../LoanTransferPaymentRecord.java | 3 + .../LoanRedemptionApplyMapper.java | 3 +- .../LoanRedemptionApplyMapper.xml | 2 + .../LoanRedemptionApplyService.java | 8 +- .../LoanRepaymentHistoryMapper.xml | 72 ++++++++- .../LoanRepaymentHistoryService.java | 153 ++++++------------ .../LoanSubletApplyMapper.java | 2 +- .../loansubletapply/LoanSubletApplyMapper.xml | 2 + .../LoanSubletApplyService.java | 14 +- .../LoanTransferPaymentApplyService.java | 12 +- 15 files changed, 182 insertions(+), 120 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java index 2d9820bbd5..f093662357 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java @@ -72,6 +72,12 @@ public interface FinPaymentrecordFeign { @ResponseBody public ResultBean save(@RequestBody FinPaymentrecordDto dto); + @ApiOperation("新增") + @PostMapping("/saveReturnSid") + @ResponseBody + public ResultBean saveReturnSid(@RequestBody FinPaymentrecordDto dto); + + @ApiOperation("修改") @PostMapping("/update") @ResponseBody diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java index ad11923f04..5b0e44e8ae 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java @@ -66,6 +66,11 @@ public class FinPaymentrecordFeignFallback implements FinPaymentrecordFeign { return ResultBean.fireFail().setMsg("接口anrui-fin/finpaymentrecord/save无法访问"); } + @Override + public ResultBean saveReturnSid(FinPaymentrecordDto dto) { + return null; + } + @Override public ResultBean update(FinPaymentrecordUpdateDto dto) { return null; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java index da7910e576..929e9ca88b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java @@ -77,6 +77,11 @@ public class FinPaymentrecordRest implements FinPaymentrecordFeign { return finPaymentrecordService.saveDto(dto); } + @Override + public ResultBean saveReturnSid(FinPaymentrecordDto dto) { + return finPaymentrecordService.saveReturnSid(dto); + } + @Override public ResultBean update(FinPaymentrecordUpdateDto dto) { return finPaymentrecordService.updateAll(dto); 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 cd229605c8..f0befe8bd4 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 @@ -330,6 +330,14 @@ public class FinPaymentrecordService extends MybatisBaseService saveReturnSid(FinPaymentrecordDto dto) { + ResultBean rb = ResultBean.fireFail(); + FinPaymentrecord finPaymentrecord = new FinPaymentrecord(); + BeanUtil.copyProperties(dto, finPaymentrecord, "sid"); + baseMapper.insert(finPaymentrecord); + return rb.success().setData(finPaymentrecord.getSid()); + } + public ResultBean updateAll(FinPaymentrecordUpdateDto dto) { ResultBean rb = ResultBean.fireFail(); List sids = dto.getSids(); @@ -390,7 +398,7 @@ public class FinPaymentrecordService extends MybatisBaseService FPAYBILLENTRYs = new ArrayList<>(); if (finPaymentrecord.getCost() != null - && finPaymentrecord.getCost().compareTo(BigDecimal.ZERO)>0) { + && finPaymentrecord.getCost().compareTo(BigDecimal.ZERO) > 0) { ApPayBill.FPAYBILLENTRY fpaybillentry = new ApPayBill.FPAYBILLENTRY(); //应付金额 fpaybillentry.setFPAYTOTALAMOUNTFOR(finPaymentrecord.getCost().doubleValue()); @@ -1072,4 +1080,6 @@ public class FinPaymentrecordService extends MybatisBaseService selTrailerByLedgerSid(@Param("ledgerSid") String ledgerSid); int updateFlowFiled(Map map); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyMapper.xml index 70fa662f90..8ac1cef84b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanredemptionapply/LoanRedemptionApplyMapper.xml @@ -97,6 +97,8 @@ sid as ledgerSid FROM loan_return_veh_ledger as t WHERE t.pSid = #{ledgerSid} + and t.disposal = '未处置' + and t.stockState = '库存' + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletapply/LoanSubletApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletapply/LoanSubletApplyService.java index 733becc989..05c47763fb 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletapply/LoanSubletApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansubletapply/LoanSubletApplyService.java @@ -285,9 +285,11 @@ public class LoanSubletApplyService extends MybatisBaseService tVeh = baseMapper.selReturnTrVinLegerByPSid(ledgerSid); + if (!tVeh.isEmpty()) { + tVeh.stream().forEach(t -> { + vinList.add(t); + }); } vo.setVinList(vinList); } else if (vehType.equals("挂车")) { @@ -743,6 +745,9 @@ public class LoanSubletApplyService extends MybatisBaseService vinLists = loanSubletVehService.selByMainSid(subletApply.getSid()); if (!vinLists.isEmpty()) { vinLists.forEach(v -> { @@ -1063,6 +1068,9 @@ public class LoanSubletApplyService extends MybatisBaseService recordList = new ArrayList<>(); if (!records.isEmpty()) { for (LoanTransferPaymentRecord record : records) { - // String historySid = record.getRepaymentHistorySid(); + // String historySid = record.getRepaymentHistorySid(); LoanTransferPaymentRecordVo recordVo = baseMapper.paymentDetails(record.getSid()); recordList.add(recordVo); } @@ -752,7 +752,15 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService { + c.setPaySid(paySid); + loanTransferPaymentRecordService.updateById(c); + }); + } + } } } }