From e788503426f32c1e79a56b000640021a4482e9ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Wed, 29 Oct 2025 15:41:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=86=E9=94=80=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=A1=A5=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/service/impl/MkDistributionAmountFlowServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionAmountFlowServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionAmountFlowServiceImpl.java index d29ee59c..1928145e 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionAmountFlowServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionAmountFlowServiceImpl.java @@ -75,6 +75,7 @@ public class MkDistributionAmountFlowServiceImpl extends ServiceImpl Date: Wed, 29 Oct 2025 15:47:23 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=86=E9=94=80=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MkDistributionAmountFlowServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionAmountFlowServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionAmountFlowServiceImpl.java index 1928145e..f18396d3 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionAmountFlowServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionAmountFlowServiceImpl.java @@ -7,6 +7,7 @@ import com.czg.account.entity.UserInfo; import com.czg.constant.TableValueConstant; import com.czg.market.vo.MkDistributionAmountFlowVO; import com.czg.order.entity.OrderInfo; +import com.czg.order.entity.OrderPayment; import com.czg.utils.MyQueryWrapper; import com.czg.utils.PageUtil; import com.mybatisflex.core.paginate.Page; @@ -71,10 +72,10 @@ public class MkDistributionAmountFlowServiceImpl extends ServiceImpl openPageInfo(Long shopId, LocalDateTime startTime, LocalDateTime endTime, String key) { QueryWrapper queryWrapper = new MyQueryWrapper() .selectAll(MkDistributionAmountFlow.class) - .leftJoin(OrderInfo.class).on(OrderInfo::getId, MkDistributionAmountFlow::getSourceId) - .leftJoin(ShopUser.class).on(ShopUser::getId, OrderInfo::getUserId) + .leftJoin(OrderPayment.class).on(OrderPayment::getId, MkDistributionAmountFlow::getSourceId) + .leftJoin(ShopUser.class).on(ShopUser::getId, OrderPayment::getSourceId) .eq(MkDistributionAmountFlow::getShopId, shopId) - .select(OrderInfo::getOrderNo) + .select(OrderPayment::getOrderNo) .eq(MkDistributionAmountFlow::getType, TableValueConstant.DistributionAmountFlow.Type.OPEN.getCode()) .select(ShopUser::getPhone, ShopUser::getNickName); if (startTime != null) { From a101862f34967315402c0942a99d5ebed86fab04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Wed, 29 Oct 2025 15:47:35 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=86=E9=94=80=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MkDistributionAmountFlowServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionAmountFlowServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionAmountFlowServiceImpl.java index f18396d3..d4d5de2d 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionAmountFlowServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionAmountFlowServiceImpl.java @@ -89,7 +89,7 @@ public class MkDistributionAmountFlowServiceImpl extends ServiceImpl { and.or(or -> { - or.like(OrderInfo::getOrderNo, key); + or.like(OrderPayment::getOrderNo, key); }); and.or(or -> { or.like(ShopUser::getNickName, key); From 9e5a18b80b13b69533655dda48537f5b531465e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Wed, 29 Oct 2025 15:54:44 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=86=E9=94=80=E5=91=98=E8=B4=AD?= =?UTF-8?q?=E4=B9=B0=E4=BF=9D=E5=AD=98shopUserId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/DistributionPayServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DistributionPayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DistributionPayServiceImpl.java index d7783e43..1e86e7df 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DistributionPayServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DistributionPayServiceImpl.java @@ -67,14 +67,14 @@ public class DistributionPayServiceImpl implements DistributionPayService { if (!isRecharge && !TableValueConstant.DistributionConfig.OpenType.PAY.getCode().equals(detail.getOpenType())) { throw new CzgException("当前未开启购买分销配置"); } + ShopUser shopUserInfo = shopUserService.getShopUserInfo(payParam.getShopId(), userId); - OrderPayment orderPayment = new OrderPayment().setShopId(payParam.getShopId()).setSourceId(isRecharge ? payParam.getShopId() : userId) + OrderPayment orderPayment = new OrderPayment().setShopId(payParam.getShopId()).setSourceId(isRecharge ? payParam.getShopId() : shopUserInfo.getId()) .setPayType(isRecharge ? "distributionRecharge" : "distribution").setOrderNo(payParam.getPlatformType() + IdUtil.getSnowflakeNextId()).setAmount(detail.getPayAmount()); orderPaymentService.save(orderPayment); InitInfo initInfo = new InitInfo().setConfig(detail); if (!isRecharge) { - ShopUser shopUserInfo = shopUserService.getShopUserInfo(payParam.getShopId(), userId); UserInfo userInfo = userInfoService.getById(userId); initInfo.setPayment(orderPayment).setShopUser(shopUserInfo) .setOpenId("aliPay".equals(payParam.getPayType()) ? userInfo.getAlipayOpenId() : userInfo.getWechatOpenId());