diff --git a/jsowell-pile/src/main/java/com/jsowell/mq/OrderRabbitListener.java b/jsowell-pile/src/main/java/com/jsowell/mq/OrderRabbitListener.java index 334d02cd8..2652c2df0 100644 --- a/jsowell-pile/src/main/java/com/jsowell/mq/OrderRabbitListener.java +++ b/jsowell-pile/src/main/java/com/jsowell/mq/OrderRabbitListener.java @@ -29,7 +29,7 @@ public class OrderRabbitListener { */ @RabbitListener(queues = RabbitConstants.QUEUE_CHARGE_ORDER_DATA) public void receiveChargeOrderData(AfterSettleOrderDTO afterSettleOrderDTO, Channel channel, Message message) throws IOException { - log.info("接收到订单结算数据:{}", JSON.toJSONString(afterSettleOrderDTO)); + log.info("realTimeOrderSplit-接收到订单结算数据:{}, 开始执行新分账方法", JSON.toJSONString(afterSettleOrderDTO)); // 2025年2月18日09点18分全部订单改为实时分账 // List newLogicStationIdList = YKCUtils.getNewLogicStationIdList(); @@ -37,7 +37,7 @@ public class OrderRabbitListener { // return; // } - log.info("realTimeOrderSplit-订单{}开始执行新分账方法", afterSettleOrderDTO.getOrderCode()); + // log.info("realTimeOrderSplit-订单{}开始执行新分账方法", afterSettleOrderDTO.getOrderCode()); try { orderBasicInfoService.realTimeOrderSplit(afterSettleOrderDTO); } catch (BaseAdaPayException e) { 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 8c10f1cd2..ee5a86676 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 @@ -1927,14 +1927,6 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { } } - // 订单结算金额,汇付分账 - try { - splittingMethod(afterSettleOrderDTO); - } catch (Exception e) { - logger.error("realTimeOrderSplit-订单:{}, 订单结算金额,汇付分账异常", afterSettleOrderDTO.getOrderCode(), e); - return null; - } - // 订单退款,汇付退款 try { refundMethod(afterSettleOrderDTO); @@ -1942,6 +1934,13 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { logger.error("realTimeOrderSplit-订单:{}, 订单退款,汇付退款异常", afterSettleOrderDTO.getOrderCode(), e); } + // 订单结算金额,汇付分账 + try { + splittingMethod(afterSettleOrderDTO); + } catch (Exception e) { + logger.error("realTimeOrderSplit-订单:{}, 订单结算金额,汇付分账异常", afterSettleOrderDTO.getOrderCode(), e); + } + // 组装结果集 OrderSplitResult result = new OrderSplitResult(); result.setOrderCode(afterSettleOrderDTO.getOrderCode());