From a28b903b73053181a96e3ea288e2c9a6d8a9651d Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 13 Jan 2026 14:05:50 +0800 Subject: [PATCH] =?UTF-8?q?userID=20=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrderInfoCustomServiceImpl.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java index 84572cf5c..7eaada20f 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java @@ -364,7 +364,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService { if (param.getOrderAmount().compareTo(BigDecimal.ZERO) < 0) { throw new OrderValidateException("生成订单失败，订单金额不能小于0"); } - log.info("订单信息：{}，优惠信息：{}", JSONObject.toJSONString(orderInfo), JSONObject.toJSONString(param)); + log.info("订单信息：{}，\r\n 优惠信息：{}", JSONObject.toJSONString(orderInfo), JSONObject.toJSONString(param)); Long shopId = orderInfo.getShopId(); AssertUtil.isNull(shopId, "生成支付订单失败，订单信息异常"); //霸王餐不参与满减 @@ -1056,10 +1056,12 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService { } upOrderInfo(orderInfo, new BigDecimal(czgCallBackDto.getAmount()).divide(new BigDecimal(100), 2, RoundingMode.DOWN), DateUtil.parseLocalDateTime(czgCallBackDto.getPayTime()), payment.getId(), null); - // 分销员升级等级 - distributionUserService.costUpgradeLevelBefore(orderInfo.getUserId(), orderInfo.getShopId()); - // 分销奖励 - distributionUserService.distribute(orderInfo.getId(), orderInfo.getOrderNo(), payment.getAmount(), orderInfo.getUserId(), orderInfo.getShopId(), "order"); + if (orderInfo.getUserId() != null) { + // 分销员升级等级 + distributionUserService.costUpgradeLevelBefore(orderInfo.getUserId(), orderInfo.getShopId()); + // 分销奖励 + distributionUserService.distribute(orderInfo.getId(), orderInfo.getOrderNo(), payment.getAmount(), orderInfo.getUserId(), orderInfo.getShopId(), "order"); + } } else if (PayTypeConstants.SourceType.MEMBER_IN.equals(payment.getSourceType()) || PayTypeConstants.SourceType.FREE.equals(payment.getSourceType())) { boolean isFree = PayTypeConstants.SourceType.FREE.equals(payment.getSourceType()); ShopUser shopUser = shopUserService.getById(payment.getSourceId());