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 ec4980d65..0d2de4081 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 @@ -201,8 +201,8 @@ public class TempController extends BaseController { List dateList = DateUtils.getAllDatesInTheDateRange(startTime, endTime); for (String tradeDate : dateList) { - // orderBasicInfoService.tempOrderSplittingOperations(dto.getMerchantId(), tradeDate); - orderBasicInfoService.orderSplittingOperations(dto.getMerchantId(), tradeDate); + orderBasicInfoService.tempOrderSplittingOperations(dto.getMerchantId(), tradeDate); + // orderBasicInfoService.orderSplittingOperations(dto.getMerchantId(), tradeDate); } response = new RestApiResponse<>(); 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 2f8b47914..2366f556a 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 @@ -1009,14 +1009,20 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 手动接口执行订单分账逻辑 - * 8月1号之前的交易,全部结算到本商户 */ @Override public void tempOrderSplittingOperations(String merchantId, String tradeDate) { logger.info("运营商:{}, 交易日期:{}, 进行分账处理start", merchantId, tradeDate); - AdapayMemberAccount adapayMemberAccount = new AdapayMemberAccount(); - adapayMemberAccount.setAdapayMemberId("0"); + // AdapayMemberAccount adapayMemberAccount = new AdapayMemberAccount(); + // adapayMemberAccount.setAdapayMemberId("0"); + + // 查询运营商有没有开通结算账户 + AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId); + if (adapayMemberAccount == null) { + logger.error("订单分账逻辑error, 运营商id:{}, 未配置结算账户", merchantId); + return; + } // 根据交易日期查询运营商下面所有站点的交易日报 List stationReportList = settleOrderReportService.selectByMerchantIdAndDate(merchantId, tradeDate); @@ -1035,17 +1041,23 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // 执行分账 for (OrderBasicInfo orderBasicInfo : orderBasicInfos) { try { - OrderSettleResult orderSettleResult = doPaymentConfirm(orderBasicInfo, adapayMemberAccount); - if (orderSettleResult != null && AdapayStatusEnum.SUCCEEDED.getValue().equals(orderSettleResult.getStatus())) { - JSONObject jsonObject = JSON.parseObject(orderSettleResult.getDescription()); - String orderCode = (String) jsonObject.get("orderCode"); - + OrderSettleResult orderSettleResult = null; + if (PayModeEnum.PAYMENT_OF_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) { + // 余额支付的订单 只用余额支付转账 + orderSettleResult = doBalancePayment(orderBasicInfo, adapayMemberAccount); + logger.info("手动接口执行订单分账逻辑order:{}, result:{}", JSON.toJSONString(orderBasicInfo), JSON.toJSONString(orderSettleResult)); + } else { + // 在线支付,进行支付确认分账 + // orderSettleResult = doPaymentConfirm(orderBasicInfo, adapayMemberAccount); } + // if (orderSettleResult != null && AdapayStatusEnum.SUCCEEDED.getValue().equals(orderSettleResult.getStatus())) { + // JSONObject jsonObject = JSON.parseObject(orderSettleResult.getDescription()); + // String orderCode = (String) jsonObject.get("orderCode"); + // } } catch (Exception e) { logger.error("订单交易确认失败:{}", orderBasicInfo.getOrderCode(), e); } } - } logger.info("运营商:{}, 交易日期:{}, 进行分账处理end", merchantId, tradeDate); }