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 7942233c1..0365c1165 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 @@ -334,7 +334,7 @@ public class TempController extends BaseController { response = new RestApiResponse<>(e.getCode(), e.getMessage()); } catch (Exception e) { logger.error("手动接口执行订单分账逻辑-error", e); - response = new RestApiResponse<>(ReturnCodeEnum.CODE_WEIXIN_REFUND_ERROR); + response = new RestApiResponse<>("00200005", "手动分账接口失败"); } logger.info("手动接口执行订单分账逻辑-result:{}", JSON.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 1d75918a7..72011baf1 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 @@ -51,9 +51,7 @@ import com.jsowell.pile.transaction.dto.OrderTransactionDTO; import com.jsowell.pile.transaction.service.TransactionService; import com.jsowell.pile.util.UserUtils; import com.jsowell.pile.vo.SupStationStatsVO; -import com.jsowell.pile.vo.base.MerchantOrderInfoVO; -import com.jsowell.pile.vo.base.OrderAmountDetailVO; -import com.jsowell.pile.vo.base.OrderPeriodAmountVO; +import com.jsowell.pile.vo.base.*; import com.jsowell.pile.vo.base.PileInfoVO; import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO; import com.jsowell.pile.vo.nanrui.JiangSuOrderInfoVO; @@ -1283,6 +1281,13 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { */ @Override public void orderSplittingOperations(String merchantId, String tradeDate) { + // 查询运营商信息 + String delayMode = pileMerchantInfoService.getDelayModeByMerchantId(merchantId); + if (StringUtils.equals(MerchantDelayModeEnum.NOT_DELAY.getValue(), delayMode)) { + logger.info("订单分账逻辑, 运营商id:{}, 非延时分账商户, 不进行订单分账处理", merchantId); + return; + } + // 查询运营商有没有开通结算账户 AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId); if (adapayMemberAccount == null) {