yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

风控项目注释掉和旧的销售订单相关的代码

master
dimengzhe 3 years ago
parent
4d61bf5430
commit
afabe79bd7
6 changed files with 60 additions and 84 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolution/LoanSolutionRest.java
  2. 56
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolution/LoanSolutionService.java
  3. 21
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutiondetail/LoanSolutionDetailService.java
  4. 34
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
  5. 16
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutiontop/LoanSolutionTopService.java
  6. 14
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutiontrailer/LoanSolutionTrailerService.java

3
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolution/LoanSolutionRest.java
View File

@ -1,6 +1,5 @@
package com.yxt.anrui.riskcenter.biz.loansolution; 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.anrui.riskcenter.api.loansolution.*;
import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
@ -32,8 +31,6 @@ public class LoanSolutionRest implements LoanSolutionFeign {
@Autowired @Autowired
private LoanSolutionService loanSolutionService; private LoanSolutionService loanSolutionService;
@Autowired
private BusOrderFeign busOrderFeign;
@Override @Override
public ResultBean<PagerVo<LoanSolutionVo>> listPage(@RequestBody PagerQuery<LoanSolutionQuery> pq) { public ResultBean<PagerVo<LoanSolutionVo>> listPage(@RequestBody PagerQuery<LoanSolutionQuery> pq) {

56
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolution/LoanSolutionService.java
View File

@ -3,9 +3,7 @@ package com.yxt.anrui.riskcenter.biz.loansolution;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; 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.AppModelInSolutionVo;
import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModelFeign;
import com.yxt.anrui.crm.api.finborrower.FinBorrower; import com.yxt.anrui.crm.api.finborrower.FinBorrower;
import com.yxt.anrui.crm.api.finborrower.FinBorrowerFeign; import com.yxt.anrui.crm.api.finborrower.FinBorrowerFeign;
import com.yxt.anrui.riskcenter.api.loanloadprice.LoanLoadprice; 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.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -74,8 +71,8 @@ public class LoanSolutionService extends MybatisBaseService<LoanSolutionMapper,
private LoanSolutionTrailerService loanSolutionTrailerService; private LoanSolutionTrailerService loanSolutionTrailerService;
@Autowired @Autowired
private LoanSolutionsTrailerService loanSolutionsTrailerService; private LoanSolutionsTrailerService loanSolutionsTrailerService;
@Autowired /* @Autowired
private BusOrderFeign busOrderFeign; private BusOrderFeign busOrderFeign;*/
@Autowired @Autowired
private LoanSolutionInciexplainService loanSolutionInciexplainService; private LoanSolutionInciexplainService loanSolutionInciexplainService;
@Autowired @Autowired
@ -84,8 +81,8 @@ public class LoanSolutionService extends MybatisBaseService<LoanSolutionMapper,
private LoanSolutionDetailService loanSolutionDetailService; private LoanSolutionDetailService loanSolutionDetailService;
@Autowired @Autowired
private LoanSolutionsDetailService loanSolutionsDetailService; private LoanSolutionsDetailService loanSolutionsDetailService;
@Autowired /* @Autowired
private BusOrderModelFeign busOrderModelFeign; private BusOrderModelFeign busOrderModelFeign;*/
@Autowired @Autowired
private LoanLoadpriceService loanLoadpriceService; private LoanLoadpriceService loanLoadpriceService;
@ -122,7 +119,7 @@ public class LoanSolutionService extends MybatisBaseService<LoanSolutionMapper,
if(StringUtils.isNotBlank(loanPriceSid)){ if(StringUtils.isNotBlank(loanPriceSid)){
LoanLoadprice loanLoadprice = loanLoadpriceService.fetchBySid(loanPriceSid); LoanLoadprice loanLoadprice = loanLoadpriceService.fetchBySid(loanPriceSid);
orderSid= loanLoadprice.getOrderSid(); orderSid= loanLoadprice.getOrderSid();
appModelInSolutionVoResultBean=busOrderModelFeign.getAppModelInSolutionVoByOrderSid(orderSid); /* appModelInSolutionVoResultBean=busOrderModelFeign.getAppModelInSolutionVoByOrderSid(orderSid);*/
if(appModelInSolutionVoResultBean.getSuccess()){ if(appModelInSolutionVoResultBean.getSuccess()){
String quantity= appModelInSolutionVoResultBean.getData().getQuantity(); String quantity= appModelInSolutionVoResultBean.getData().getQuantity();
num=Integer.parseInt(quantity); num=Integer.parseInt(quantity);
@ -338,10 +335,10 @@ public class LoanSolutionService extends MybatisBaseService<LoanSolutionMapper,
vo.setFinanceState(1); vo.setFinanceState(1);
} }
// 主车价款信息 // 主车价款信息
ResultBean<AppModelInSolutionVo> resultBean = busOrderModelFeign.getAppModelInSolutionVoByOrderSid(orderSid); /* ResultBean<AppModelInSolutionVo> resultBean = busOrderModelFeign.getAppModelInSolutionVoByOrderSid(orderSid);
if (resultBean.getSuccess() && resultBean.getData() != null) { if (resultBean.getSuccess() && resultBean.getData() != null) {
vo.setMainVehicleState(1); vo.setMainVehicleState(1);
} }*/
// 是否展示挂车价款信息 // 是否展示挂车价款信息
if (financeProjectVo != null && financeProjectVo.getPackingProject().contains("挂车")) { if (financeProjectVo != null && financeProjectVo.getPackingProject().contains("挂车")) {
@ -447,7 +444,7 @@ public class LoanSolutionService extends MybatisBaseService<LoanSolutionMapper,
LoanSolutions loanSolutions = new LoanSolutions(); LoanSolutions loanSolutions = new LoanSolutions();
dto.fillEntity(loanSolutions); dto.fillEntity(loanSolutions);
loanSolutions.setSid(UUID.randomUUID().toString()); loanSolutions.setSid(UUID.randomUUID().toString());
BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData(); /* BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData();
loanSolutions.setMainVehicleAmount(loanSolutions.getMainVehicleAmount().multiply(num)); loanSolutions.setMainVehicleAmount(loanSolutions.getMainVehicleAmount().multiply(num));
BigDecimal trailerAmount = StringUtils.toBigDecimal(dto.getTrailerAmount()); BigDecimal trailerAmount = StringUtils.toBigDecimal(dto.getTrailerAmount());
loanSolutions.setTrailerAmount(trailerAmount == null ? null : trailerAmount.multiply(num)); loanSolutions.setTrailerAmount(trailerAmount == null ? null : trailerAmount.multiply(num));
@ -462,7 +459,7 @@ public class LoanSolutionService extends MybatisBaseService<LoanSolutionMapper,
BigDecimal financingAmount = StringUtils.toBigDecimal(dto.getFinancingAmount()); BigDecimal financingAmount = StringUtils.toBigDecimal(dto.getFinancingAmount());
loanSolutions.setFinancingAmount(financingAmount == null ? null : financingAmount.multiply(num)); loanSolutions.setFinancingAmount(financingAmount == null ? null : financingAmount.multiply(num));
BigDecimal otherAmount = StringUtils.toBigDecimal(dto.getOtherAmount()); BigDecimal otherAmount = StringUtils.toBigDecimal(dto.getOtherAmount());
loanSolutions.setOtherAmount(otherAmount == null ? null : otherAmount.multiply(num)); loanSolutions.setOtherAmount(otherAmount == null ? null : otherAmount.multiply(num));*/
boolean saveBoolean = loanSolutionsService.save(loanSolutions); boolean saveBoolean = loanSolutionsService.save(loanSolutions);
if (saveBoolean) { if (saveBoolean) {
return new ResultBean().success().setMsg("保存成功").setData(loanSolution.getSid()); return new ResultBean().success().setMsg("保存成功").setData(loanSolution.getSid());
@ -476,7 +473,7 @@ public class LoanSolutionService extends MybatisBaseService<LoanSolutionMapper,
mapSum.put("packingProjectKey", dto.getPackingProjectKey()); mapSum.put("packingProjectKey", dto.getPackingProjectKey());
map.put("packingProject", dto.getPackingProject()); map.put("packingProject", dto.getPackingProject());
mapSum.put("packingProject", dto.getPackingProject()); mapSum.put("packingProject", dto.getPackingProject());
BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData(); /* BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData();
map.put("mainVehicleAmount", StringUtils.toBigDecimal(dto.getMainVehicleAmount())); map.put("mainVehicleAmount", StringUtils.toBigDecimal(dto.getMainVehicleAmount()));
mapSum.put("mainVehicleAmount", StringUtils.toBigDecimal(dto.getMainVehicleAmount())); mapSum.put("mainVehicleAmount", StringUtils.toBigDecimal(dto.getMainVehicleAmount()));
BigDecimal trailerAmount = StringUtils.toBigDecimal(dto.getTrailerAmount()); BigDecimal trailerAmount = StringUtils.toBigDecimal(dto.getTrailerAmount());
@ -501,8 +498,7 @@ public class LoanSolutionService extends MybatisBaseService<LoanSolutionMapper,
mapSum.put("financingAmount", StringUtils.toBigDecimal(dto.getFinancingAmount()).multiply(num)); mapSum.put("financingAmount", StringUtils.toBigDecimal(dto.getFinancingAmount()).multiply(num));
map.put("financingRemarks", dto.getFinancingRemarks()); map.put("financingRemarks", dto.getFinancingRemarks());
mapSum.put("financingRemarks", dto.getFinancingRemarks()); mapSum.put("financingRemarks", dto.getFinancingRemarks());
map.put("sid", loanSolution.getSid()); map.put("sid", loanSolution.getSid());*/
// updateBySid(map, loanSolution.getSid());
baseMapper.updateAppFinanceProject(map); baseMapper.updateAppFinanceProject(map);
// 总表 // 总表
LoanSolutions loanSolutions = loanSolutionsService.selectByLoanPriceSid(dto.getLoanPriceSid()); LoanSolutions loanSolutions = loanSolutionsService.selectByLoanPriceSid(dto.getLoanPriceSid());
@ -543,20 +539,18 @@ public class LoanSolutionService extends MybatisBaseService<LoanSolutionMapper,
LoanSolution loanSolution = baseMapper.selectByLoanPriceSid(loanLoadpriceVo.getSid()); LoanSolution loanSolution = baseMapper.selectByLoanPriceSid(loanLoadpriceVo.getSid());
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
Map<String, Object> mapSum = new HashMap<>(); Map<String, Object> mapSum = new HashMap<>();
BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData(); /* BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData();
BigDecimal trailerAdvance = StringUtils.toBigDecimal(dto.getTrailerAdvance()); BigDecimal trailerAdvance = StringUtils.toBigDecimal(dto.getTrailerAdvance());
map.put("trailerAdvance", trailerAdvance); map.put("trailerAdvance", trailerAdvance);
mapSum.put("trailerAdvance", trailerAdvance == null ? null : trailerAdvance.multiply(num)); mapSum.put("trailerAdvance", trailerAdvance == null ? null : trailerAdvance.multiply(num));
BigDecimal topcoatAdvance = StringUtils.toBigDecimal(dto.getTopcoatAdvance()); BigDecimal topcoatAdvance = StringUtils.toBigDecimal(dto.getTopcoatAdvance());
map.put("topcoatAdvance", topcoatAdvance); map.put("topcoatAdvance", topcoatAdvance);
mapSum.put("topcoatAdvance", topcoatAdvance == null ? null : topcoatAdvance.multiply(num)); mapSum.put("topcoatAdvance", topcoatAdvance == null ? null : topcoatAdvance.multiply(num));
map.put("sid", loanSolution.getSid()); map.put("sid", loanSolution.getSid());*/
// int i = updateBySid(map, loanSolution.getSid());
baseMapper.updateAppAdvance(map); baseMapper.updateAppAdvance(map);
// 总表 // 总表
LoanSolutions loanSolutions = loanSolutionsService.selectByLoanPriceSid(loanLoadpriceVo.getSid()); LoanSolutions loanSolutions = loanSolutionsService.selectByLoanPriceSid(loanLoadpriceVo.getSid());
mapSum.put("sid", loanSolutions.getSid()); mapSum.put("sid", loanSolutions.getSid());
// loanSolutionsService.updateBySid(map, loanSolutions.getSid());
int i = loanSolutionsService.updateAppAdvance(mapSum); int i = loanSolutionsService.updateAppAdvance(mapSum);
if (i == 1) { if (i == 1) {
return new ResultBean().success().setMsg("操作成功").setData(loanSolution.getSid()); return new ResultBean().success().setMsg("操作成功").setData(loanSolution.getSid());
@ -593,9 +587,10 @@ public class LoanSolutionService extends MybatisBaseService<LoanSolutionMapper,
public ResultBean saveOrUpdateAppFinBack(AppFinBackDto dto) { public ResultBean saveOrUpdateAppFinBack(AppFinBackDto dto) {
LoanLoadpriceVo loanLoadpriceVo = loanLoadpriceService.selectByOrderSid(dto.getOrderSid()); LoanLoadpriceVo loanLoadpriceVo = loanLoadpriceService.selectByOrderSid(dto.getOrderSid());
LoanSolution loanSolution = baseMapper.selectByLoanPriceSid(loanLoadpriceVo.getSid()); LoanSolution loanSolution = baseMapper.selectByLoanPriceSid(loanLoadpriceVo.getSid());
BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData(); /*BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData();*/
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
Map<String, Object> mapSum = new HashMap<>(); Map<String, Object> mapSum = new HashMap<>();
/*
map.put("bankAccess", dto.getBankAccess()); map.put("bankAccess", dto.getBankAccess());
mapSum.put("bankAccess", dto.getBankAccess()); mapSum.put("bankAccess", dto.getBankAccess());
map.put("productPolicy", dto.getProductPolicy()); map.put("productPolicy", dto.getProductPolicy());
@ -638,8 +633,7 @@ public class LoanSolutionService extends MybatisBaseService<LoanSolutionMapper,
mapSum.put("loanInterest", dto.getLoanInterest()); mapSum.put("loanInterest", dto.getLoanInterest());
map.put("solutionsRemarks", dto.getSolutionsRemarks()); map.put("solutionsRemarks", dto.getSolutionsRemarks());
mapSum.put("solutionsRemarks", dto.getSolutionsRemarks()); mapSum.put("solutionsRemarks", dto.getSolutionsRemarks());
map.put("sid", loanSolution.getSid()); map.put("sid", loanSolution.getSid());*/
// updateById(loanSolution);
baseMapper.updateAppFinBack(map); baseMapper.updateAppFinBack(map);
// 总表 // 总表
LoanSolutions loanSolutions = loanSolutionsService.selectByLoanPriceSid(loanLoadpriceVo.getSid()); LoanSolutions loanSolutions = loanSolutionsService.selectByLoanPriceSid(loanLoadpriceVo.getSid());
@ -678,7 +672,7 @@ public class LoanSolutionService extends MybatisBaseService<LoanSolutionMapper,
LoanSolution loanSolution = baseMapper.selectByLoanPriceSid(loanLoadpriceVo.getSid()); LoanSolution loanSolution = baseMapper.selectByLoanPriceSid(loanLoadpriceVo.getSid());
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
Map<String, Object> mapSum = new HashMap<>(); Map<String, Object> mapSum = new HashMap<>();
BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData(); /* BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData();
BigDecimal downPay = StringUtils.toBigDecimal(dto.getDownPay()); BigDecimal downPay = StringUtils.toBigDecimal(dto.getDownPay());
map.put("downPay", downPay); map.put("downPay", downPay);
mapSum.put("downPay", downPay == null ? null : downPay.multiply(num)); mapSum.put("downPay", downPay == null ? null : downPay.multiply(num));
@ -693,13 +687,11 @@ public class LoanSolutionService extends MybatisBaseService<LoanSolutionMapper,
mapSum.put("downPayFinancier", dto.getDownPayFinancier()); mapSum.put("downPayFinancier", dto.getDownPayFinancier());
map.put("downPayRemarks", dto.getDownPayRemarks()); map.put("downPayRemarks", dto.getDownPayRemarks());
mapSum.put("downPayRemarks", dto.getDownPayRemarks()); mapSum.put("downPayRemarks", dto.getDownPayRemarks());
map.put("sid", loanSolution.getSid()); map.put("sid", loanSolution.getSid());*/
// updateBySid(map, loanSolution.getSid());
baseMapper.updateAppDownPay(map); baseMapper.updateAppDownPay(map);
// 总表 // 总表
LoanSolutions loanSolutionsVo = loanSolutionsService.selectByLoanPriceSid(loanLoadpriceVo.getSid()); LoanSolutions loanSolutionsVo = loanSolutionsService.selectByLoanPriceSid(loanLoadpriceVo.getSid());
mapSum.put("sid", loanSolutionsVo.getSid()); mapSum.put("sid", loanSolutionsVo.getSid());
// int i = loanSolutionsService.updateBySid(mapSum, loanSolutionsVo.getSid());
int i = loanSolutionsService.updateAppDownPay(mapSum); int i = loanSolutionsService.updateAppDownPay(mapSum);
if (i == 1) { if (i == 1) {
return new ResultBean().success().setMsg("操作成功").setData(loanSolution.getSid()); return new ResultBean().success().setMsg("操作成功").setData(loanSolution.getSid());
@ -734,7 +726,7 @@ public class LoanSolutionService extends MybatisBaseService<LoanSolutionMapper,
LoanSolution loanSolution = baseMapper.selectByLoanPriceSid(loanLoadpriceVo.getSid()); LoanSolution loanSolution = baseMapper.selectByLoanPriceSid(loanLoadpriceVo.getSid());
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
Map<String, Object> mapSum = new HashMap<>(); Map<String, Object> mapSum = new HashMap<>();
BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData(); /* BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData();
BigDecimal advanceAmount = StringUtils.toBigDecimal(dto.getAdvanceAmount()); BigDecimal advanceAmount = StringUtils.toBigDecimal(dto.getAdvanceAmount());
map.put("advanceAmount", advanceAmount); map.put("advanceAmount", advanceAmount);
mapSum.put("advanceAmount", advanceAmount == null ? null : advanceAmount.multiply(num)); mapSum.put("advanceAmount", advanceAmount == null ? null : advanceAmount.multiply(num));
@ -748,13 +740,11 @@ public class LoanSolutionService extends MybatisBaseService<LoanSolutionMapper,
mapSum.put("c_repayMoney", c_repayMoney == null ? null : c_repayMoney.multiply(num)); mapSum.put("c_repayMoney", c_repayMoney == null ? null : c_repayMoney.multiply(num));
map.put("c_repayRemarks", dto.getC_repayRemarks()); map.put("c_repayRemarks", dto.getC_repayRemarks());
mapSum.put("c_repayRemarks", dto.getC_repayRemarks()); mapSum.put("c_repayRemarks", dto.getC_repayRemarks());
map.put("sid", loanSolution.getSid()); map.put("sid", loanSolution.getSid());*/
// updateBySid(map, loanSolution.getSid());
baseMapper.updateAppCorpAdvance(map); baseMapper.updateAppCorpAdvance(map);
// 总表 // 总表
LoanSolutions loanSolutionsVo = loanSolutionsService.selectByLoanPriceSid(loanLoadpriceVo.getSid()); LoanSolutions loanSolutionsVo = loanSolutionsService.selectByLoanPriceSid(loanLoadpriceVo.getSid());
mapSum.put("sid", loanSolutionsVo.getSid()); mapSum.put("sid", loanSolutionsVo.getSid());
// int i = loanSolutionsService.updateBySid(mapSum, loanSolutionsVo.getSid());
int i = loanSolutionsService.updateAppCorpAdvance(mapSum); int i = loanSolutionsService.updateAppCorpAdvance(mapSum);
if (i == 1) { if (i == 1) {
return new ResultBean().success().setMsg("操作成功").setData(loanSolution.getSid()); return new ResultBean().success().setMsg("操作成功").setData(loanSolution.getSid());
@ -789,7 +779,7 @@ public class LoanSolutionService extends MybatisBaseService<LoanSolutionMapper,
LoanSolution loanSolution = baseMapper.selectByLoanPriceSid(loanLoadpriceVo.getSid()); LoanSolution loanSolution = baseMapper.selectByLoanPriceSid(loanLoadpriceVo.getSid());
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
Map<String, Object> mapSum = new HashMap<>(); Map<String, Object> 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()); map.put("prophase", StringUtils.isBlank(dto.getProphase()) ? null : dto.getProphase());
mapSum.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()); BigDecimal prophasePayMonkey = StringUtils.toBigDecimal(dto.getProphasePayMoney());
@ -801,14 +791,12 @@ public class LoanSolutionService extends MybatisBaseService<LoanSolutionMapper,
map.put("modeOfRePayKey", dto.getModeOfRePayKey()); map.put("modeOfRePayKey", dto.getModeOfRePayKey());
mapSum.put("modeOfRePayKey", dto.getModeOfRePayKey()); mapSum.put("modeOfRePayKey", dto.getModeOfRePayKey());
map.put("modeOfRePay", dto.getModeOfRePay()); map.put("modeOfRePay", dto.getModeOfRePay());
mapSum.put("modeOfRePay", dto.getModeOfRePay()); mapSum.put("modeOfRePay", dto.getModeOfRePay());*/
// updateBySid(map, loanSolution.getSid());
map.put("sid", loanSolution.getSid()); map.put("sid", loanSolution.getSid());
baseMapper.updateAppRePayByMap(map); baseMapper.updateAppRePayByMap(map);
// 总表 // 总表
LoanSolutions loanSolutionsVo = loanSolutionsService.selectByLoanPriceSid(loanLoadpriceVo.getSid()); LoanSolutions loanSolutionsVo = loanSolutionsService.selectByLoanPriceSid(loanLoadpriceVo.getSid());
mapSum.put("sid", loanSolutionsVo.getSid()); mapSum.put("sid", loanSolutionsVo.getSid());
// int i = loanSolutionsService.updateBySid(mapSum, loanSolutionsVo.getSid());
int i = loanSolutionsService.updateAppRePayByMap(mapSum); int i = loanSolutionsService.updateAppRePayByMap(mapSum);
if (i == 1) { if (i == 1) {
return new ResultBean().success().setMsg("操作成功").setData(loanSolution.getSid()); return new ResultBean().success().setMsg("操作成功").setData(loanSolution.getSid());

21
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutiondetail/LoanSolutionDetailService.java
View File

@ -3,7 +3,6 @@ package com.yxt.anrui.riskcenter.biz.loansolutiondetail;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModelFeign;
import com.yxt.anrui.riskcenter.api.loanloadprice.LoanLoadprice; import com.yxt.anrui.riskcenter.api.loanloadprice.LoanLoadprice;
import com.yxt.anrui.riskcenter.api.loansolution.LoanSolution; import com.yxt.anrui.riskcenter.api.loansolution.LoanSolution;
import com.yxt.anrui.riskcenter.api.loansolutiondetail.*; import com.yxt.anrui.riskcenter.api.loansolutiondetail.*;
@ -57,8 +56,8 @@ public class LoanSolutionDetailService extends MybatisBaseService<LoanSolutionDe
private LoanSolutionService loanSolutionService; private LoanSolutionService loanSolutionService;
@Autowired @Autowired
private LoanSolutionInciexplainService loanSolutionInciexplainService; private LoanSolutionInciexplainService loanSolutionInciexplainService;
@Autowired /* @Autowired
private BusOrderModelFeign busOrderModelFeign; private BusOrderModelFeign busOrderModelFeign;*/
@Autowired @Autowired
private LoanSolutionsService loanSolutionsService; private LoanSolutionsService loanSolutionsService;
@Autowired @Autowired
@ -295,7 +294,7 @@ public class LoanSolutionDetailService extends MybatisBaseService<LoanSolutionDe
// 总表 // 总表
LoanSolution loanSolution = loanSolutionService.fetchBySid(detail.getSolutionSid()); LoanSolution loanSolution = loanSolutionService.fetchBySid(detail.getSolutionSid());
LoanLoadprice loanLoadprice = loanLoadpriceService.fetchBySid(loanSolution.getLoanPriceSid()); LoanLoadprice loanLoadprice = loanLoadpriceService.fetchBySid(loanSolution.getLoanPriceSid());
BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(loanLoadprice.getOrderSid()).getData(); /*BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(loanLoadprice.getOrderSid()).getData();
LoanSolutions loanSolutionsVo = loanSolutionsService.selectByLoanPriceSid(loanLoadprice.getSid()); LoanSolutions loanSolutionsVo = loanSolutionsService.selectByLoanPriceSid(loanLoadprice.getSid());
LoanSolutionsDetail details = geneDetailsByDetail(detail, num); LoanSolutionsDetail details = geneDetailsByDetail(detail, num);
details.setSid(UUID.randomUUID().toString()); details.setSid(UUID.randomUUID().toString());
@ -309,15 +308,16 @@ public class LoanSolutionDetailService extends MybatisBaseService<LoanSolutionDe
return new ResultBean().success().setMsg("保存成功").setData(detail.getSid()); return new ResultBean().success().setMsg("保存成功").setData(detail.getSid());
} else { } else {
return new ResultBean().fail().setMsg("保存失败"); return new ResultBean().fail().setMsg("保存失败");
} }*/
return new ResultBean().fail().setMsg("保存失败");
} else { // 修改 } else { // 修改
LoanSolutionDetail detail = fetchBySid(dto.getSid()); LoanSolutionDetail detail = fetchBySid(dto.getSid());
LoanSolution loanSolution = loanSolutionService.fetchBySid(detail.getSolutionSid()); LoanSolution loanSolution = loanSolutionService.fetchBySid(detail.getSolutionSid());
LoanLoadprice loanLoadprice = loanLoadpriceService.fetchBySid(loanSolution.getLoanPriceSid()); LoanLoadprice loanLoadprice = loanLoadpriceService.fetchBySid(loanSolution.getLoanPriceSid());
BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(loanLoadprice.getOrderSid()).getData(); /*BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(loanLoadprice.getOrderSid()).getData();*/
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
Map<String, Object> mapSum = new HashMap<>(); Map<String, Object> mapSum = new HashMap<>();
BigDecimal receCarDownPay = StringUtils.toBigDecimal(dto.getReceCarDownPay()); /*BigDecimal receCarDownPay = StringUtils.toBigDecimal(dto.getReceCarDownPay());
map.put("receCarDownPay", receCarDownPay); map.put("receCarDownPay", receCarDownPay);
mapSum.put("receCarDownPay", receCarDownPay == null ? null : receCarDownPay.multiply(num)); mapSum.put("receCarDownPay", receCarDownPay == null ? null : receCarDownPay.multiply(num));
BigDecimal receLoanMargin = StringUtils.toBigDecimal(dto.getReceLoanMargin()); BigDecimal receLoanMargin = StringUtils.toBigDecimal(dto.getReceLoanMargin());
@ -388,7 +388,7 @@ public class LoanSolutionDetailService extends MybatisBaseService<LoanSolutionDe
mapSum.put("receSum", receSum == null ? null : receSum.multiply(num)); mapSum.put("receSum", receSum == null ? null : receSum.multiply(num));
BigDecimal actualSum = StringUtils.toBigDecimal(dto.getActualSum()); BigDecimal actualSum = StringUtils.toBigDecimal(dto.getActualSum());
map.put("actualSum", actualSum); map.put("actualSum", actualSum);
mapSum.put("actualSum", actualSum == null ? null : actualSum.multiply(num)); mapSum.put("actualSum", actualSum == null ? null : actualSum.multiply(num));*/
map.put("depositReceived", StringUtils.toBigDecimal(dto.getDepositReceived())); map.put("depositReceived", StringUtils.toBigDecimal(dto.getDepositReceived()));
mapSum.put("depositReceived", StringUtils.toBigDecimal(dto.getDepositReceived())); mapSum.put("depositReceived", StringUtils.toBigDecimal(dto.getDepositReceived()));
map.put("carDownPayRemarks", dto.getCarDownPayRemarks()); map.put("carDownPayRemarks", dto.getCarDownPayRemarks());
@ -420,7 +420,7 @@ public class LoanSolutionDetailService extends MybatisBaseService<LoanSolutionDe
LoanSolutionInciexplain inciexplain = loanSolutionInciexplainService.selectByDetailSid(dto.getSid()); LoanSolutionInciexplain inciexplain = loanSolutionInciexplainService.selectByDetailSid(dto.getSid());
BigDecimal GPS = StringUtils.toBigDecimal(dto.getGPS()); BigDecimal GPS = StringUtils.toBigDecimal(dto.getGPS());
map.put("GPS", GPS); map.put("GPS", GPS);
mapSum.put("GPS", GPS == null ? null : GPS.multiply(num)); /*mapSum.put("GPS", GPS == null ? null : GPS.multiply(num));
map.put("GPSBz", dto.getGPSBz()); map.put("GPSBz", dto.getGPSBz());
mapSum.put("GPSBz", dto.getGPSBz()); mapSum.put("GPSBz", dto.getGPSBz());
BigDecimal publicityFfe = StringUtils.toBigDecimal(dto.getPublicityFfe()); BigDecimal publicityFfe = StringUtils.toBigDecimal(dto.getPublicityFfe());
@ -443,8 +443,7 @@ public class LoanSolutionDetailService extends MybatisBaseService<LoanSolutionDe
mapSum.put("licenseFfe", licenseFfe == null ? null : licenseFfe.multiply(num)); mapSum.put("licenseFfe", licenseFfe == null ? null : licenseFfe.multiply(num));
map.put("licenseFfeBz", dto.getLicenseFfeBz()); map.put("licenseFfeBz", dto.getLicenseFfeBz());
mapSum.put("licenseFfeBz", dto.getLicenseFfeBz()); mapSum.put("licenseFfeBz", dto.getLicenseFfeBz());
map.put("sid", inciexplain.getSid()); map.put("sid", inciexplain.getSid());*/
// loanSolutionInciexplainService.updateById(inciexplain);
loanSolutionInciexplainService.updateAppInciexplainByMap(map); loanSolutionInciexplainService.updateAppInciexplainByMap(map);
// 总表 // 总表
LoanSolutions loanSolutionsVo = loanSolutionsService.selectByLoanPriceSid(loanSolution.getLoanPriceSid()); LoanSolutions loanSolutionsVo = loanSolutionsService.selectByLoanPriceSid(loanSolution.getLoanPriceSid());

34
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
View File

@ -3,22 +3,21 @@ package com.yxt.anrui.riskcenter.biz.loansolutions;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModelFeign;
import com.yxt.anrui.crm.api.finborrower.FinBorrowerFeign; import com.yxt.anrui.crm.api.finborrower.FinBorrowerFeign;
import com.yxt.anrui.riskcenter.api.loanloadprice.LoanLoadpriceVo; import com.yxt.anrui.riskcenter.api.loanloadprice.LoanLoadpriceVo;
import com.yxt.anrui.riskcenter.api.loansolution.*; import com.yxt.anrui.riskcenter.api.loansolution.LoanSolution;
import com.yxt.anrui.riskcenter.api.loansolution.LoanSolutionDto;
import com.yxt.anrui.riskcenter.api.loansolutiondetail.AppLoanSolutionDetailVo; import com.yxt.anrui.riskcenter.api.loansolutiondetail.AppLoanSolutionDetailVo;
import com.yxt.anrui.riskcenter.api.loansolutiondetail.LoanSolutionDetailDto; import com.yxt.anrui.riskcenter.api.loansolutiondetail.LoanSolutionDetailDto;
import com.yxt.anrui.riskcenter.api.loansolutioninciexplain.LoanSolutionInciexplainDto; import com.yxt.anrui.riskcenter.api.loansolutioninciexplain.LoanSolutionInciexplainDto;
import com.yxt.anrui.riskcenter.api.loansolutions.*; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
import com.yxt.anrui.riskcenter.api.loansolutionsdetail.AppLoanSolutionsDetailVo; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsDto;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsQuery;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsVo;
import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail; import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail;
import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetailVo; import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetailVo;
import com.yxt.anrui.riskcenter.api.loansolutionsinciexplain.LoanSolutionsInciexplain; import com.yxt.anrui.riskcenter.api.loansolutionsinciexplain.LoanSolutionsInciexplain;
import com.yxt.anrui.riskcenter.api.loansolutionsinciexplain.LoanSolutionsInciexplainVo;
import com.yxt.anrui.riskcenter.api.loansolutionstop.AppLoanSolutionTopVo;
import com.yxt.anrui.riskcenter.api.loansolutionstop.LoanSolutionsTop; import com.yxt.anrui.riskcenter.api.loansolutionstop.LoanSolutionsTop;
import com.yxt.anrui.riskcenter.api.loansolutionstrailer.AppLoanSolutionsTrailerVo;
import com.yxt.anrui.riskcenter.api.loansolutionstrailer.LoanSolutionsTrailer; import com.yxt.anrui.riskcenter.api.loansolutionstrailer.LoanSolutionsTrailer;
import com.yxt.anrui.riskcenter.api.loansolutiontop.AppTopListVo; import com.yxt.anrui.riskcenter.api.loansolutiontop.AppTopListVo;
import com.yxt.anrui.riskcenter.api.loansolutiontop.LoanSolutionTopDto; import com.yxt.anrui.riskcenter.api.loansolutiontop.LoanSolutionTopDto;
@ -43,7 +42,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
@ -81,8 +79,8 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
private LoanSolutionTopService loanSolutionTopService; private LoanSolutionTopService loanSolutionTopService;
@Autowired @Autowired
private LoanSolutionDetailService loanSolutionDetailService; private LoanSolutionDetailService loanSolutionDetailService;
@Autowired /* @Autowired
private BusOrderModelFeign busOrderModelFeign; private BusOrderModelFeign busOrderModelFeign;*/
@Autowired @Autowired
private FinBorrowerFeign finBorrowerFeign; private FinBorrowerFeign finBorrowerFeign;
@ -393,7 +391,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
LoanSolutions loanSolutions = new LoanSolutions(); LoanSolutions loanSolutions = new LoanSolutions();
BeanUtil.copyProperties(loanSolution, loanSolutions); BeanUtil.copyProperties(loanSolution, loanSolutions);
// 方案（总） // 方案（总）
int n = Integer.parseInt(busOrderModelFeign.getAppModelInSolutionVoByOrderSid(orderSid).getData().getQuantity()); /* int n = Integer.parseInt(busOrderModelFeign.getAppModelInSolutionVoByOrderSid(orderSid).getData().getQuantity());
loanSolutions.setFinancingAmount(calSumBigDecimal(loanSolutions.getFinancingAmount(), n)); loanSolutions.setFinancingAmount(calSumBigDecimal(loanSolutions.getFinancingAmount(), n));
loanSolutions.setMainVehicleAmount(calSumBigDecimal(loanSolutions.getMainVehicleAmount(), n)); loanSolutions.setMainVehicleAmount(calSumBigDecimal(loanSolutions.getMainVehicleAmount(), n));
loanSolutions.setTrailerAmount(calSumBigDecimal(loanSolutions.getTrailerAmount(), n)); loanSolutions.setTrailerAmount(calSumBigDecimal(loanSolutions.getTrailerAmount(), n));
@ -413,7 +411,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
loanSolutions.setAdvanceAllInterest(calSumBigDecimal(loanSolutions.getAdvanceAllInterest(), n)); loanSolutions.setAdvanceAllInterest(calSumBigDecimal(loanSolutions.getAdvanceAllInterest(), n));
loanSolutions.setC_repayMoney(calSumBigDecimal(loanSolutions.getC_repayMoney(), n)); loanSolutions.setC_repayMoney(calSumBigDecimal(loanSolutions.getC_repayMoney(), n));
loanSolutions.setProphasePayMoney(calSumBigDecimal(loanSolutions.getProphasePayMoney(), n)); loanSolutions.setProphasePayMoney(calSumBigDecimal(loanSolutions.getProphasePayMoney(), n));
loanSolutions.setResidualsPayMoney(calSumBigDecimal(loanSolutions.getResidualsPayMoney(), n)); loanSolutions.setResidualsPayMoney(calSumBigDecimal(loanSolutions.getResidualsPayMoney(), n));*/
save(loanSolutions); save(loanSolutions);
// 挂车(总) // 挂车(总)
AppLoanSolutionTrailerVo solutionTrailerVo = loanSolutionTrailerService.getAppTrailerVoByOrderSid(orderSid).getData(); AppLoanSolutionTrailerVo solutionTrailerVo = loanSolutionTrailerService.getAppTrailerVoByOrderSid(orderSid).getData();
@ -421,7 +419,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
BeanUtil.copyProperties(solutionTrailerVo, loanSolutionsTrailer); BeanUtil.copyProperties(solutionTrailerVo, loanSolutionsTrailer);
loanSolutionsTrailer.setSid(UUID.randomUUID().toString()); loanSolutionsTrailer.setSid(UUID.randomUUID().toString());
loanSolutionsTrailer.setSolutionsSid(loanSolutions.getSid()); loanSolutionsTrailer.setSolutionsSid(loanSolutions.getSid());
loanSolutionsTrailer.setCountTicket(calSumBigDecimal(loanSolutionsTrailer.getCountTicket(), n)); /*loanSolutionsTrailer.setCountTicket(calSumBigDecimal(loanSolutionsTrailer.getCountTicket(), n));*/
loanSolutionsTrailerService.save(loanSolutionsTrailer); loanSolutionsTrailerService.save(loanSolutionsTrailer);
// 上装（总） // 上装（总）
List<AppTopListVo> topList = loanSolutionTopService.getAppTopListByOrderSid(orderSid).getData(); List<AppTopListVo> topList = loanSolutionTopService.getAppTopListByOrderSid(orderSid).getData();
@ -431,7 +429,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
BeanUtil.copyProperties(topVo, top); BeanUtil.copyProperties(topVo, top);
top.setSid(UUID.randomUUID().toString()); top.setSid(UUID.randomUUID().toString());
top.setSolutionsSid(loanSolutions.getSid()); top.setSolutionsSid(loanSolutions.getSid());
top.setWithPrice(calSumBigDecimal(top.getWithPrice(), n)); /* top.setWithPrice(calSumBigDecimal(top.getWithPrice(), n));*/
loanSolutionsTopService.save(top); loanSolutionsTopService.save(top);
} }
} }
@ -441,7 +439,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
BeanUtil.copyProperties(detailVo, details); BeanUtil.copyProperties(detailVo, details);
details.setSid(UUID.randomUUID().toString()); details.setSid(UUID.randomUUID().toString());
details.setSolutionsSid(loanSolutions.getSid()); details.setSolutionsSid(loanSolutions.getSid());
if(details.getReceLoanMargin()!=null){ /* if(details.getReceLoanMargin()!=null){
details.setReceLoanMargin(calSumBigDecimal(details.getReceLoanMargin(), n)); details.setReceLoanMargin(calSumBigDecimal(details.getReceLoanMargin(), n));
} }
if(details.getReceCarDownPay()!=null){ if(details.getReceCarDownPay()!=null){
@ -509,12 +507,12 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
} }
if(details.getDepositReceived()!=null){ if(details.getDepositReceived()!=null){
details.setDepositReceived(calSumBigDecimal(details.getDepositReceived(), n)); details.setDepositReceived(calSumBigDecimal(details.getDepositReceived(), n));
} }*/
String str = ""; String str = "";
if(StringUtils.isNotBlank(details.getReceInciExplain())) { if(StringUtils.isNotBlank(details.getReceInciExplain())) {
for (int c = 0; n > c; c++){ /* for (int c = 0; n > c; c++){
str = str + details.getReceInciExplain() + ";"; str = str + details.getReceInciExplain() + ";";
} }*/
details.setReceInciExplain(str); details.setReceInciExplain(str);
} }
loanSolutionsDetailService.save(details); loanSolutionsDetailService.save(details);

16
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutiontop/LoanSolutionTopService.java
View File

@ -3,7 +3,6 @@ package com.yxt.anrui.riskcenter.biz.loansolutiontop;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; 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.loanloadprice.LoanLoadpriceVo;
import com.yxt.anrui.riskcenter.api.loansolution.LoanSolution; import com.yxt.anrui.riskcenter.api.loansolution.LoanSolution;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
@ -53,8 +52,8 @@ public class LoanSolutionTopService extends MybatisBaseService<LoanSolutionTopMa
private LoanSolutionsService loanSolutionsService; private LoanSolutionsService loanSolutionsService;
@Autowired @Autowired
private LoanSolutionsTopService loanSolutionsTopService; private LoanSolutionsTopService loanSolutionsTopService;
@Autowired /* @Autowired
private BusOrderModelFeign busOrderModelFeign; private BusOrderModelFeign busOrderModelFeign;*/
private QueryWrapper<LoanSolutionTop> createQueryWrapper(LoanSolutionTopQuery query) { private QueryWrapper<LoanSolutionTop> createQueryWrapper(LoanSolutionTopQuery query) {
QueryWrapper<LoanSolutionTop> qw = new QueryWrapper<>(); QueryWrapper<LoanSolutionTop> qw = new QueryWrapper<>();
@ -173,10 +172,10 @@ public class LoanSolutionTopService extends MybatisBaseService<LoanSolutionTopMa
dto.fillEntity(tops); dto.fillEntity(tops);
tops.setSid(loanSolutionTop.getSid()); tops.setSid(loanSolutionTop.getSid());
tops.setSolutionsSid(loanSolutionsVo.getSid()); tops.setSolutionsSid(loanSolutionsVo.getSid());
BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData(); /* BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData();
if (StringUtils.isNotBlank(dto.getWithPrice())) { if (StringUtils.isNotBlank(dto.getWithPrice())) {
tops.setWithPrice(StringUtils.toBigDecimal(dto.getWithPrice()).multiply(num)); tops.setWithPrice(StringUtils.toBigDecimal(dto.getWithPrice()).multiply(num));
} }*/
boolean saveBoolean = loanSolutionsTopService.save(tops); boolean saveBoolean = loanSolutionsTopService.save(tops);
if (saveBoolean) { if (saveBoolean) {
return new ResultBean().success().setMsg("保存成功").setData(loanSolutionTop.getSid()); return new ResultBean().success().setMsg("保存成功").setData(loanSolutionTop.getSid());
@ -184,7 +183,6 @@ public class LoanSolutionTopService extends MybatisBaseService<LoanSolutionTopMa
return new ResultBean().fail().setMsg("保存失败"); return new ResultBean().fail().setMsg("保存失败");
} }
} else { // 修改 } else { // 修改
// LoanSolutionTop loanSolutionTop = fetchBySid(dto.getSid());
String remarks = ""; String remarks = "";
if (StringUtils.isNotBlank(dto.getOutsideSize())) remarks += dto.getOutsideSize(); if (StringUtils.isNotBlank(dto.getOutsideSize())) remarks += dto.getOutsideSize();
if (StringUtils.isNotBlank(dto.getPlateMaterial())) remarks += " " + dto.getPlateMaterial(); if (StringUtils.isNotBlank(dto.getPlateMaterial())) remarks += " " + dto.getPlateMaterial();
@ -193,9 +191,9 @@ public class LoanSolutionTopService extends MybatisBaseService<LoanSolutionTopMa
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
Map<String, Object> mapSum = new HashMap<>(); Map<String, Object> mapSum = new HashMap<>();
BigDecimal withPrice = StringUtils.toBigDecimal(dto.getWithPrice()); BigDecimal withPrice = StringUtils.toBigDecimal(dto.getWithPrice());
BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData(); /* BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData();
map.put("withPrice", withPrice); 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()); map.put("withName", dto.getWithName());
mapSum.put("withName", dto.getWithName()); mapSum.put("withName", dto.getWithName());
map.put("changeManufacturer", dto.getChangeManufacturer()); map.put("changeManufacturer", dto.getChangeManufacturer());
@ -209,11 +207,9 @@ public class LoanSolutionTopService extends MybatisBaseService<LoanSolutionTopMa
map.put("remarks", remarks); map.put("remarks", remarks);
mapSum.put("remarks", remarks); mapSum.put("remarks", remarks);
map.put("sid", dto.getSid()); map.put("sid", dto.getSid());
// updateById(loanSolutionTop);
baseMapper.updateAppLoanSolutionTopByMap(map); baseMapper.updateAppLoanSolutionTopByMap(map);
// 总上装 // 总上装
mapSum.put("sid", dto.getSid()); mapSum.put("sid", dto.getSid());
// boolean updateBoolean = loanSolutionsTopService.updateById(tops);
int i = loanSolutionsTopService.updateAppLoanSolutionTopByMap(mapSum); int i = loanSolutionsTopService.updateAppLoanSolutionTopByMap(mapSum);
if (i == 1) { if (i == 1) {
return new ResultBean().success().setMsg("修改成功").setData(dto.getSid()); return new ResultBean().success().setMsg("修改成功").setData(dto.getSid());

14
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutiontrailer/LoanSolutionTrailerService.java
View File

@ -3,7 +3,6 @@ package com.yxt.anrui.riskcenter.biz.loansolutiontrailer;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; 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.loanloadprice.LoanLoadpriceVo;
import com.yxt.anrui.riskcenter.api.loansolution.LoanSolution; import com.yxt.anrui.riskcenter.api.loansolution.LoanSolution;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
@ -53,8 +52,8 @@ public class LoanSolutionTrailerService extends MybatisBaseService<LoanSolutionT
private LoanSolutionsService loanSolutionsService; private LoanSolutionsService loanSolutionsService;
@Autowired @Autowired
private LoanSolutionsTrailerService loanSolutionsTrailerService; private LoanSolutionsTrailerService loanSolutionsTrailerService;
@Autowired /* @Autowired
private BusOrderModelFeign busOrderModelFeign; private BusOrderModelFeign busOrderModelFeign;*/
private QueryWrapper<LoanSolutionTrailer> createQueryWrapper(LoanSolutionTrailerQuery query) { private QueryWrapper<LoanSolutionTrailer> createQueryWrapper(LoanSolutionTrailerQuery query) {
QueryWrapper<LoanSolutionTrailer> qw = new QueryWrapper<>(); QueryWrapper<LoanSolutionTrailer> qw = new QueryWrapper<>();
@ -147,10 +146,10 @@ public class LoanSolutionTrailerService extends MybatisBaseService<LoanSolutionT
dto.fillEntity(trailers); dto.fillEntity(trailers);
trailers.setSid(UUID.randomUUID().toString()); trailers.setSid(UUID.randomUUID().toString());
trailers.setSolutionsSid(loanSolutionsVo.getSid()); trailers.setSolutionsSid(loanSolutionsVo.getSid());
BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData(); /*BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData();
if (StringUtils.isNotBlank(dto.getCountTicket())) { if (StringUtils.isNotBlank(dto.getCountTicket())) {
trailers.setCountTicket(StringUtils.toBigDecimal(dto.getCountTicket()).multiply(num)); trailers.setCountTicket(StringUtils.toBigDecimal(dto.getCountTicket()).multiply(num));
} }*/
boolean saveBoolean = loanSolutionsTrailerService.save(trailers); boolean saveBoolean = loanSolutionsTrailerService.save(trailers);
if (saveBoolean) { if (saveBoolean) {
return new ResultBean().success().setMsg("保存成功").setData(trailer.getSid()); return new ResultBean().success().setMsg("保存成功").setData(trailer.getSid());
@ -178,10 +177,9 @@ public class LoanSolutionTrailerService extends MybatisBaseService<LoanSolutionT
LoanLoadpriceVo loanLoadpriceVo = loanLoadpriceService.selectByOrderSid(dto.getOrderSid()); LoanLoadpriceVo loanLoadpriceVo = loanLoadpriceService.selectByOrderSid(dto.getOrderSid());
LoanSolutions loanSolutionsVo = loanSolutionsService.selectByLoanPriceSid(loanLoadpriceVo.getSid()); LoanSolutions loanSolutionsVo = loanSolutionsService.selectByLoanPriceSid(loanLoadpriceVo.getSid());
AppLoanSolutionsTrailerVo trailersVo = loanSolutionsTrailerService.getAppTrailerVoBySolutionsSid(loanSolutionsVo.getSid()); AppLoanSolutionsTrailerVo trailersVo = loanSolutionsTrailerService.getAppTrailerVoBySolutionsSid(loanSolutionsVo.getSid());
BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData(); /* BigDecimal num = busOrderModelFeign.getModelQuantityByOrderSid(dto.getOrderSid()).getData();
map.put("sid", trailersVo.getSid()); map.put("sid", trailersVo.getSid());
map.put("countTicket", countTicket == null ? null : countTicket.multiply(num)); map.put("countTicket", countTicket == null ? null : countTicket.multiply(num));*/
// boolean updateBoolean = loanSolutionsTrailerService.updateById(trailers);
int i = loanSolutionsTrailerService.updateAppLoanSolutionTrailerByMap(map); int i = loanSolutionsTrailerService.updateAppLoanSolutionTrailerByMap(map);
if (i == 1) { if (i == 1) {
return new ResultBean().success().setMsg("修改成功").setData(solutionTrailer.getSid()); return new ResultBean().success().setMsg("修改成功").setData(solutionTrailer.getSid());

Write Preview
Loading…
Cancel
Save