diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java index 3e7703584..615aa880b 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java @@ -351,12 +351,25 @@ public class TempController extends BaseController { logger.info("手动接口执行订单分账逻辑-param:{}", JSON.toJSONString(dto)); RestApiResponse response = null; try { + // 查询运营商列表 + List merchantIdList = dto.getMerchantIdList(); + if (CollectionUtils.isEmpty(merchantIdList)) { + List pileMerchantInfos = pileMerchantInfoService.selectPileMerchantInfoList(null); + merchantIdList = pileMerchantInfos.stream().map(x -> x.getId() + "").collect(Collectors.toList()); + } String startTime = dto.getStartTime(); String endTime = dto.getEndTime(); // 获取日期区间内所有日期 List dateList = DateUtils.getAllDatesInTheDateRange(startTime, endTime); for (String tradeDate : dateList) { - orderBasicInfoService.orderSplittingOperations(dto.getMerchantId(), tradeDate); + merchantIdList.parallelStream().forEach(merchantId -> { + try { + orderBasicInfoService.orderSplittingOperations(merchantId, tradeDate); + } catch (Exception e) { + logger.error("手动接口执行订单分账逻辑 error, merchantId:{}", merchantId, e); + } + }); + } response = new RestApiResponse<>(); } catch (BusinessException e) {