diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java index e99194b09..5c8954b2b 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java @@ -180,4 +180,33 @@ public class TempController extends BaseController { logger.info("临时接口交易确认接口 result:{}", response); return response; } + + /** + * 运营商分账手动接口 + * @return + */ + @PostMapping("/orderSplittingOperations") + public RestApiResponse orderSplittingOperations(@RequestBody QueryOrderDTO dto) { + RestApiResponse response = null; + try { + String startTime = dto.getStartTime(); + String endTime = dto.getEndTime(); + // 获取日期区间内所有日期 + List dateList = DateUtils.getAllDatesInTheDateRange(startTime, endTime); + + for (String tradeDate : dateList) { + orderBasicInfoService.orderSplittingOperations(dto.getMerchantId(), tradeDate); + } + + response = new RestApiResponse<>(); + } catch (BusinessException e) { + logger.warn("运营商分账手动接口warn", e); + response = new RestApiResponse<>(e.getCode(), e.getMessage()); + } catch (Exception e) { + logger.error("运营商分账手动接口error", e); + response = new RestApiResponse<>(ReturnCodeEnum.CODE_WEIXIN_REFUND_ERROR); + } + logger.info("运营商分账手动接口result:{}", JSONObject.toJSONString(response)); + return response; + } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index f4ed2982c..49c9f4869 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -873,6 +873,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { */ @Override public void orderSplittingOperations(String merchantId, String tradeDate) { + logger.info("运营商:{}, 交易日期:{}, 进行分账处理start", merchantId, tradeDate); // 查询运营商有没有开通结算账户 AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId); if (adapayMemberAccount == null) { @@ -969,6 +970,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { dto.setBillDetailList(billDetailList); transactionService.createClearingBill(dto); } + logger.info("运营商:{}, 交易日期:{}, 进行分账处理end", merchantId, tradeDate); } /**