|
|
|
@ -1505,29 +1505,40 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
try { |
|
|
|
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() |
|
|
|
.setNameFormat("demo-pool-%d").build(); |
|
|
|
ExecutorService pool = new ThreadPoolExecutor(2, 100, |
|
|
|
0L, TimeUnit.MILLISECONDS, |
|
|
|
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); |
|
|
|
Future future1 = pool.submit(() -> { |
|
|
|
//极光推送
|
|
|
|
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); |
|
|
|
MessageFlowVo messageFlowVo = new MessageFlowVo(); |
|
|
|
BeanUtil.copyProperties(ufVo, messageFlowVo); |
|
|
|
messageFlowVo.setProcInsId(procId1); |
|
|
|
messageFlowVo.setProcDefId(busSalesOrder1.getProcDefId()); |
|
|
|
messageFlowableQuery.setUfVo(messageFlowVo); |
|
|
|
messageFlowableQuery.setAppMap((Map<String, Object>) variables.get("app")); |
|
|
|
messageFlowableQuery.setBusinessSid(query.getBusinessSid()); |
|
|
|
messageFlowableQuery.setModuleName("销售订单申请"); |
|
|
|
ResultBean<List<LatestTaskVo>> listResultBean2 = flowTaskFeign.getLatestTasks(procId1); |
|
|
|
String nextNodeUserSids2 = listResultBean2.getData().get(0).getASSIGNEE_(); |
|
|
|
List<String> receiveSidList2 = Arrays.asList(nextNodeUserSids2.split(",")); |
|
|
|
String nextName2 = listResultBean2.getData().get(0).getName_(); |
|
|
|
if ("销售订单申请".equals(nextName2)) { |
|
|
|
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); |
|
|
|
} else { |
|
|
|
messageFlowableQuery.setMsgContent(busSalesOrder.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); |
|
|
|
} |
|
|
|
|
|
|
|
//极光推送
|
|
|
|
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); |
|
|
|
MessageFlowVo messageFlowVo = new MessageFlowVo(); |
|
|
|
BeanUtil.copyProperties(ufVo, messageFlowVo); |
|
|
|
messageFlowVo.setProcInsId(procId1); |
|
|
|
messageFlowVo.setProcDefId(busSalesOrder1.getProcDefId()); |
|
|
|
messageFlowableQuery.setUfVo(messageFlowVo); |
|
|
|
messageFlowableQuery.setAppMap((Map<String, Object>) variables.get("app")); |
|
|
|
messageFlowableQuery.setBusinessSid(query.getBusinessSid()); |
|
|
|
messageFlowableQuery.setModuleName("销售订单申请"); |
|
|
|
ResultBean<List<LatestTaskVo>> listResultBean2 = flowTaskFeign.getLatestTasks(procId1); |
|
|
|
String nextNodeUserSids2 = listResultBean2.getData().get(0).getASSIGNEE_(); |
|
|
|
List<String> receiveSidList2 = Arrays.asList(nextNodeUserSids2.split(",")); |
|
|
|
String nextName2 = listResultBean2.getData().get(0).getName_(); |
|
|
|
if ("销售订单申请".equals(nextName2)) { |
|
|
|
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); |
|
|
|
} else { |
|
|
|
messageFlowableQuery.setMsgContent(busSalesOrder.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); |
|
|
|
} |
|
|
|
messageFlowableQuery.setMsgTitle("销售订单"); |
|
|
|
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery); |
|
|
|
|
|
|
|
messageFlowableQuery.setMsgTitle("销售订单"); |
|
|
|
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery); |
|
|
|
}); |
|
|
|
} catch (Exception e) { |
|
|
|
e.printStackTrace(); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return rb.success(); |
|
|
|
@ -4887,9 +4898,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(finalBusSalesOrderOne.getSid()).getData(); |
|
|
|
if(loanSolutions != null){ |
|
|
|
if(StringUtils.isBlank(loanSolutions.getTypeKey())){ |
|
|
|
baseVehicleStateDto.setFinSourceKey("4"); |
|
|
|
baseVehicleStateDto.setFinSourceKey("4");//担保
|
|
|
|
}else{ |
|
|
|
baseVehicleStateDto.setFinSourceKey("3"); |
|
|
|
baseVehicleStateDto.setFinSourceKey("3");//自营非担保
|
|
|
|
} |
|
|
|
} |
|
|
|
}else{ |
|
|
|
@ -4899,9 +4910,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
if(loanSolutions != null){ |
|
|
|
if(StringUtils.isNotBlank(loanSolutions.getTypeKey())) { |
|
|
|
if("02".equals(loanSolutions.getTypeKey())){ |
|
|
|
baseVehicleStateDto.setFinSourceKey("2"); |
|
|
|
baseVehicleStateDto.setFinSourceKey("2");//三方金融
|
|
|
|
}else{ |
|
|
|
baseVehicleStateDto.setFinSourceKey("3"); |
|
|
|
baseVehicleStateDto.setFinSourceKey("3");//自营非担保
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -5416,7 +5427,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
String contractSid = baseMapper.selectBySid(busSalesOrder.getSid()); |
|
|
|
//单台成交价与单台订金相等
|
|
|
|
if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款
|
|
|
|
String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).subtract(new BigDecimal(solutionsDetailsVo.getDiscountCar())).add(new BigDecimal(solutionsDetailsVo.getServiceAmount())).toString(); |
|
|
|
String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).subtract(StringUtils.isNotBlank(solutionsDetailsVo.getDiscountCar())?new BigDecimal(solutionsDetailsVo.getDiscountCar()):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(); |
|
|
|
@ -7042,7 +7053,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
QueryWrapper<BaseVehicle> qw = new QueryWrapper<>(); |
|
|
|
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); |
|
|
|
//查询已提交申请的欠款提车车辆
|
|
|
|
ResultBean<List<BaseVehicleTempstate>> resultBean = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()); |
|
|
|
/* ResultBean<List<BaseVehicleTempstate>> resultBean = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()); |
|
|
|
resultBean.getData().removeAll(Collections.singleton(null)); |
|
|
|
if (!resultBean.getData().isEmpty()) { |
|
|
|
List<String> stringList = new ArrayList<>(); |
|
|
|
@ -7054,7 +7065,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
if (busSalesOrderVehicle != null) { |
|
|
|
stringList.add(busSalesOrderVehicle.getSid()); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
stringList.removeAll(Collections.singleton(null)); |
|
|
|
if (!stringList.isEmpty()) { |
|
|
|
@ -7066,7 +7076,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
if (!listResultBean.getData().isEmpty()) { |
|
|
|
listResultBean.getData().removeAll(Collections.singleton(null)); |
|
|
|
qw.notIn("bv.sid", listResultBean.getData()); |
|
|
|
} |
|
|
|
}*/ |
|
|
|
List<String> stringList = baseMapper.selectBusinessSid(userSid, useOrgSid, qw); |
|
|
|
stringList.removeAll(Collections.singleton(null)); |
|
|
|
return rb.success().setData(stringList); |
|
|
|
|
fanzongzhe
2 years ago