From 033db28c0baf225bf38c7c018fcf302a96de049e Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 5 Nov 2025 17:49:31 +0800 Subject: [PATCH 01/21] =?UTF-8?q?seata=20=E5=BC=82=E5=B8=B8=20=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/exception/CzgControllerAdvice.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java b/cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java index 9d345ade0..b674dd51a 100644 --- a/cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java +++ b/cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java @@ -34,6 +34,17 @@ public class CzgControllerAdvice { @ExceptionHandler(value = Exception.class) @ResponseStatus(HttpStatus.OK) public CzgResult errorHandler(Exception ex) { + Throwable rootCause = ex; + while (rootCause.getCause() != null) { + rootCause = rootCause.getCause(); + if (rootCause instanceof CzgException) { + break; + } + } + // 处理自定义异常 + if (rootCause instanceof CzgException czgException) { + return CzgResult.failure(czgException.getCode(), czgException.getMessage()); + } setErrorLog(ex); return CzgResult.failure(CzgRespCode.SYSTEM_ERROR.getCode(), ex.getMessage()); } @@ -143,7 +154,7 @@ public class CzgControllerAdvice { } private void setErrorLog(Exception ex) { - log.error("错误",ex); log.error(ex.getMessage()); + log.error("错误",ex); } } From 6063121fac7fa5bca514de4de87b07ae6fcb5631 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 5 Nov 2025 18:05:54 +0800 Subject: [PATCH 02/21] =?UTF-8?q?userId=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/service/impl/MkDistributionUserServiceImpl.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/MkDistributionUserServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java index 18276a5b7..2cc126158 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java @@ -289,7 +289,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl Date: Thu, 6 Nov 2025 09:53:21 +0800 Subject: [PATCH 03/21] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market-server/src/main/java/com/czg/task/AAMarketTasks.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cash-api/market-server/src/main/java/com/czg/task/AAMarketTasks.java b/cash-api/market-server/src/main/java/com/czg/task/AAMarketTasks.java index 9804725f7..ace8dfe50 100644 --- a/cash-api/market-server/src/main/java/com/czg/task/AAMarketTasks.java +++ b/cash-api/market-server/src/main/java/com/czg/task/AAMarketTasks.java @@ -2,12 +2,14 @@ package com.czg.task; import jakarta.annotation.Resource; import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; /** * market服务 任务总调度 * @author ww * @description */ +@Component public class AAMarketTasks { //生日有礼奖励发放 @Resource From 0320057bc9b43887da77678ddc53515aebadb39c Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 6 Nov 2025 13:44:21 +0800 Subject: [PATCH 04/21] =?UTF-8?q?sql=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ShopUserMapper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml index c6c28b34f..78dfa31f2 100644 --- a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml +++ b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml @@ -294,9 +294,9 @@ FROM tb_shop_user_invite invite left join tb_shop_user u on invite.shop_user_id = u.id left join mk_distribution_user dist on u.id = dist.id - WHERE u.`distribution_user_id` = #{distributionUserId} + WHERE invite.`distribution_user_id` = #{distributionUserId} and dist.distribution_level_id = #{distributionLevelId} - and u.id = #{shopUserId} - ORDER BY u.`invite_time` DESC + and invite.shop_user_id = #{shopUserId} + ORDER BY tb_shop_user_invite.`invite_time` DESC From 3e895b4a7d6ef5f35a9bee6fd6d810c0cac9eb5f Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 6 Nov 2025 13:55:28 +0800 Subject: [PATCH 05/21] =?UTF-8?q?=E5=88=AB=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ShopUserMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml index 78dfa31f2..b93d7222c 100644 --- a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml +++ b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml @@ -297,6 +297,6 @@ WHERE invite.`distribution_user_id` = #{distributionUserId} and dist.distribution_level_id = #{distributionLevelId} and invite.shop_user_id = #{shopUserId} - ORDER BY tb_shop_user_invite.`invite_time` DESC + ORDER BY invite.`invite_time` DESC From 51f0a2b71c3f3adeff629a0e998e2f33dcfc784c Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 6 Nov 2025 14:05:18 +0800 Subject: [PATCH 06/21] tb_shop_user_invite --- .../mapper/MkDistributionUserMapper.xml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/cash-service/market-service/src/main/resources/mapper/MkDistributionUserMapper.xml b/cash-service/market-service/src/main/resources/mapper/MkDistributionUserMapper.xml index 178658ac4..10aaa3056 100644 --- a/cash-service/market-service/src/main/resources/mapper/MkDistributionUserMapper.xml +++ b/cash-service/market-service/src/main/resources/mapper/MkDistributionUserMapper.xml @@ -56,17 +56,16 @@ From ede52b194485ef5f355707e78c03c7e3a2fe8d4b Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 6 Nov 2025 15:05:14 +0800 Subject: [PATCH 10/21] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/service/impl/MkDistributionUserServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java index ff226d09c..d0dea55b5 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java @@ -428,7 +428,8 @@ public class MkDistributionUserServiceImpl extends ServiceImpl Date: Thu, 6 Nov 2025 15:13:55 +0800 Subject: [PATCH 11/21] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/service/impl/MkDistributionUserServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java index d0dea55b5..ad8f2dc5f 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java @@ -313,7 +313,8 @@ public class MkDistributionUserServiceImpl extends ServiceImpl Date: Thu, 6 Nov 2025 15:22:15 +0800 Subject: [PATCH 12/21] =?UTF-8?q?=E8=81=94=E5=90=88=E4=B8=BB=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/market/entity/MkDistributionUser.java | 1 + 1 file changed, 1 insertion(+) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionUser.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionUser.java index 2778dfd4a..c7950afca 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionUser.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionUser.java @@ -40,6 +40,7 @@ public class MkDistributionUser implements Serializable { /** * 店铺id */ + @Id private Long shopId; private Long userId; From 874ca79ef821b22fc438e20ae1f5788a68e9afff Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 6 Nov 2025 15:41:04 +0800 Subject: [PATCH 13/21] =?UTF-8?q?=E9=82=80=E8=AF=B7=E4=BA=BA=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czg/controller/admin/DistributionUserController.java | 3 ++- .../com/czg/controller/user/UDistributionController.java | 3 ++- .../main/java/com/czg/account/service/ShopUserService.java | 2 +- .../com/czg/market/service/MkDistributionUserService.java | 2 +- .../java/com/czg/service/account/mapper/ShopUserMapper.java | 2 +- .../service/account/service/impl/ShopUserServiceImpl.java | 4 ++-- .../src/main/resources/mapper/ShopUserMapper.xml | 6 +++--- .../market/service/impl/MkDistributionUserServiceImpl.java | 4 ++-- 8 files changed, 14 insertions(+), 12 deletions(-) diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionUserController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionUserController.java index 189692b8c..da276e8a3 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionUserController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionUserController.java @@ -48,7 +48,8 @@ public class DistributionUserController { @RequestParam(required = false, defaultValue = "1") Integer page, @RequestParam(required = false, defaultValue = "10") Integer size) { AssertUtil.isNull(id, "邀请人ID"); - return CzgResult.success(distributionUserService.getInviteUser(id, shopUserId, distributionLevelId, page, size)); + Long shopId = StpKit.USER.getShopId(); + return CzgResult.success(distributionUserService.getInviteUser(id,shopId, shopUserId, distributionLevelId, page, size)); } /** diff --git a/cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java b/cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java index d42478922..469438350 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java @@ -119,10 +119,11 @@ public class UDistributionController { @GetMapping("/inviteUser") public CzgResult> getInviteUser( @RequestParam Long id, + @RequestParam Long shopId, @RequestParam(required = false, defaultValue = "1") Integer page, @RequestParam(required = false, defaultValue = "10") Integer size) { AssertUtil.isNull(id, "邀请人ID"); - return CzgResult.success(distributionUserService.getInviteUser(id, null, null, page, size)); + return CzgResult.success(distributionUserService.getInviteUser(id, shopId, null, null, page, size)); } /** diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java index 72397348f..245e1e448 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java @@ -29,7 +29,7 @@ public interface ShopUserService extends IService { /** * 获取邀请用户列表 */ - Page getInviteUser(Long getDistributionUserId, Long shopUserId, Long distributionLevelId, Integer page, Integer size); + Page getInviteUser(Long getDistributionUserId, Long shopId, Long shopUserId, Long distributionLevelId, Integer page, Integer size); boolean updateInfo(ShopUser shopUser); diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java index 3e5c4d297..0cbeeeb27 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java @@ -67,7 +67,7 @@ public interface MkDistributionUserService extends IService /** * 获取分销员邀请人分页列表 */ - Page getInviteUser(Long id, Long shopUserId, Long distributionLevelId, Integer page, Integer size); + Page getInviteUser(Long id, Long shopId, Long shopUserId, Long distributionLevelId, Integer page, Integer size); /** * 分销员：按消费金额升级等级 diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopUserMapper.java b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopUserMapper.java index 8127a45cd..f82051b36 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopUserMapper.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopUserMapper.java @@ -70,7 +70,7 @@ public interface ShopUserMapper extends BaseMapper { * @param distributionUserId 分销员ID * @return 分页结果 */ - List getInviteUser(Long distributionUserId, Long shopUserId, Long distributionLevelId); + List getInviteUser(Long distributionUserId, Long shopId, Long shopUserId, Long distributionLevelId); void updateOneOrTwoAmount(Long shopUserId, Long shopId, BigDecimal amount, Integer isOne); diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java index 14ee0c00d..c9a1da3ad 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java @@ -99,9 +99,9 @@ public class ShopUserServiceImpl extends ServiceImpl i } @Override - public Page getInviteUser(Long distributionUserId, Long shopUserId, Long distributionLevelId, Integer page, Integer size) { + public Page getInviteUser(Long distributionUserId, Long shopId, Long shopUserId, Long distributionLevelId, Integer page, Integer size) { PageHelper.startPage(page, size); - List inviteUser = mapper.getInviteUser(distributionUserId, shopUserId, distributionLevelId); + List inviteUser = mapper.getInviteUser(distributionUserId, shopId, shopUserId, distributionLevelId); return PageUtil.convert(new PageInfo<>(inviteUser)); } diff --git a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml index b93d7222c..d2b05527c 100644 --- a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml +++ b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml @@ -292,9 +292,9 @@ dist.distribution_level_name AS levelName, u.distribution_shops AS distributionShops FROM tb_shop_user_invite invite - left join tb_shop_user u on invite.shop_user_id = u.id - left join mk_distribution_user dist on u.id = dist.id - WHERE invite.`distribution_user_id` = #{distributionUserId} + left join tb_shop_user u on invite.shop_user_id = u.id + left join mk_distribution_user dist on u.id = dist.id + WHERE invite.`distribution_user_id` = #{distributionUserId} and invite.shop_id = #{shopId} and dist.distribution_level_id = #{distributionLevelId} and invite.shop_user_id = #{shopUserId} ORDER BY invite.`invite_time` DESC diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java index ad8f2dc5f..c0a595d82 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java @@ -401,8 +401,8 @@ public class MkDistributionUserServiceImpl extends ServiceImpl getInviteUser(Long id, Long shopUserId, Long distributionLevelId, Integer page, Integer size) { - return shopUserService.getInviteUser(id, shopUserId, distributionLevelId, page, size); + public Page getInviteUser(Long id, Long shopId, Long shopUserId, Long distributionLevelId, Integer page, Integer size) { + return shopUserService.getInviteUser(id, shopId, shopUserId, distributionLevelId, page, size); } @Override From 9a2d058b63b9ad38df5ace3a62ea8609db81f958 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 6 Nov 2025 15:45:06 +0800 Subject: [PATCH 14/21] =?UTF-8?q?=E6=96=B0=E6=B7=BB=E5=8A=A0=E7=9A=84?= =?UTF-8?q?=E4=BA=BA=20=E9=82=80=E8=AF=B7=E4=BA=BA=E6=95=B0=20=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=98=AF0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/service/impl/MkDistributionUserServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java index c0a595d82..e26eaa088 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java @@ -422,6 +422,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl Date: Thu, 6 Nov 2025 15:50:43 +0800 Subject: [PATCH 15/21] =?UTF-8?q?=E5=88=86=E9=94=80=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=A4=9A=E6=9D=A1=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/MkDistributionFlowMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cash-service/market-service/src/main/resources/mapper/MkDistributionFlowMapper.xml b/cash-service/market-service/src/main/resources/mapper/MkDistributionFlowMapper.xml index 86cdd704c..b9ab4b5b5 100644 --- a/cash-service/market-service/src/main/resources/mapper/MkDistributionFlowMapper.xml +++ b/cash-service/market-service/src/main/resources/mapper/MkDistributionFlowMapper.xml @@ -5,7 +5,7 @@