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

Merge remote-tracking branch 'origin/master'

master
yunuo970428 2 years ago
parent
46663bcb43 d03ef45696
commit
730270e0f1
2 changed files with 40 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 47
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  2. 16
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

47
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -160,7 +160,9 @@ import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
import com.yxt.anrui.portal.config.DictCommonType;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionListVo;
import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo;
import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail;
import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetailFeign;
import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicy;
@ -468,11 +470,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (busSalesOrderModelDetailsVo != null) {
//查询现车车辆
if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(entity.getType())) {
if(StringUtils.isNotBlank(entity.getNowCarUnknownVinNum()) && !"0".equals(entity.getNowCarUnknownVinNum())){
if (StringUtils.isNotBlank(entity.getNowCarUnknownVinNum()) && !"0".equals(entity.getNowCarUnknownVinNum())) {
List<String> vinList = new ArrayList<>();
vinList.add("不确定车架号("+entity.getNowCarUnknownVinNum()+")");
vinList.add("不确定车架号(" + entity.getNowCarUnknownVinNum() + ")");
busSalesOrderModelDetailsVo.setVinNo(vinList);
}else{
} else {
List<VinListsVo> vinLists = busSalesOrderVehicleService.selectLists(sid);
//包含采购系统的车架号
List<String> vinList = vinLists.stream().map(v -> v.getVinNo()).collect(Collectors.toList());
@ -523,7 +525,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
String topMessage = "";
BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrderMakeupService.detailsss(sid);
if(busSalesOrderMakeup != null){
if (busSalesOrderMakeup != null) {
//颜色
if (StringUtils.isNotBlank(busSalesOrderMakeup.getColor())) {
topMessage = topMessage + busSalesOrderMakeup.getColor();
@ -602,7 +604,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
if (StringUtils.isNotBlank(totalValue.toString()) && !"0".equals(totalValue.toString())) {
if (busSalesOrderPriceDetailsVo != null) {
BigDecimal discountA = totalValue.divide(new BigDecimal(busSalesOrderPriceDetailsVo.getQuantity()),2, BigDecimal.ROUND_CEILING);
BigDecimal discountA = totalValue.divide(new BigDecimal(busSalesOrderPriceDetailsVo.getQuantity()), 2, BigDecimal.ROUND_CEILING);
bigDecimalSing = bigDecimalSing.add(discountA);
}
}
@ -1934,7 +1936,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
IPage<BusSalesOrder> page = PagerUtil.queryToPage(pq);
IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), "");
for (AppBusSalesOrderVo record : pagging.getRecords()) {
if (StringUtils.isBlank(record.getClosingDate())){
if (StringUtils.isBlank(record.getClosingDate())) {
record.setClosingDate("-");
}
/*************再次发起按钮显示****************/
@ -3421,11 +3423,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//若前端传值的订单类型为0则为现车，为1采购订单，为2排产
//数据库中1为现车，2为采购订单，3为排产
if ("0".equals(modelInfo.getType())) {
if(StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum()) && !"0".equals(busSalesOrder.getNowCarUnknownVinNum())){
if (StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum()) && !"0".equals(busSalesOrder.getNowCarUnknownVinNum())) {
List<String> vinList = new ArrayList<>();
vinList.add("不确定车架号("+busSalesOrder.getNowCarUnknownVinNum()+")");
vinList.add("不确定车架号(" + busSalesOrder.getNowCarUnknownVinNum() + ")");
modelInfo.setVinList(vinList);
}else{
} else {
//查询车架号
List<VinListsVo> vinLists = busSalesOrderVehicleService.selectLists(sid);
//包含采购系统的车架号
@ -3781,7 +3783,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
private AppOrderDetailsVo selectSolutions(AppOrderDetailsVo appOrderDetailsVo, String sid) {
ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(sid);
/* ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(sid);
List<OrderSolutionVo> list = new ArrayList<>();
if (solutionsDetailsVoResultBean.getData() != null) {
SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
@ -4304,7 +4306,16 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
list.add(getValueSpanSize(nominalPriceValue.toString(), 2, 0, false));
}
}
appOrderDetailsVo.setFinanceForms(list);
appOrderDetailsVo.setFinanceForms(list);*/
ResultBean<SolutionssVo> resultBean = loanSolutionsFeign.selectDetails2(sid);
if (resultBean.getData() != null) {
List<SolutionListVo> financeForms = resultBean.getData().getFinanceForms();
if(!financeForms.isEmpty()){
List<OrderSolutionVo> voList = Optional.ofNullable(financeForms).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), OrderSolutionVo.class)).collect(Collectors.toList());
appOrderDetailsVo.setFinanceForms(voList);
}
}
return appOrderDetailsVo;
}
@ -5031,10 +5042,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
commonContract.setCustomerType(appOrderDetailsVo.getCustomerType());
commonContract.setCustomerTypeKey(appOrderDetailsVo.getCustomerKey());
if(StringUtils.isBlank(busSalesOrder.getContractNo())){
if (StringUtils.isBlank(busSalesOrder.getContractNo())) {
commonContractFeign.saveContract(commonContract);
baseMapper.updateContractNoBySid(commonContract.getContractNo(), sid);
}else{
} else {
commonContract.setContractNo(busSalesOrder.getContractNo());
}
ResultBean<List<FinUncollectedReceivablesDetailed>> listResultBean = finUncollectedDetailedFeign.selectByContractNo(commonContract.getContractNo());
@ -6624,7 +6635,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
public ResultBean<AppOrderDetailsVo> getSaleOrderDetailsByContractNo(String contractNo) {
ResultBean<AppOrderDetailsVo> rb = ResultBean.fireFail();
BusSalesOrder busSalesOrder = baseMapper.selectOrderByContractNo(contractNo);
if(busSalesOrder == null){
if (busSalesOrder == null) {
return rb.setMsg("该合同号的订单不存在");
}
ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(busSalesOrder.getSid());
@ -7069,13 +7080,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
busSalesOrdersVo.setBusSalesOrderPrice(busSalesOrderPrice);
BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrderMakeupService.selectBySid(sid);
busSalesOrdersVo.setBusSalesOrderMakeup(busSalesOrderMakeup);
if(busSalesOrderMakeup != null){
if(busSalesOrderMakeup.getTopPrice() != null){
if (busSalesOrderMakeup != null) {
if (busSalesOrderMakeup.getTopPrice() != null) {
busSalesOrdersVo.setSzPrice(busSalesOrderMakeup.getTopPrice().toString());
}
}
if(busSalesOrderModel != null){
if(busSalesOrderModel.getFinalPrice() != null){
if (busSalesOrderModel != null) {
if (busSalesOrderModel.getFinalPrice() != null) {
busSalesOrdersVo.setFinalPrice(busSalesOrderModel.getFinalPrice().toString());
}
}

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

@ -837,16 +837,22 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
loanSolutions.setOtherPolicyState(1);
String loanDownPay = dto.getLoanDownPay();
loanSolutionsOtherpolicy.setLoanDownPay(StringUtils.isNotBlank(loanDownPay) ? new BigDecimal(loanDownPay) : BigDecimal.ZERO);
loanSolutionsOtherpolicy.setSolutionsSid(loanSolutions.getSid());
loanSolutionsOtherpolicyService.insert(loanSolutionsOtherpolicy);
} else {
/*BeanUtil.copyProperties(dto, loanSolutionsOtherpolicy, "sid");
BeanUtil.copyProperties(dto, loanSolutionsOtherpolicy, "sid");
String loanDownPay = dto.getLoanDownPay();
loanSolutionsOtherpolicy.setLoanDownPay(StringUtils.isNotBlank(loanDownPay) ? new BigDecimal(loanDownPay) : BigDecimal.ZERO);*/
loanSolutionsOtherpolicy.setLoanDownPay(StringUtils.isNotBlank(loanDownPay) ? new BigDecimal(loanDownPay) : BigDecimal.ZERO);
loanSolutionsOtherpolicy.setOtherPolicyAmount(BigDecimal.ZERO);
loanSolutionsOtherpolicy.setOtherPolicyInterest(BigDecimal.ZERO);
loanSolutionsOtherpolicy.setOtherPolicyMonthlyRepay(BigDecimal.ZERO);
loanSolutionsOtherpolicy.setOtherPolicyPeriod("");
loanSolutionsOtherpolicy.setOtherPolicyYearRatio("");
loanSolutionsOtherpolicy.setOtherPolicyName("");
loanSolutions.setOtherPolicyState(0);
}
baseMapper.insert(loanSolutions);
loanSolutionsOtherpolicy.setSolutionsSid(loanSolutions.getSid());
loanSolutionsOtherpolicyService.insert(loanSolutionsOtherpolicy);
/***********************应收明细************************************/
LoanSolutionsDetail loanSolutionsDetail = new LoanSolutionsDetail();
BeanUtil.copyProperties(dto, loanSolutionsDetail, "sid");

Write Preview
Loading…
Cancel
Save