From 618286703e579d895e5c86b51803264994640ec0 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 28 Oct 2025 17:40:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=82=80=E8=AF=B7=E4=BA=BA=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/DistributionUserController.java | 13 +++++ .../user/UDistributionController.java | 55 ++++++++++++------- .../java/com/czg/account/entity/ShopUser.java | 3 + .../service/MkDistributionUserService.java | 7 ++- .../java/com/czg/market/vo/InviteUserVO.java | 17 ++++++ .../account/mapper/ShopUserMapper.java | 9 +++ .../service/impl/ShopUserServiceImpl.java | 10 ++-- .../main/resources/mapper/ShopUserMapper.xml | 14 +++++ .../impl/MkDistributionUserServiceImpl.java | 37 ++++++++++++- 9 files changed, 135 insertions(+), 30 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 12f10d1e4..84602dc7e 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 @@ -5,6 +5,7 @@ import com.czg.log.annotation.OperationLog; import com.czg.market.dto.MkDistributionUserDTO; import com.czg.market.entity.MkDistributionUser; import com.czg.market.service.MkDistributionUserService; +import com.czg.market.vo.InviteUserVO; import com.czg.resp.CzgResult; import com.czg.sa.StpKit; import com.czg.utils.AssertUtil; @@ -36,6 +37,18 @@ public class DistributionUserController { return CzgResult.success(distributionUserService.getDistributionUser(param)); } + /** + * 分销员:获取邀请人分页列表 + */ + @GetMapping("/inviteUser") + public CzgResult> getInviteUser( + @RequestParam Long id, + @RequestParam(required = false, defaultValue = "1") Integer page, + @RequestParam(required = false, defaultValue = "10") Integer size) { + AssertUtil.isNull(id, "邀请人ID"); + return CzgResult.success(distributionUserService.getInviteUser(id, 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 c3e92ddf2..ec05567a4 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 @@ -3,12 +3,15 @@ package com.czg.controller.user; import com.czg.market.dto.MkDistributionWithdrawFlowDTO; import com.czg.account.entity.UserInfo; import com.czg.market.dto.MkDistributionUserDTO; +import com.czg.market.entity.MkDistributionConfig; import com.czg.market.entity.MkDistributionWithdrawFlow; +import com.czg.market.service.MkDistributionConfigService; import com.czg.market.service.MkDistributionFlowService; import com.czg.market.service.MkDistributionUserService; import com.czg.market.service.MkDistributionWithdrawFlowService; import com.czg.market.vo.DistributionCenterShopVO; import com.czg.market.vo.InviteUserVO; +import com.czg.market.vo.MkDistributionConfigVO; import com.czg.order.dto.MkDistributionPayDTO; import com.czg.resp.CzgResult; import com.czg.sa.StpKit; @@ -31,6 +34,8 @@ import java.util.Map; @RestController @RequestMapping("/user/distribution") public class UDistributionController { + @Resource + private MkDistributionConfigService distributionConfigService; @Resource private MkDistributionUserService distributionUserService; @Resource @@ -41,11 +46,11 @@ public class UDistributionController { private MkDistributionFlowService distributionFlowService; /** - * 分销员购买 + * 分销员中心-获取配置 */ - @PostMapping("/pay") - public CzgResult> pay(@Validated @RequestBody MkDistributionPayDTO payDTO) { - return CzgResult.success(distributionUserService.pay(StpKit.USER.getLoginIdAsLong(), payDTO)); + @GetMapping("/getConfig") + public CzgResult getConfig(@RequestParam Long shopId) { + return CzgResult.success(distributionConfigService.detail(shopId)); } /** @@ -81,15 +86,23 @@ public class UDistributionController { } /** - * 用户提现 - * @param withdrawFlowDTO 提现信息 - * @return 是否成功 + * 分销员中心-获取邀请码 */ - @PostMapping("/withdraw") - public CzgResult withdraw(@Validated @RequestBody MkDistributionWithdrawFlowDTO withdrawFlowDTO) { - return CzgResult.success(distributionUserService.withdraw(StpKit.USER.getLoginIdAsLong(), withdrawFlowDTO)); + @GetMapping("/getInviteCode") + public CzgResult getInviteCode(@RequestParam Long shopId,@RequestParam Long shopUserId) { + return CzgResult.success(distributionUserService.getInviteCode(shopId,shopUserId)); } + + /** + * 分销员购买 + */ + @PostMapping("/pay") + public CzgResult> pay(@Validated @RequestBody MkDistributionPayDTO payDTO) { + return CzgResult.success(distributionUserService.pay(StpKit.USER.getLoginIdAsLong(), payDTO)); + } + + /** * 分销员中心-实名认证 */ @@ -102,7 +115,7 @@ public class UDistributionController { return CzgResult.success(); } - /** + /** * 分销员中心-绑定邀请人 */ @PostMapping("/bindInviteUser") @@ -114,16 +127,6 @@ public class UDistributionController { return CzgResult.success(); } - /** - * 分销员:获取下级分销员分页列表 - */ - @GetMapping("/childUser") - public CzgResult> getDistributionUser(MkDistributionUserDTO param) { - AssertUtil.isNull(param.getShopId(), "店铺ID不能为空"); - AssertUtil.isNull(param.getParentId(), "父级ID不能为空"); - return CzgResult.success(distributionUserService.getDistributionUser(param)); - } - /** * 分销员:获取邀请人分页列表 */ @@ -136,6 +139,16 @@ public class UDistributionController { return CzgResult.success(distributionUserService.getInviteUser(id, page, size)); } + /** + * 用户提现 + * @param withdrawFlowDTO 提现信息 + * @return 是否成功 + */ + @PostMapping("/withdraw") + public CzgResult withdraw(@Validated @RequestBody MkDistributionWithdrawFlowDTO withdrawFlowDTO) { + return CzgResult.success(distributionUserService.withdraw(StpKit.USER.getLoginIdAsLong(), withdrawFlowDTO)); + } + /** * 提现详情 */ diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java index 3a9ad8f59..3833e93ad 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java @@ -1,6 +1,7 @@ package com.czg.account.entity; import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson2.annotation.JSONField; import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; @@ -167,6 +168,8 @@ public class ShopUser implements Serializable { private Integer discount; @Column(ignore = true) private Integer isMemberPrice; + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime inviteTime; /** 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 2982442a4..04aa0018a 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 @@ -42,6 +42,11 @@ public interface MkDistributionUserService extends IService */ Map centerConfig(Long userId, Long shopId); + /** + * 分销员中心-获取邀请码 + */ + String getInviteCode(Long shopId, Long shopUserId); + /** * 分销员中心-实名认证 */ @@ -72,7 +77,7 @@ public interface MkDistributionUserService extends IService * shop_id 和 shop_user_id 必填 opening_method 必填 * 如果distribution_level_id指定 则 distribution_level_name 也填 */ - void addDistributionUser(MkDistributionUser param); + MkDistributionUser addDistributionUser(MkDistributionUser param); /** * 更新分销员 diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/InviteUserVO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/InviteUserVO.java index 097aa065d..eeb74bfc4 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/InviteUserVO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/InviteUserVO.java @@ -4,6 +4,7 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; +import java.time.LocalDateTime; /** * @author ww @@ -29,4 +30,20 @@ public class InviteUserVO implements Serializable { * 一级收益 */ private BigDecimal oneIncome; + /** + * 邀请时间 + */ + private LocalDateTime inviteTime; + /** + * 等级id + */ + private Integer levelId; + /** + * 等级名称 + */ + private String levelName; + /** + * 是否分销员 + */ + private Integer isDistribution; } 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 95053ce08..e1150067f 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 @@ -6,6 +6,7 @@ import com.czg.account.dto.shopuser.ShopUserVipCardDTO; import com.czg.account.dto.user.userinfo.UserInfoAssetsSummaryDTO; import com.czg.account.entity.ShopUser; import com.czg.market.entity.SmsPushEventUser; +import com.czg.market.vo.InviteUserVO; import com.mybatisflex.core.BaseMapper; import com.mybatisflex.core.paginate.Page; import org.apache.ibatis.annotations.Param; @@ -62,4 +63,12 @@ public interface ShopUserMapper extends BaseMapper { @Param("param") SmsPushEventUser smsPushEventUser ); + + /** + * 查询邀请用户 + * + * @param distributionUserId 分销员ID + * @return 分页结果 + */ + List getInviteUser(Long distributionUserId); } 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 9eb3e5434..fe16993ee 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 @@ -100,12 +100,10 @@ public class ShopUserServiceImpl extends ServiceImpl i } @Override - public Page getInviteUser(Long getDistributionUserId, Integer page, Integer size) { - Page pages = pageAs(new Page<>(page, size),QueryWrapper.create() - .select("head_img as headImg,nick_name as shopUserName,phone as shopUserPhone,one_income as oneIncome") - .eq(ShopUser::getDistributionUserId, getDistributionUserId) - .orderBy(ShopUser::getCreateTime).desc(), InviteUserVO.class); - return pages; + public Page getInviteUser(Long distributionUserId, Integer page, Integer size) { + PageHelper.startPage(page, size); + List inviteUser = mapper.getInviteUser(distributionUserId); + return PageUtil.convert(new PageInfo<>(inviteUser)); } @Override 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 43cb10b99..188317325 100644 --- a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml +++ b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml @@ -262,4 +262,18 @@ order by u.create_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 20d9ba732..5ae006795 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 @@ -53,6 +53,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.*; import java.math.RoundingMode; import java.util.HashMap; @@ -205,6 +206,30 @@ public class MkDistributionUserServiceImpl extends ServiceImpl