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

优化

master
dimengzhe 2 years ago
parent
3f59e39ca5
commit
2328547bd3
2 changed files with 62 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. 41
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  2. 44
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

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

@ -3055,7 +3055,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
}
if ("2".equals(busSalesOrder.getFinancePlan()) || "2".equals(busSalesOrder.getPayTypeKey())) {
/* if ("2".equals(busSalesOrder.getFinancePlan()) || "2".equals(busSalesOrder.getPayTypeKey())) {
//根据销售订单sid查询金融方案
ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(sid);
SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
@ -3075,23 +3075,31 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
} else {
return rb.setMsg("此销售类型下金融方案不能为空");
}
}
/* if ("2".equals(busSalesOrder.getFinancePlan()) || "2".equals(busSalesOrder.getPayTypeKey())) {
}*/
if ("2".equals(busSalesOrder.getFinancePlan()) || "2".equals(busSalesOrder.getPayTypeKey())) {
//根据销售订单sid查询金融方案
ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(sid);
SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
if (solutionsDetailsVo != null) {
if ("2".equals(busSalesOrder.getPayTypeKey())) {
if ("2".equals(busSalesOrder.getPayTypeKey())) {//贷款
//判断实收和单台订金
if (new BigDecimal(solutionsDetailsVo.getRealTotal()).compareTo(busSalesOrderDeposit.getDeposit()) < 0) {
return rb.setMsg("金融方案中实收金额小于单台订金");
}
}else{
if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())) {
if (!"02".equals(solutionsDetailsVo.getTypeKey())) {
//判断实收和单台订金
if (new BigDecimal(solutionsDetailsVo.getRealTotal()).compareTo(busSalesOrderDeposit.getDeposit()) < 0) {
return rb.setMsg("金融方案中实收金额小于单台订金");
}
}
}
}
}else{
return rb.setMsg("此销售类型下金融方案不能为空");
}
}
*/
return rb.success();
}
@ -5238,7 +5246,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
busSalesOrder = fetchBySid(bv.getBusinessSid());
//为三方金融和担保贷款
if ("2".equals(busSalesOrder.getFinancePlan()) || "2".equals(busSalesOrder.getPayTypeKey())) {
/* if ("2".equals(busSalesOrder.getFinancePlan()) || "2".equals(busSalesOrder.getPayTypeKey())) {
//根据销售订单sid查询金融方案
ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(bv.getBusinessSid());
SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
@ -5262,8 +5270,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
} else {
//推送车款
createCarFin(vo, busSalesOrder);
}
/* if ("2".equals(busSalesOrder.getPayTypeKey())) {
}*/
if ("2".equals(busSalesOrder.getPayTypeKey())) {//贷款
ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(bv.getBusinessSid());
SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
if (solutionsDetailsVo != null) {
@ -5274,15 +5282,26 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(bv.getBusinessSid());
SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
if (solutionsDetailsVo != null) {
//外部金融
createFin(vo, busSalesOrder, solutionsDetailsVo);
if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())) {
//推送车款
if ("02".equals(solutionsDetailsVo.getTypeKey())) {
//外部金融
createFin(vo, busSalesOrder, solutionsDetailsVo);
} else {
//自营非担保
createFinTwo(vo, busSalesOrder, solutionsDetailsVo);
}
} else {
//外部金融
createFin(vo, busSalesOrder, solutionsDetailsVo);
}
}
} else {
//推送车款
createCarFin(vo, busSalesOrder);
}
}*/
}
//==============================修改车辆的持久状态组装数据
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()

44
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -1928,7 +1928,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailss(commonContract.getBusSid());
SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
if (solutionsDetailsVo != null) {
if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())) {
/*if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())) {
if ("02".equals(solutionsDetailsVo.getTypeKey())) {
//外部金融：成交价 = 订金+车款+厂家贴息-服务费
leftAll = leftAll.add(singleFinalPrice);
@ -1951,23 +1951,43 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
leftAll = leftAll.add(new BigDecimal(solutionsDetailsVo.getRealTotal()));
}
rightAll = rightAll.add(bigDecimalVinAll);
}
/*if ("2".equals(vo.getPayTypeKey())) {
}*/
if ("2".equals(vo.getPayTypeKey())) {//贷款
if (StringUtils.isNotBlank(solutionsDetailsVo.getRealTotal())) {
leftAll = leftAll.add(new BigDecimal(solutionsDetailsVo.getRealTotal()));
}
rightAll = rightAll.add(bigDecimalVinAll);
} else {
//外部金融：成交价 = 订金+车款+厂家贴息-服务费
leftAll = leftAll.add(singleFinalPrice);
if (StringUtils.isNotBlank(solutionsDetailsVo.getDiscountCar())) {
leftAll = leftAll.subtract(new BigDecimal(solutionsDetailsVo.getDiscountCar()));
}
if (StringUtils.isNotBlank(solutionsDetailsVo.getServiceAmount())) {
leftAll = leftAll.add(new BigDecimal(solutionsDetailsVo.getServiceAmount()));
if(StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())){
//外部金融：成交价 = 订金+车款+厂家贴息-服务费
leftAll = leftAll.add(singleFinalPrice);
if (StringUtils.isNotBlank(solutionsDetailsVo.getDiscountCar())) {
leftAll = leftAll.subtract(new BigDecimal(solutionsDetailsVo.getDiscountCar()));
}
if (StringUtils.isNotBlank(solutionsDetailsVo.getServiceAmount())) {
leftAll = leftAll.add(new BigDecimal(solutionsDetailsVo.getServiceAmount()));
}
rightAll = rightAll.add(bigDecimalVinAll);
}else{
if ("02".equals(solutionsDetailsVo.getTypeKey())) {
//外部金融：成交价 = 订金+车款+厂家贴息-服务费
leftAll = leftAll.add(singleFinalPrice);
if (StringUtils.isNotBlank(solutionsDetailsVo.getFactoryDiscount())) {
leftAll = leftAll.subtract(new BigDecimal(solutionsDetailsVo.getFactoryDiscount()));
}
if (StringUtils.isNotBlank(solutionsDetailsVo.getServiceAmount())) {
leftAll = leftAll.add(new BigDecimal(solutionsDetailsVo.getServiceAmount()));
}
rightAll = rightAll.add(bigDecimalVinAll);
} else {
//自营非担保： 实收订金 = 首付款及费用+订金
if (StringUtils.isNotBlank(solutionsDetailsVo.getRealTotal())) {
leftAll = leftAll.add(new BigDecimal(solutionsDetailsVo.getRealTotal()));
}
rightAll = rightAll.add(bigDecimalVinAll);
}
}
rightAll = rightAll.add(bigDecimalVinAll);
}*/
}
} else {
// 成交价 = 车款+订金
leftAll = leftAll.add(singleFinalPrice);

Write Preview
Loading…
Cancel
Save