Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 4 months ago
parent
commit
64f0f2caa5
  1. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

3
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@ -1186,12 +1186,15 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
if (StringUtils.isNotBlank(saleOrderSid)) { if (StringUtils.isNotBlank(saleOrderSid)) {
SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetailsss(saleOrderSid).getData(); SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetailsss(saleOrderSid).getData();
if (solutionsDetailsVo != null) { if (solutionsDetailsVo != null) {
//三方金融的,在出库时推送单车返利数据,金额为厂家贴息。
if("2".equals(busSalesOrder.getFinancePlan())){
Future future11 = pool.submit(() -> { Future future11 = pool.submit(() -> {
pushVehRebate(busDeliveredApply, detailsList, solutionsDetailsVo.getFactoryDiscount()); pushVehRebate(busDeliveredApply, detailsList, solutionsDetailsVo.getFactoryDiscount());
}); });
} }
} }
} }
}
//推送合格证管理员站内信提醒有待移交的合格证,同时自动更改出库车辆的合格证移交状态为“待移交”。 //推送合格证管理员站内信提醒有待移交的合格证,同时自动更改出库车辆的合格证移交状态为“待移交”。
//ToDo:合格证管理员、随车资料管理员、发票管理员创建并查询该角色的用户推送消息有待移交的资料等等。 //ToDo:合格证管理员、随车资料管理员、发票管理员创建并查询该角色的用户推送消息有待移交的资料等等。
Future future6 = pool.submit(() -> { Future future6 = pool.submit(() -> {

Loading…
Cancel
Save