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 2366f556a..f1e8ff6f2 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 @@ -1012,7 +1012,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { */ @Override public void tempOrderSplittingOperations(String merchantId, String tradeDate) { - logger.info("运营商:{}, 交易日期:{}, 进行分账处理start", merchantId, tradeDate); + logger.info("手动接口执行订单分账逻辑-运营商:{}, 交易日期:{}, 进行分账处理start", merchantId, tradeDate); // AdapayMemberAccount adapayMemberAccount = new AdapayMemberAccount(); // adapayMemberAccount.setAdapayMemberId("0"); @@ -1020,7 +1020,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // 查询运营商有没有开通结算账户 AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId); if (adapayMemberAccount == null) { - logger.error("订单分账逻辑error, 运营商id:{}, 未配置结算账户", merchantId); + logger.error("手动接口执行订单分账逻辑-订单分账逻辑error, 运营商id:{}, 未配置结算账户", merchantId); return; } @@ -1029,12 +1029,13 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { for (SettleOrderReport orderReport : stationReportList) { String orderCodes = orderReport.getOrderCodes(); if (StringUtils.isBlank(orderCodes)) { - logger.info("站点:{}, 日期:{}, 没有查到订单数据", orderReport.getStationId(), tradeDate); + logger.info("手动接口执行订单分账逻辑-站点:{}, 日期:{}, 没有查到订单数据", orderReport.getStationId(), tradeDate); continue; } List orderCodeList = Lists.newArrayList(StringUtils.split(orderCodes, ",")); List orderBasicInfos = queryOrderList(orderCodeList); if (CollectionUtils.isEmpty(orderBasicInfos)) { + logger.info("手动接口执行订单分账逻辑-站点:{}, 日期:{}, 没有查到订单数据", orderReport.getStationId(), tradeDate); continue; } @@ -1045,7 +1046,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { if (PayModeEnum.PAYMENT_OF_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) { // 余额支付的订单 只用余额支付转账 orderSettleResult = doBalancePayment(orderBasicInfo, adapayMemberAccount); - logger.info("手动接口执行订单分账逻辑order:{}, result:{}", JSON.toJSONString(orderBasicInfo), JSON.toJSONString(orderSettleResult)); + logger.info("手动接口执行订单分账逻辑-order:{}, result:{}", JSON.toJSONString(orderBasicInfo), JSON.toJSONString(orderSettleResult)); } else { // 在线支付,进行支付确认分账 // orderSettleResult = doPaymentConfirm(orderBasicInfo, adapayMemberAccount); @@ -1055,11 +1056,11 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // String orderCode = (String) jsonObject.get("orderCode"); // } } catch (Exception e) { - logger.error("订单交易确认失败:{}", orderBasicInfo.getOrderCode(), e); + logger.error("手动接口执行订单分账逻辑-订单交易确认失败:{}", orderBasicInfo.getOrderCode(), e); } } } - logger.info("运营商:{}, 交易日期:{}, 进行分账处理end", merchantId, tradeDate); + logger.info("手动接口执行订单分账逻辑-运营商:{}, 交易日期:{}, 进行分账处理end", merchantId, tradeDate); } /**