From 007e1abd2ca56b2311d161da354ebba3bea17355 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 9 May 2024 11:55:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E8=B4=B7=E5=90=88=E5=90=8C=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E7=94=9F=E6=88=90=E8=BF=98?= =?UTF-8?q?=E6=AC=BE=E8=AE=A1=E5=88=92=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderLoancontract.java | 2 ++ .../BusSalesOrderLoancontractFeign.java | 17 ++++++---- ...usSalesOrderLoancontractFeignFallback.java | 7 +++- .../BusSalesOrderLoancontractMapper.java | 15 ++++---- .../BusSalesOrderLoancontractMapper.xml | 11 ++++-- .../BusSalesOrderLoancontractRest.java | 7 ++++ .../BusSalesOrderLoancontractService.java | 34 +++++++++++-------- .../LoanRepaymentScheduleService.java | 5 ++- 8 files changed, 67 insertions(+), 31 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontract.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontract.java index cb3b356d92..1998de8ad1 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontract.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontract.java @@ -72,5 +72,7 @@ public class BusSalesOrderLoancontract extends BaseEntity { private String busName; // 业务阶段名称 @ApiModelProperty("业务状态码") private String busState; // 业务状态码 + @ApiModelProperty("是否生成还款计划表（0否，1是）") + private String repaymentState; // 是否生成还款计划表（0否，1是） } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java index 6cc0f393ec..164030445c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeign.java @@ -66,12 +66,12 @@ public interface BusSalesOrderLoancontractFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody BusSalesOrderLoancontractDto dto); - + @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") @ResponseBody public ResultBean delBySids(@RequestBody String[] sids); - + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody @@ -90,12 +90,17 @@ public interface BusSalesOrderLoancontractFeign { @ApiOperation("更新资方合同号和状态") @PostMapping("/updateBankConAndBusNo") @ResponseBody - ResultBean updateBankConAndBusNo(@RequestParam("loanContractSid") String loanContractSid,@RequestParam("bankContractNo") String bankContractNo); + ResultBean updateBankConAndBusNo(@RequestParam("loanContractSid") String loanContractSid, @RequestParam("bankContractNo") String bankContractNo); + @ApiOperation("消贷合同生成还款计划表列表") @PostMapping("/listPageForRepay") @ResponseBody public ResultBean> listPageForRepay(@RequestBody PagerQuery pq); + @ApiOperation("设置是否生成还款计划状态") + @PostMapping("/setRepaymentState") + public ResultBean setRepaymentState(@RequestParam("sid") String sid); + @ApiOperation("推送融资放款的应收") @PostMapping("/pushLoanOrder") @ResponseBody @@ -124,16 +129,16 @@ public interface BusSalesOrderLoancontractFeign { @ApiOperation("根据销售订单sid及贷款人sid查询") @PostMapping("/fetchAllByOrderSidAndDkrSid") @ResponseBody - ResultBean> fetchAllByOrderSidAndDkrSid(@RequestParam("saleOrderSid") String saleOrderSid,@RequestParam("saleOrderBorrowerSid") String saleOrderBorrowerSid); + ResultBean> fetchAllByOrderSidAndDkrSid(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam("saleOrderBorrowerSid") String saleOrderBorrowerSid); @ApiOperation("根据销售订单sid和贷款人sid删除消贷合同信息") @PostMapping("/delByOrderSidAndDkrSid") @ResponseBody - ResultBean delByOrderSidAndDkrSid(@RequestParam("saleOrderSid") String saleOrderSid,@RequestParam("borrowerSid") String borrowerSid); + ResultBean delByOrderSidAndDkrSid(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam("borrowerSid") String borrowerSid); @ApiOperation("推送融资放款的其他应收单应收") @PostMapping("/pushOtherDocument") @ResponseBody ResultBean pushOtherDocument(@RequestBody PushOtherDocument push); -} \ No newline at end of file +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java index 4e30c02b96..acf6d69907 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderloancontract/BusSalesOrderLoancontractFeignFallback.java @@ -91,6 +91,11 @@ public class BusSalesOrderLoancontractFeignFallback implements BusSalesOrderLoan return null; } + @Override + public ResultBean setRepaymentState(String sid) { + return null; + } + @Override public ResultBean pushLoanOrder(LoanContractPush loanContractPush) { return null; @@ -130,4 +135,4 @@ public class BusSalesOrderLoancontractFeignFallback implements BusSalesOrderLoan public ResultBean pushOtherDocument(PushOtherDocument push) { return null; } -} \ No newline at end of file +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java index ce2aba62c4..6a00b80604 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.java @@ -68,13 +68,13 @@ public interface BusSalesOrderLoancontractMapper extends BaseMapper selectByBorrowerSid(String saleOrderBorrowerSid); - IPage listPageForRepay(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + IPage listPageForRepay(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); @Update("update bus_sales_order_loancontract set bankContractNo=#{bankContractNo},busNo='305',busName='放款资料审核' where sid=#{loanContractSid}") - void updateBankConAndBusNo(@Param("loanContractSid") String loanContractSid,@Param("bankContractNo") String bankContractNo); + void updateBankConAndBusNo(@Param("loanContractSid") String loanContractSid, @Param("bankContractNo") String bankContractNo); @Select("select * from bus_sales_order_loancontract where salesOrderSid = #{sid}") List fetchAllByOrderSid(String sid); @@ -85,10 +85,13 @@ public interface BusSalesOrderLoancontractMapper extends BaseMapper fetchAllByBorrowerSid(String saleOrderBorrowerSid); @Select("select * from bus_sales_order_loancontract where salesOrderSid = #{saleOrderSid} and borrowerSid = #{saleOrderBorrowerSid}") - List fetchAllByOrderSidAndDkrSid(@Param("saleOrderSid") String saleOrderSid,@Param("saleOrderBorrowerSid") String saleOrderBorrowerSid); + List fetchAllByOrderSidAndDkrSid(@Param("saleOrderSid") String saleOrderSid, @Param("saleOrderBorrowerSid") String saleOrderBorrowerSid); FinUncollectedReceivablesDetailed selectByBusVinSId(@Param("name") String name, @Param("sid") String sid); @Delete("delete from bus_sales_order_loancontract where salesOrderSid = #{saleOrderSid} and borrowerSid = #{borrowerSid}") - void delByOrderSidAndDkrSid(@Param("saleOrderSid") String saleOrderSid,@Param("borrowerSid") String borrowerSid); -} \ No newline at end of file + void delByOrderSidAndDkrSid(@Param("saleOrderSid") String saleOrderSid, @Param("borrowerSid") String borrowerSid); + + @Update("update bus_sales_order_loancontract set repaymentState = 1 where sid=#{sid}") + int setRepaymentState(String sid); +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.xml index 4e9a9f6bf0..97d291f66b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractMapper.xml @@ -26,7 +26,14 @@ co.bankName as bankName, co.bankContractNo as bankContractNo, co.policyName as policyName, - co.sid as salesOrderSid + co.sid as salesOrderSid, + CASE + co.repaymentState + WHEN '1' THEN + '是' + WHEN '0' THEN + '否' + END AS builded FROM bus_sales_order_loancontract AS co LEFT JOIN bus_sales_order AS bs ON co.salesOrderSid = bs.sid @@ -46,4 +53,4 @@ resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed"> select * from anrui_fin.fin_uncollected_receivables_detailed where busVinSid = #{sid} and receivablesName = #{name} - \ No newline at end of file + diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java index 67c52ebfc6..101c547756 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractRest.java @@ -120,6 +120,13 @@ public class BusSalesOrderLoancontractRest implements BusSalesOrderLoancontractF return rb.success().setData(pv); } + @Override + public ResultBean setRepaymentState(String sid) { + ResultBean rb = ResultBean.fireFail(); + int i = busSalesOrderLoancontractService.setRepaymentState(sid); + return rb.success(); + } + @Override public ResultBean pushLoanOrder(LoanContractPush loanContractPush) { return busSalesOrderLoancontractService.pushLoanOrder(loanContractPush); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java index cdc2ac8a9f..76ba3f1c2f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderloancontract/BusSalesOrderLoancontractService.java @@ -282,7 +282,7 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService busSalesOrderVehicles = busSalesOrderVehicleService.selByLoanContractSid(record.getSalesOrderSid()); busSalesOrderVehicles.removeAll(Collections.singleton(null)); @@ -292,19 +292,19 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService repaymentSchedule = repaymentScheduleFeign.selByLoanContractSid(record.getSalesOrderSid()); - if (repaymentSchedule.getData() != null) { - record.setBuilded("是"); - List histories = repaymentScheduleFeign.selHistoryBySid(repaymentSchedule.getData().getSid()).getData(); - if (histories.isEmpty() || histories == null) { - record.setHandleBtn(true); - } - } else { - record.setBuilded("否"); - if (StringUtils.isNotBlank(record.getBankContractNo())) { - record.setHandleBtn(true); - } - } +// ResultBean repaymentSchedule = repaymentScheduleFeign.selByLoanContractSid(record.getSalesOrderSid()); +// if (repaymentSchedule.getData() != null) { +// record.setBuilded("是"); +// List histories = repaymentScheduleFeign.selHistoryBySid(repaymentSchedule.getData().getSid()).getData(); +// if (histories.isEmpty() || histories == null) { +// record.setHandleBtn(true); +// } +// } else { +// record.setBuilded("否"); +// if (StringUtils.isNotBlank(record.getBankContractNo())) { +// record.setHandleBtn(true); +// } +// } } } } @@ -1093,4 +1093,8 @@ public class BusSalesOrderLoancontractService extends MybatisBaseService { pushScheduleVoucher(schedule); }); - + //设置消贷合同是否生成还款计划状态 + Future future3 = pool.submit(() -> { + busSalesOrderLoancontractFeign.setRepaymentState(dto.getSalesOrderSid()); + }); } catch (Exception e) { e.printStackTrace(); }