From 958b2912589497d4eb0f6ef7eec12c3478eb06e0 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 3 Apr 2024 10:53:26 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=94=B6=E6=AC=BE?= =?UTF-8?q?=E6=8E=A8=E5=87=AD=E8=AF=81=E3=80=81=E6=B6=88=E5=87=8F=E5=9E=AB?= =?UTF-8?q?=E6=AC=BE=E5=BA=94=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 75 ++++++++++--------- .../LoanRepaymentHistoryMapper.java | 4 + .../LoanRepaymentHistoryMapper.xml | 43 ++++++++++- .../LoanRepaymentHistoryService.java | 10 ++- 4 files changed, 95 insertions(+), 37 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 0dc833ba6f..4d9505b426 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -3786,16 +3786,16 @@ public class FinCollectionConfirmationService extends MybatisBaseService bankResultBean = loanFinBankFeign.reAdvancesByOrderSid(orderSid); if (bankResultBean.getData() != null) { LoanFinBank loanFinBank = bankResultBean.getData(); if (null != loanFinBank.getReAdvances()) { - BigDecimal paymentMoney = planDetails.getPaymentMoney(); - String subscriptionMoney = v.getSubscriptionMoney(); - BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney)); - planDetails.setPaymentMoney(subtract); - loanRepaymentPlanDetailsFeign.updateByEntity(planDetails); if (loanFinBank.getReAdvances() == 1) { FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); jr.setCreateBySid(userSid); @@ -3823,19 +3823,19 @@ public class FinCollectionConfirmationService extends MybatisBaseService bankResultBean = loanFinBankFeign.reAdvancesByOrderSid(orderSid); if (bankResultBean.getData() != null) { LoanFinBank loanFinBank = bankResultBean.getData(); if (null != loanFinBank.getReAdvances()) { - BigDecimal paymentInterest = planDetails.getPaymentInterest(); - String subscriptionMoney = v.getSubscriptionMoney(); - BigDecimal subtract = paymentInterest.subtract(new BigDecimal(subscriptionMoney)); - planDetails.setPaymentInterest(subtract); - BigDecimal paymentMoney = planDetails.getPaymentMoney(); - BigDecimal subtract2 = paymentMoney.subtract(new BigDecimal(subscriptionMoney)); - planDetails.setPaymentMoney(subtract2); - loanRepaymentPlanDetailsFeign.updateByEntity(planDetails); if (loanFinBank.getReAdvances() == 1) { FinUncollectedReceivablesDetailedJR jr = new FinUncollectedReceivablesDetailedJR(); jr.setCreateBySid(userSid); @@ -3893,19 +3893,19 @@ public class FinCollectionConfirmationService extends MybatisBaseService stringList = baseMapper.selectBys(loanRepaymentPlanDetails.getBusVinSid()); stringList.removeAll(Collections.singleton(null)); BigDecimal a3 = BigDecimal.ZERO; - if(!stringList.isEmpty()){ + if (!stringList.isEmpty()) { a3 = baseMapper.selectA3(stringList); } unall = unall.add(a1).add(a3); List unList = baseMapper.selectUnA(busVinSid); unList.removeAll(Collections.singleton(null)); BigDecimal a4 = BigDecimal.ZERO; - if(!unList.isEmpty()){ + if (!unList.isEmpty()) { //已收 a4 = baseMapper.selectA4(unList); } BigDecimal a5 = BigDecimal.ZERO; - if(!stringList.isEmpty()){ + if (!stringList.isEmpty()) { a5 = baseMapper.selectA5(stringList); } @@ -3919,7 +3919,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService stringList = baseMapper.selectBys(loanRepaymentPlanDetails.getBusVinSid()); stringList.removeAll(Collections.singleton(null)); BigDecimal a3 = BigDecimal.ZERO; - if(!stringList.isEmpty()){ + if (!stringList.isEmpty()) { a3 = baseMapper.selectA3(stringList); } BigDecimal a1 = baseMapper.selectA1(busVinSid); @@ -3928,12 +3928,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService selNotRuleForBuckSids(@Param("useOrgSid") String useOrgSid); String selPayStateByPlanSid(@Param("key") String key); + + List selSidsForBuckle(@Param("useOrgSid") String useOrgSid); + + int setBuckleState(@Param("sids")List sids,@Param("buckleKey") String buckleKey,@Param("buckle") String buckle); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml index 90cccbb695..92b3060e1e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml @@ -9,7 +9,15 @@ #{sid} - + + update loan_repayment_history + set buckleKey = #{buckleKey}, + buckle =#{buckle} + where sid in + + #{sid} + + + SELECT DISTINCT + b.sid + FROM + ( + SELECT + his.*, + a.* + FROM + loan_repayment_history AS his + LEFT JOIN loan_repayment_plan_details as p ON his.planDetailSid = p.sid + LEFT JOIN ( + SELECT + h.planDetailSid AS ppp, + IFNULL( SUM( h.actualMoney ), 0 ) AS sumActualMoney + FROM + loan_repayment_history AS h + WHERE + buckleKey != '002' + AND buckleKey != '003' + AND updateState = 1 + GROUP BY + h.planDetailSid + ) a ON his.planDetailSid = a.ppp + WHERE + his.buckleKey != '002' + AND his.buckleKey != '003' + AND his.updateState = 1 + AND p.useOrgSid = #{useOrgSid} + ) AS b + WHERE + sumActualMoney = 0 + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java index 8bdbc18218..59e88a886f 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java @@ -802,8 +802,14 @@ public class LoanRepaymentHistoryService extends MybatisBaseService hisSidsForBuckle = baseMapper.selSidsForBuckle(pushUseOrgSid); + if (!hisSidsForBuckle.isEmpty()) { + int i = baseMapper.setBuckleState(hisSidsForBuckle,"003","审核通过"); + } + if (histories.isEmpty() && hisSidsForBuckle.isEmpty()) { + return rb.setMsg("暂无可更新的数据"); } return rb.success(); } From e663e5e0ca229934cce85548b76903c769e6487c Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 3 Apr 2024 14:10:57 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bussalesorder/BusSalesOrderMapper.java | 6 +++ .../biz/bussalesorder/BusSalesOrderMapper.xml | 44 +++++++++++++++++++ .../bussalesorder/BusSalesOrderService.java | 15 ++++++- .../FinFundsCarriedForwardApplyService.java | 19 +++++++- ...inUncollectedReceivablesDetailedMapper.xml | 4 +- .../AsBusrepairInventorybillRest.java | 6 +++ .../AsBusrepairInventorybillService.java | 25 +++++++++-- .../WmsInventoryBillFeign.java | 4 ++ .../WmsInventoryBillFeignFallback.java | 5 +++ 9 files changed, 119 insertions(+), 9 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java index 2b4ac50f4e..ab74a9602f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java @@ -239,4 +239,10 @@ public interface BusSalesOrderMapper extends BaseMapper { CrmCustomerTemp selectCrm(String affiliatedOrgSid); String selectByMcSid(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrgSid") String useOrgSid); + + String selectByBusSid1(String sid); + + String selectByBusSid1D(String sid); + + String selectByBusVinSid1(String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index fa40060989..064165883c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -636,4 +636,48 @@ + + + + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 32a0aeaa64..3f772a3882 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -5841,10 +5841,21 @@ public class BusSalesOrderService extends MybatisBaseService= 0) { + //已认款完成 + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey()); + baseVehicleStateDto.setBusSid(vinList.get(i).getSid()); + dtoList.add(baseVehicleStateDto); + } } } //==============================修改车辆的持久状态组装数据 diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java index 4102cfe25e..99b3cd630b 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java @@ -1621,7 +1621,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService= 0) { //已认款完成 @@ -1635,6 +1635,23 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService= 0) { + //已认款完成 + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey()); + baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid()); + dtoList.add(baseVehicleStateDto); + } else { + //认款未完成 + BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto(); + baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_WRQ.getTypeKey()); + baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid()); + dtoList.add(baseVehicleStateDto); } }else{ //查询该车的所有认款，是否都已认完 diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml index 492bb49391..1823c3ddc2 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml @@ -325,7 +325,7 @@