From afabe79bd71fd57d672b16dc00b50283994bfd87 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 26 May 2022 11:42:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=8E=E6=8E=A7=E9=A1=B9=E7=9B=AE=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=E6=8E=89=E5=92=8C=E6=97=A7=E7=9A=84=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9B=B8=E5=85=B3=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/loansolution/LoanSolutionRest.java | 3 - .../biz/loansolution/LoanSolutionService.java | 56 ++++++++----------- .../LoanSolutionDetailService.java | 21 ++++--- .../loansolutions/LoanSolutionsService.java | 34 ++++++----- .../LoanSolutionTopService.java | 16 ++---- .../LoanSolutionTrailerService.java | 14 ++--- 6 files changed, 60 insertions(+), 84 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolution/LoanSolutionRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolution/LoanSolutionRest.java index 6094b344b6..7253e1d85b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolution/LoanSolutionRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolution/LoanSolutionRest.java @@ -1,6 +1,5 @@ package com.yxt.anrui.riskcenter.biz.loansolution; -import com.yxt.anrui.buscenter.api.busorder.BusOrderFeign; import com.yxt.anrui.riskcenter.api.loansolution.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -32,8 +31,6 @@ public class LoanSolutionRest implements LoanSolutionFeign { @Autowired private LoanSolutionService loanSolutionService; - @Autowired - private BusOrderFeign busOrderFeign; @Override public ResultBean> listPage(@RequestBody PagerQuery pq) { diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolution/LoanSolutionService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolution/LoanSolutionService.java index b27ec6e527..1f44a4e8f8 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolution/LoanSolutionService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolution/LoanSolutionService.java @@ -3,9 +3,7 @@ package com.yxt.anrui.riskcenter.biz.loansolution; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.buscenter.api.busorder.BusOrderFeign; import com.yxt.anrui.buscenter.api.busordermodel.AppModelInSolutionVo; -import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModelFeign; import com.yxt.anrui.crm.api.finborrower.FinBorrower; import com.yxt.anrui.crm.api.finborrower.FinBorrowerFeign; import com.yxt.anrui.riskcenter.api.loanloadprice.LoanLoadprice; @@ -43,7 +41,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.math.BigDecimal; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -74,8 +71,8 @@ public class LoanSolutionService extends MybatisBaseService resultBean = busOrderModelFeign.getAppModelInSolutionVoByOrderSid(orderSid); + /* ResultBean resultBean = busOrderModelFeign.getAppModelInSolutionVoByOrderSid(orderSid); if (resultBean.getSuccess() && resultBean.getData() != null) { vo.setMainVehicleState(1); - } + }*/ // 是否展示挂车价款信息 if (financeProjectVo != null && financeProjectVo.getPackingProject().contains("挂车")) { @@ -447,7 +444,7 @@ public class LoanSolutionService extends MybatisBaseService map = new HashMap<>(); Map mapSum = new HashMap<>(); - BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData(); + /* BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData(); BigDecimal trailerAdvance = StringUtils.toBigDecimal(dto.getTrailerAdvance()); map.put("trailerAdvance", trailerAdvance); mapSum.put("trailerAdvance", trailerAdvance == null ? null : trailerAdvance.multiply(num)); BigDecimal topcoatAdvance = StringUtils.toBigDecimal(dto.getTopcoatAdvance()); map.put("topcoatAdvance", topcoatAdvance); mapSum.put("topcoatAdvance", topcoatAdvance == null ? null : topcoatAdvance.multiply(num)); - map.put("sid", loanSolution.getSid()); -// int i = updateBySid(map, loanSolution.getSid()); + map.put("sid", loanSolution.getSid());*/ baseMapper.updateAppAdvance(map); // 总表 LoanSolutions loanSolutions = loanSolutionsService.selectByLoanPriceSid(loanLoadpriceVo.getSid()); mapSum.put("sid", loanSolutions.getSid()); -// loanSolutionsService.updateBySid(map, loanSolutions.getSid()); int i = loanSolutionsService.updateAppAdvance(mapSum); if (i == 1) { return new ResultBean().success().setMsg("操作成功").setData(loanSolution.getSid()); @@ -593,9 +587,10 @@ public class LoanSolutionService extends MybatisBaseService map = new HashMap<>(); Map mapSum = new HashMap<>(); + /* map.put("bankAccess", dto.getBankAccess()); mapSum.put("bankAccess", dto.getBankAccess()); map.put("productPolicy", dto.getProductPolicy()); @@ -638,8 +633,7 @@ public class LoanSolutionService extends MybatisBaseService map = new HashMap<>(); Map mapSum = new HashMap<>(); - BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData(); + /* BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData(); BigDecimal downPay = StringUtils.toBigDecimal(dto.getDownPay()); map.put("downPay", downPay); mapSum.put("downPay", downPay == null ? null : downPay.multiply(num)); @@ -693,13 +687,11 @@ public class LoanSolutionService extends MybatisBaseService map = new HashMap<>(); Map mapSum = new HashMap<>(); - BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData(); + /* BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData(); BigDecimal advanceAmount = StringUtils.toBigDecimal(dto.getAdvanceAmount()); map.put("advanceAmount", advanceAmount); mapSum.put("advanceAmount", advanceAmount == null ? null : advanceAmount.multiply(num)); @@ -748,13 +740,11 @@ public class LoanSolutionService extends MybatisBaseService map = new HashMap<>(); Map mapSum = new HashMap<>(); - BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData(); + /*BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData(); map.put("prophase", StringUtils.isBlank(dto.getProphase()) ? null : dto.getProphase()); mapSum.put("prophase", StringUtils.isBlank(dto.getProphase()) ? null : dto.getProphase()); BigDecimal prophasePayMonkey = StringUtils.toBigDecimal(dto.getProphasePayMoney()); @@ -801,14 +791,12 @@ public class LoanSolutionService extends MybatisBaseService map = new HashMap<>(); Map mapSum = new HashMap<>(); - BigDecimal receCarDownPay = StringUtils.toBigDecimal(dto.getReceCarDownPay()); + /*BigDecimal receCarDownPay = StringUtils.toBigDecimal(dto.getReceCarDownPay()); map.put("receCarDownPay", receCarDownPay); mapSum.put("receCarDownPay", receCarDownPay == null ? null : receCarDownPay.multiply(num)); BigDecimal receLoanMargin = StringUtils.toBigDecimal(dto.getReceLoanMargin()); @@ -388,7 +388,7 @@ public class LoanSolutionDetailService extends MybatisBaseService topList = loanSolutionTopService.getAppTopListByOrderSid(orderSid).getData(); @@ -431,7 +429,7 @@ public class LoanSolutionsService extends MybatisBaseService c; c++){ + /* for (int c = 0; n > c; c++){ str = str + details.getReceInciExplain() + ";"; - } + }*/ details.setReceInciExplain(str); } loanSolutionsDetailService.save(details); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutiontop/LoanSolutionTopService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutiontop/LoanSolutionTopService.java index 7bff45ad85..bff6f22680 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutiontop/LoanSolutionTopService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutiontop/LoanSolutionTopService.java @@ -3,7 +3,6 @@ package com.yxt.anrui.riskcenter.biz.loansolutiontop; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModelFeign; import com.yxt.anrui.riskcenter.api.loanloadprice.LoanLoadpriceVo; import com.yxt.anrui.riskcenter.api.loansolution.LoanSolution; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; @@ -53,8 +52,8 @@ public class LoanSolutionTopService extends MybatisBaseService createQueryWrapper(LoanSolutionTopQuery query) { QueryWrapper qw = new QueryWrapper<>(); @@ -173,10 +172,10 @@ public class LoanSolutionTopService extends MybatisBaseService map = new HashMap<>(); Map mapSum = new HashMap<>(); BigDecimal withPrice = StringUtils.toBigDecimal(dto.getWithPrice()); - BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData(); + /* BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData(); map.put("withPrice", withPrice); - mapSum.put("withPrice", withPrice == null ? null : withPrice.multiply(num)); + mapSum.put("withPrice", withPrice == null ? null : withPrice.multiply(num));*/ map.put("withName", dto.getWithName()); mapSum.put("withName", dto.getWithName()); map.put("changeManufacturer", dto.getChangeManufacturer()); @@ -209,11 +207,9 @@ public class LoanSolutionTopService extends MybatisBaseService createQueryWrapper(LoanSolutionTrailerQuery query) { QueryWrapper qw = new QueryWrapper<>(); @@ -147,10 +146,10 @@ public class LoanSolutionTrailerService extends MybatisBaseService