From b2021741d7a1f2b50c011b6bbe602b57f8edd5b1 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 23 Oct 2023 11:57:26 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9=E5=88=86=E8=B4=A6?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/pile/service/IOrderBasicInfoService.java | 2 +- .../pile/service/impl/OrderBasicInfoServiceImpl.java | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java index 6a565d97a..caf81f1af 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java @@ -151,7 +151,7 @@ public interface IOrderBasicInfoService { List getListByMemberIdAndOrderStatus(String memberId, List orderStatusList, LocalDateTime dateTime, String stationId); - void orderSplittingOperations(AdapayMemberAccount adapayMemberAccount, List stationReportList); + void orderSplittingOperations(String merchantId, AdapayMemberAccount adapayMemberAccount, List stationReportList); void orderSplittingOperations(String merchantId, String tradeDate); 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 9b05471bd..4686960e0 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 @@ -1148,7 +1148,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { * 只有开通结算账户的运营商才走分账逻辑 */ @Override - public void orderSplittingOperations(AdapayMemberAccount adapayMemberAccount, List stationReportList) { + public void orderSplittingOperations(String merchantId, AdapayMemberAccount adapayMemberAccount, List stationReportList) { // 运营商有没有开通结算账户 if (adapayMemberAccount == null) { logger.error("订单分账逻辑error-运营商有没有开通结算账户"); @@ -1162,7 +1162,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { String tradeDate = stationReportList.get(0).getTradeDate(); logger.info("运营商:{}, 交易日期:{}, 进行分账处理start", adapayMemberAccount, JSON.toJSONString(stationReportList)); - String merchantId = adapayMemberAccount.getMerchantId(); + // String merchantId = adapayMemberAccount.getMerchantId(); String appId = pileMerchantInfoService.queryAppIdByMerchantId(merchantId); // 根据运营商id和结算日期查询清分账单 @@ -1273,12 +1273,13 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId); if (adapayMemberAccount == null) { logger.error("订单分账逻辑error, 运营商id:{}, 未配置结算账户", merchantId); - return; + adapayMemberAccount = adapayMemberAccountService.getDefault(); + // return; } // 根据交易日期查询运营商下面所有站点的交易日报 List stationReportList = settleOrderReportService.selectByMerchantIdAndDate(merchantId, tradeDate); - orderSplittingOperations(adapayMemberAccount, stationReportList); + orderSplittingOperations(merchantId, adapayMemberAccount, stationReportList); }