|
|
|
@ -1946,6 +1946,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
if ("0".equals(affiliatedType)) { |
|
|
|
baseMapper.updateCompanySidBySid(dto.getSid()); |
|
|
|
} |
|
|
|
//如果选择的为自有资金的，需要删除金融方案
|
|
|
|
if ("1".equals(busSalesOrder.getFinancePlan())) { |
|
|
|
//删除和该销售订单相关的金融方案
|
|
|
|
ResultBean deleteResultBean = loanSolutionsFeign.deleteByOrderSid(busSalesOrder.getSid()); |
|
|
|
} |
|
|
|
sid = busSalesOrder.getSid(); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -3111,20 +3116,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
} |
|
|
|
BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrderMakeupService.detailsss(sid); |
|
|
|
String topMessage = ""; |
|
|
|
//外廓尺寸
|
|
|
|
/* String sizeMessage = ""; |
|
|
|
if (StringUtils.isNotBlank(busSalesOrderMakeup.getSizeLong())) { |
|
|
|
sizeMessage = busSalesOrderMakeup.getSizeLong(); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(busSalesOrderMakeup.getSizeWide())) { |
|
|
|
sizeMessage = sizeMessage + "*" + busSalesOrderMakeup.getSizeWide(); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(busSalesOrderMakeup.getSizeHigh())) { |
|
|
|
sizeMessage = sizeMessage + "*" + busSalesOrderMakeup.getSizeHigh() + "mm"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(sizeMessage)) { |
|
|
|
topMessage = topMessage + " " + sizeMessage; |
|
|
|
}*/ |
|
|
|
//颜色
|
|
|
|
if (StringUtils.isNotBlank(busSalesOrderMakeup.getColor())) { |
|
|
|
topMessage = topMessage + busSalesOrderMakeup.getColor(); |
|
|
|
@ -3278,11 +3269,405 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
depositInfo.setPayDepositDays("/"); |
|
|
|
} |
|
|
|
vo.setDepositInfo(depositInfo); |
|
|
|
|
|
|
|
} |
|
|
|
/****************************金融方案***************************************/ |
|
|
|
vo = selectSolution(vo, sid); |
|
|
|
return rb.success().setData(vo); |
|
|
|
} |
|
|
|
|
|
|
|
public AppOrderDetailsVo selectSolution(AppOrderDetailsVo appOrderDetailsVo, String sid) { |
|
|
|
ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailss(sid); |
|
|
|
if (solutionsDetailsVoResultBean.getData() != null) { |
|
|
|
SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData(); |
|
|
|
StringBuilder loanSolutions = new StringBuilder(); |
|
|
|
StringBuilder detailLoanSolutions = new StringBuilder(); |
|
|
|
StringBuilder otherLoanSolutions = new StringBuilder(); |
|
|
|
StringBuilder allLoanSolutions = new StringBuilder(); |
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())) { |
|
|
|
loanSolutions = loanSolutions.append("三方金融类型：" + solutionsDetailsVo.getType()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey()) && "02".equals(solutionsDetailsVo.getTypeKey())) { |
|
|
|
//厂家贴息
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getFactoryDiscount())) { |
|
|
|
loanSolutions = loanSolutions.append("、").append("厂家贴息：").append(solutionsDetailsVo.getFactoryDiscount()); |
|
|
|
} else { |
|
|
|
loanSolutions = loanSolutions.append("、").append("厂家贴息：").append("-"); |
|
|
|
} |
|
|
|
//厂家贴息用途
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getFactoryDiscountUse())) { |
|
|
|
loanSolutions = loanSolutions.append("、").append("厂家贴息用途：").append(solutionsDetailsVo.getFactoryDiscountUse()); |
|
|
|
} else { |
|
|
|
loanSolutions = loanSolutions.append("、").append("厂家贴息用途：").append("-"); |
|
|
|
} |
|
|
|
//===========应收明细
|
|
|
|
//服务费
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getServiceAmount())) { |
|
|
|
detailLoanSolutions = detailLoanSolutions.append("服务费：").append(solutionsDetailsVo.getServiceAmount()); |
|
|
|
} else { |
|
|
|
detailLoanSolutions = detailLoanSolutions.append("服务费：").append("-"); |
|
|
|
} |
|
|
|
} else { |
|
|
|
//是否打包
|
|
|
|
loanSolutions = loanSolutions.append("、").append("是否打包："); |
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getIsPack())) { |
|
|
|
if ("1".equals(solutionsDetailsVo.getIsPack())) { |
|
|
|
loanSolutions = loanSolutions.append("是"); |
|
|
|
} else { |
|
|
|
loanSolutions = loanSolutions.append("否"); |
|
|
|
} |
|
|
|
} else { |
|
|
|
loanSolutions = loanSolutions.append("-"); |
|
|
|
} |
|
|
|
//产品政策名称
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getPolicyName())) { |
|
|
|
loanSolutions = loanSolutions.append("、").append("产品政策：").append(solutionsDetailsVo.getPolicyName()); |
|
|
|
} else { |
|
|
|
loanSolutions = loanSolutions.append("、").append("产品政策：").append("-"); |
|
|
|
} |
|
|
|
//主车发票价
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getMainVehicleAmount())) { |
|
|
|
loanSolutions = loanSolutions.append("、").append("主车发票价：").append(solutionsDetailsVo.getMainVehicleAmount()); |
|
|
|
} else { |
|
|
|
loanSolutions = loanSolutions.append("、").append("主车发票价：").append("-"); |
|
|
|
} |
|
|
|
//融资票据
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getAccessoriesAmount())) { |
|
|
|
loanSolutions = loanSolutions.append("、").append("融资票据：").append(solutionsDetailsVo.getAccessoriesAmount()); |
|
|
|
|
|
|
|
} else { |
|
|
|
loanSolutions = loanSolutions.append("、").append("融资票据：").append("-"); |
|
|
|
} |
|
|
|
//挂车
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getTrailerAmount())) { |
|
|
|
loanSolutions = loanSolutions.append("、").append("挂车：").append(solutionsDetailsVo.getTrailerAmount()); |
|
|
|
|
|
|
|
} else { |
|
|
|
loanSolutions = loanSolutions.append("、").append("挂车：").append("-"); |
|
|
|
} |
|
|
|
//保险
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getPremium())) { |
|
|
|
loanSolutions = loanSolutions.append("、").append("保险：").append(solutionsDetailsVo.getPremium()); |
|
|
|
|
|
|
|
} else { |
|
|
|
loanSolutions = loanSolutions.append("、").append("保险：").append("-"); |
|
|
|
} |
|
|
|
//购置税
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getPurchaseTax())) { |
|
|
|
loanSolutions = loanSolutions.append("、").append("购置税：").append(solutionsDetailsVo.getPurchaseTax()); |
|
|
|
|
|
|
|
} else { |
|
|
|
loanSolutions = loanSolutions.append("、").append("购置税：").append("-"); |
|
|
|
} |
|
|
|
//车损上浮
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getVehDamageFloat())) { |
|
|
|
loanSolutions = loanSolutions.append("、").append("车损上浮：").append(solutionsDetailsVo.getVehDamageFloat()); |
|
|
|
|
|
|
|
} else { |
|
|
|
loanSolutions = loanSolutions.append("、").append("车损上浮：").append("-"); |
|
|
|
} |
|
|
|
//融资项目总额
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getLoanTotal())) { |
|
|
|
loanSolutions = loanSolutions.append("、").append("融资项目总额：").append(solutionsDetailsVo.getLoanTotal()); |
|
|
|
|
|
|
|
} else { |
|
|
|
loanSolutions = loanSolutions.append("、").append("融资项目总额：").append("-"); |
|
|
|
} |
|
|
|
//首付比例
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getDownPayRatio())) { |
|
|
|
loanSolutions = loanSolutions.append("、").append("首付比例：").append(solutionsDetailsVo.getDownPayRatio()); |
|
|
|
|
|
|
|
} else { |
|
|
|
loanSolutions = loanSolutions.append("、").append("首付比例：").append("-"); |
|
|
|
} |
|
|
|
//首付金额
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getDownPayAmount())) { |
|
|
|
loanSolutions = loanSolutions.append("、").append("首付金额：").append(solutionsDetailsVo.getDownPayAmount()); |
|
|
|
|
|
|
|
} else { |
|
|
|
loanSolutions = loanSolutions.append("、").append("首付金额：").append("-"); |
|
|
|
} |
|
|
|
//产品贷款金额
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getLoanAmount())) { |
|
|
|
loanSolutions = loanSolutions.append("、").append("产品贷款金额：").append(solutionsDetailsVo.getLoanAmount()); |
|
|
|
|
|
|
|
} else { |
|
|
|
loanSolutions = loanSolutions.append("、").append("产品贷款金额：").append("-"); |
|
|
|
} |
|
|
|
//产品期数
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getLoanPeriod())) { |
|
|
|
loanSolutions = loanSolutions.append("、").append("产品期数：").append(solutionsDetailsVo.getLoanPeriod()); |
|
|
|
|
|
|
|
} else { |
|
|
|
loanSolutions = loanSolutions.append("、").append("产品期数：").append("-"); |
|
|
|
} |
|
|
|
//贷款保证金比例
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getBondRatio())) { |
|
|
|
loanSolutions = loanSolutions.append("、").append("贷款保证金比例：").append(solutionsDetailsVo.getBondRatio()); |
|
|
|
|
|
|
|
} else { |
|
|
|
loanSolutions = loanSolutions.append("、").append("贷款保证金比例：").append("-"); |
|
|
|
} |
|
|
|
//贷款保证金
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getBondAmount())) { |
|
|
|
loanSolutions = loanSolutions.append("、").append("贷款保证金：").append(solutionsDetailsVo.getBondAmount()); |
|
|
|
|
|
|
|
} else { |
|
|
|
loanSolutions = loanSolutions.append("、").append("贷款保证金：").append("-"); |
|
|
|
} |
|
|
|
//厂家贴息
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getFactoryDiscount())) { |
|
|
|
loanSolutions = loanSolutions.append("、").append("厂家贴息：").append(solutionsDetailsVo.getFactoryDiscount()); |
|
|
|
|
|
|
|
} else { |
|
|
|
loanSolutions = loanSolutions.append("、").append("厂家贴息：").append("-"); |
|
|
|
} |
|
|
|
//年利率
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getPolicyYearRatio())) { |
|
|
|
loanSolutions = loanSolutions.append("、").append("年利率：").append(solutionsDetailsVo.getPolicyYearRatio()); |
|
|
|
|
|
|
|
} else { |
|
|
|
loanSolutions = loanSolutions.append("、").append("年利率：").append("-"); |
|
|
|
} |
|
|
|
//月还金额
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getLoanPayMoney())) { |
|
|
|
loanSolutions = loanSolutions.append("、").append("月还金额：").append(solutionsDetailsVo.getLoanPayMoney()); |
|
|
|
|
|
|
|
} else { |
|
|
|
loanSolutions = loanSolutions.append("、").append("月还金额：").append("-"); |
|
|
|
} |
|
|
|
//利息总额
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getLoanInterest())) { |
|
|
|
loanSolutions = loanSolutions.append("、").append("利息总额：").append(solutionsDetailsVo.getLoanInterest()); |
|
|
|
|
|
|
|
} else { |
|
|
|
loanSolutions = loanSolutions.append("、").append("利息总额：").append("-"); |
|
|
|
} |
|
|
|
//厂家贴息用途
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getFactoryDiscountUse())) { |
|
|
|
loanSolutions = loanSolutions.append("、").append("厂家贴息用途：").append(solutionsDetailsVo.getFactoryDiscountUse()); |
|
|
|
|
|
|
|
} else { |
|
|
|
loanSolutions = loanSolutions.append("、").append("厂家贴息用途：").append("-"); |
|
|
|
} |
|
|
|
//=========================其它融
|
|
|
|
if (solutionsDetailsVo.isOtherPolicyState()) { |
|
|
|
//其它融名称
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getOtherPolicyName())) { |
|
|
|
otherLoanSolutions = loanSolutions.append("其它融名称：").append(solutionsDetailsVo.getOtherPolicyName()); |
|
|
|
|
|
|
|
} else { |
|
|
|
otherLoanSolutions = loanSolutions.append("其它融名称：").append("-"); |
|
|
|
} |
|
|
|
//贷款金额
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getOtherPolicyAmount())) { |
|
|
|
otherLoanSolutions = loanSolutions.append("、").append("贷款金额：").append(solutionsDetailsVo.getOtherPolicyAmount()); |
|
|
|
|
|
|
|
} else { |
|
|
|
otherLoanSolutions = loanSolutions.append("、").append("贷款金额：").append("-"); |
|
|
|
} |
|
|
|
//期数
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getOtherPolicyPeriod())) { |
|
|
|
otherLoanSolutions = loanSolutions.append("、").append("期数：").append(solutionsDetailsVo.getOtherPolicyPeriod()); |
|
|
|
|
|
|
|
} else { |
|
|
|
otherLoanSolutions = loanSolutions.append("、").append("期数：").append("-"); |
|
|
|
} |
|
|
|
//月还金额
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getOtherPolicyMonthlyRepay())) { |
|
|
|
otherLoanSolutions = loanSolutions.append("、").append("月还金额：").append(solutionsDetailsVo.getOtherPolicyMonthlyRepay()); |
|
|
|
|
|
|
|
} else { |
|
|
|
otherLoanSolutions = loanSolutions.append("、").append("月还金额：").append("-"); |
|
|
|
} |
|
|
|
//利息总额
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getOtherPolicyYearRatio())) { |
|
|
|
otherLoanSolutions = loanSolutions.append("、").append("利息总额：").append(solutionsDetailsVo.getOtherPolicyYearRatio()); |
|
|
|
} else { |
|
|
|
otherLoanSolutions = loanSolutions.append("、").append("利息总额：").append("-"); |
|
|
|
} |
|
|
|
} else { |
|
|
|
otherLoanSolutions = otherLoanSolutions.append("-"); |
|
|
|
} |
|
|
|
|
|
|
|
//==========================方案汇总
|
|
|
|
//融资首付
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getLoanDownPay())) { |
|
|
|
allLoanSolutions = loanSolutions.append("融资首付：").append(solutionsDetailsVo.getLoanDownPay()); |
|
|
|
|
|
|
|
} else { |
|
|
|
allLoanSolutions = loanSolutions.append("融资首付：").append("-"); |
|
|
|
} |
|
|
|
//总贷款金额
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getLoanAmountTotal())) { |
|
|
|
allLoanSolutions = loanSolutions.append("、").append("总贷款金额：").append(solutionsDetailsVo.getLoanAmountTotal()); |
|
|
|
|
|
|
|
} else { |
|
|
|
allLoanSolutions = loanSolutions.append("、").append("总贷款金额：").append("-"); |
|
|
|
} |
|
|
|
//期数
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getPeriod())) { |
|
|
|
allLoanSolutions = loanSolutions.append("、").append("期数：").append(solutionsDetailsVo.getPeriod()); |
|
|
|
|
|
|
|
} else { |
|
|
|
allLoanSolutions = loanSolutions.append("、").append("期数：").append("-"); |
|
|
|
} |
|
|
|
//月还金额
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getMonthlyRepay())) { |
|
|
|
allLoanSolutions = loanSolutions.append("、").append("月还金额：").append(solutionsDetailsVo.getMonthlyRepay()); |
|
|
|
} else { |
|
|
|
allLoanSolutions = loanSolutions.append("、").append("月还金额：").append("-"); |
|
|
|
} |
|
|
|
//利息总额
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getInterest())) { |
|
|
|
allLoanSolutions = loanSolutions.append("、").append("利息总额：").append(solutionsDetailsVo.getInterest()); |
|
|
|
} else { |
|
|
|
allLoanSolutions = loanSolutions.append("、").append("利息总额：").append("-"); |
|
|
|
} |
|
|
|
//预计首期还款日
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getReturnTime())) { |
|
|
|
allLoanSolutions = loanSolutions.append("、").append("预计首期还款日：").append(solutionsDetailsVo.getReturnTime()); |
|
|
|
} else { |
|
|
|
allLoanSolutions = loanSolutions.append("、").append("预计首期还款日：").append("-"); |
|
|
|
} |
|
|
|
//=========================应收明细
|
|
|
|
//融资首付
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getDownPayAmounts())) { |
|
|
|
detailLoanSolutions = loanSolutions.append("融资首付：").append(solutionsDetailsVo.getDownPayAmounts()); |
|
|
|
} else { |
|
|
|
detailLoanSolutions = loanSolutions.append("融资首付：").append("-"); |
|
|
|
} |
|
|
|
//贷款保证金
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getBondAmounts())) { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("贷款保证金：").append(solutionsDetailsVo.getBondAmounts()); |
|
|
|
} else { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("贷款保证金：").append("-"); |
|
|
|
} |
|
|
|
//保险保证金
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getDepositPremium())) { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("保险保证金：").append(solutionsDetailsVo.getDepositPremium()); |
|
|
|
} else { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("保险保证金：").append("-"); |
|
|
|
} |
|
|
|
//落户保证金
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getDepositSettle())) { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("落户保证金：").append(solutionsDetailsVo.getDepositSettle()); |
|
|
|
} else { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("落户保证金：").append("-"); |
|
|
|
} |
|
|
|
//服务费
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getServiceAmount())) { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("服务费：").append(solutionsDetailsVo.getServiceAmount()); |
|
|
|
} else { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("服务费：").append("-"); |
|
|
|
} |
|
|
|
//代收意外险
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getProxyAccidentPremium())) { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("代收意外险：").append(solutionsDetailsVo.getProxyAccidentPremium()); |
|
|
|
} else { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("代收意外险：").append("-"); |
|
|
|
} |
|
|
|
//上牌费
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getRegisterAmount())) { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("运管费：").append(solutionsDetailsVo.getRegisterAmount()); |
|
|
|
} else { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("运管费：").append("-"); |
|
|
|
} |
|
|
|
//运管费
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getOperationAmount())) { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("产品政策：").append(solutionsDetailsVo.getPolicyName()); |
|
|
|
} else { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("产品政策：").append("-"); |
|
|
|
} |
|
|
|
//补车价
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getVehOtherPrice())) { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("补车价：").append(solutionsDetailsVo.getVehOtherPrice()); |
|
|
|
} else { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("补车价：").append("-"); |
|
|
|
} |
|
|
|
//其它费用
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getOtherAmount())) { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("其它费用：").append(solutionsDetailsVo.getOtherAmount()); |
|
|
|
} else { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("其它费用：").append("-"); |
|
|
|
} |
|
|
|
//其它费用说明
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getOtherAmountRemark())) { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("其它费用说明：").append(solutionsDetailsVo.getOtherAmountRemark()); |
|
|
|
} else { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("其它费用说明：").append("-"); |
|
|
|
} |
|
|
|
//办理方式选择
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getDealWay())) { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("办理方式选择：").append(solutionsDetailsVo.getDealWay()); |
|
|
|
} else { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("办理方式选择：").append("-"); |
|
|
|
} |
|
|
|
//代收首年保险费
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getProxyPremium())) { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("代收首年保险费：").append(solutionsDetailsVo.getProxyPremium()); |
|
|
|
} else { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("代收首年保险费：").append("-"); |
|
|
|
} |
|
|
|
//代收购置税
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getProxyPurchasetax())) { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("代收购置税：").append(solutionsDetailsVo.getProxyPurchasetax()); |
|
|
|
} else { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("代收购置税：").append("-"); |
|
|
|
} |
|
|
|
//应收合计
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getReceivableTotal())) { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("应收合计：").append(solutionsDetailsVo.getReceivableTotal()); |
|
|
|
} else { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("应收合计：").append("-"); |
|
|
|
} |
|
|
|
//抵顶费用合计
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getOffsetTotal())) { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("抵顶费用合计：").append(solutionsDetailsVo.getOffsetTotal()); |
|
|
|
} else { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("抵顶费用合计：").append("-"); |
|
|
|
} |
|
|
|
//抵顶首年保险费
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getOffsetPremium())) { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("抵顶首年保险费：").append(solutionsDetailsVo.getOffsetPremium()); |
|
|
|
} else { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("抵顶首年保险费：").append("-"); |
|
|
|
} |
|
|
|
//抵顶购置税
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getOffsetPurchasetax())) { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("抵顶购置税：").append(solutionsDetailsVo.getOffsetPurchasetax()); |
|
|
|
} else { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("抵顶购置税：").append("-"); |
|
|
|
} |
|
|
|
//实收合计
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getRealTotal())) { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("实收合计：").append(solutionsDetailsVo.getRealTotal()); |
|
|
|
} else { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("实收合计：").append("-"); |
|
|
|
} |
|
|
|
//车辆总价
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getVehTotalPrice())) { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("车辆总价：").append(solutionsDetailsVo.getVehTotalPrice()); |
|
|
|
} else { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("车辆总价：").append("-"); |
|
|
|
} |
|
|
|
//名义留购价
|
|
|
|
if (StringUtils.isNotBlank(solutionsDetailsVo.getNominalPrice())) { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("名义留购价：").append(solutionsDetailsVo.getNominalPrice()); |
|
|
|
} else { |
|
|
|
detailLoanSolutions = loanSolutions.append("、").append("名义留购价：").append("-"); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
appOrderDetailsVo.setLoanSolutions(loanSolutions.toString()); |
|
|
|
appOrderDetailsVo.setOtherLoanSolutions(otherLoanSolutions.toString()); |
|
|
|
appOrderDetailsVo.setAllLoanSolutions(allLoanSolutions.toString()); |
|
|
|
appOrderDetailsVo.setDetailLoanSolutions(detailLoanSolutions.toString()); |
|
|
|
|
|
|
|
} |
|
|
|
return appOrderDetailsVo; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 移动端提交流程 |
|
|
|
* |
|
|
|
@ -3784,7 +4169,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
CommonContract commonContract = commonContractResultBean.getData(); |
|
|
|
//单台成交价与单台订金相等
|
|
|
|
if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款
|
|
|
|
String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).subtract(new BigDecimal(solutionsDetailsVo.getFactoryDiscount())).toString(); |
|
|
|
String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).subtract(new BigDecimal(solutionsDetailsVo.getFactoryDiscount())).add(new BigDecimal(solutionsDetailsVo.getServiceAmount())).toString(); |
|
|
|
List<VinListsVo> vinList = appOrderModelInfoVo.getVinListsVos(); |
|
|
|
for (int i = 0; i < vinList.size(); i++) { |
|
|
|
UnCollectionDto unCollectionDto = new UnCollectionDto(); |
|
|
|
@ -3987,18 +4372,18 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
//三方金融
|
|
|
|
//查询是外部金融还是自用非担保，如果是外部金融的话，厂家贴息为0时，不走金融审批
|
|
|
|
ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailss(busSalesOrder.getSid()); |
|
|
|
if(solutionsDetailsVoResultBean.getData() != null){ |
|
|
|
if (solutionsDetailsVoResultBean.getData() != null) { |
|
|
|
SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData(); |
|
|
|
if("02".equals(solutionsDetailsVo.getTypeKey())){ |
|
|
|
if(new BigDecimal(BigInteger.ZERO).compareTo(new BigDecimal(solutionsDetailsVo.getFactoryDiscount())) == 0){ |
|
|
|
if ("02".equals(solutionsDetailsVo.getTypeKey())) { |
|
|
|
if (new BigDecimal(BigInteger.ZERO).compareTo(new BigDecimal(solutionsDetailsVo.getFactoryDiscount())) == 0) { |
|
|
|
variables.put(BusSalesOrderConstantUtils.IS_LOAN, true); |
|
|
|
}else{ |
|
|
|
} else { |
|
|
|
variables.put(BusSalesOrderConstantUtils.IS_LOAN, false); |
|
|
|
} |
|
|
|
}else{ |
|
|
|
} else { |
|
|
|
variables.put(BusSalesOrderConstantUtils.IS_LOAN, false); |
|
|
|
} |
|
|
|
}else{ |
|
|
|
} else { |
|
|
|
variables.put(BusSalesOrderConstantUtils.IS_LOAN, false); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -4359,7 +4744,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
String orgSid = sysStaffOrgFeign.getOrgSidByPath(orgSidPath).getData(); |
|
|
|
qw.eq("bo.useOrgSid", orgSid); |
|
|
|
} |
|
|
|
// qw.eq("bo.nodeState", "已办结");
|
|
|
|
String typeState = "getSaleOrdersByOrgPath";//查询接口的标识
|
|
|
|
IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), typeState); |
|
|
|
for (AppBusSalesOrderVo record : pagging.getRecords()) { |
|
|
|
@ -4405,6 +4789,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
if (StringUtils.isBlank(insuranceInfo)) { |
|
|
|
record.setInsuranceInfo("-"); |
|
|
|
} |
|
|
|
if ("已办结".equals(record.getSaleOrderState())) { |
|
|
|
record.setPrintOrderBtn(true); |
|
|
|
} else { |
|
|
|
record.setPrintOrderBtn(false); |
|
|
|
} |
|
|
|
} |
|
|
|
PagerVo<AppBusSalesOrderVo> p = PagerUtil.pageToVo(pagging, null); |
|
|
|
return p; |
|
|
|
|
fanzongzhe
2 years ago