From 4d6cac0e1f63e94f69f9d3223719632df62be552 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 27 Oct 2025 18:40:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/UDistributionController.java | 8 ++-- .../market/entity/MkDistributionConfig.java | 4 -- .../czg/market/entity/MkDistributionUser.java | 6 ++- .../service/MkDistributionUserService.java | 11 ++--- .../java/com/czg/utils/CzgRandomUtils.java | 38 ++++++++++++++++ .../impl/MkDistributionConfigServiceImpl.java | 35 ++------------- .../impl/MkDistributionUserServiceImpl.java | 43 +++++++++++++------ .../service/impl/OrderInfoServiceImpl.java | 2 +- 8 files changed, 88 insertions(+), 59 deletions(-) create mode 100644 cash-common/cash-common-service/src/main/java/com/czg/utils/CzgRandomUtils.java 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 9e29c1f3..6a6acd15 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 @@ -13,8 +13,8 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; /** - * * 分销相关 + * * @author Administrator */ @RestController @@ -58,9 +58,9 @@ public class UDistributionController { /** * 分销员中心-配置信息 */ - @PostMapping("/centerConfig") - public CzgResult> centerConfig() { - return CzgResult.success(distributionUserService.centerConfig(StpKit.USER.getLoginIdAsLong())); + @GetMapping("/centerConfig") + public CzgResult> centerConfig(@RequestParam Long shopId) { + return CzgResult.success(distributionUserService.centerConfig(StpKit.USER.getLoginIdAsLong(), shopId)); } } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionConfig.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionConfig.java index af730357..e99a29eb 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionConfig.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionConfig.java @@ -93,10 +93,6 @@ public class MkDistributionConfig implements Serializable { @Column(onInsertValue = "now()", onUpdateValue = "now()") private LocalDateTime updateTime; - /** - * 主店id - */ - private Long mainShopId; private Long shopId; } 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 9123ec39..d1062e8d 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 @@ -111,6 +111,10 @@ public class MkDistributionUser implements Serializable { /** * 是否删除 0 未删除 1 已删除 */ - private boolean isDel; + private Integer isDel; + /** + * 邀请码 + */ + private String inviteCode; } 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 fee9d664..730ecef9 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 @@ -37,7 +37,7 @@ public interface MkDistributionUserService extends IService /** * 分销员中心-配置信息 */ - Map centerConfig(Long userId); + Map centerConfig(Long userId, Long shopId); /** * 获取分销员分页列表 @@ -84,11 +84,12 @@ public interface MkDistributionUserService extends IService /** * 发放分销奖励 + * * @param sourceId 来源id - * @param orderNo 订单编号 - * @param amount 金额 - * @param userId 用户id - * @param shopId 店铺id + * @param orderNo 订单编号 + * @param amount 金额 + * @param userId 用户id + * @param shopId 店铺id */ void distribute(Long sourceId, String orderNo, BigDecimal amount, Long userId, Long shopId, String type); diff --git a/cash-common/cash-common-service/src/main/java/com/czg/utils/CzgRandomUtils.java b/cash-common/cash-common-service/src/main/java/com/czg/utils/CzgRandomUtils.java new file mode 100644 index 00000000..42bafcd5 --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/utils/CzgRandomUtils.java @@ -0,0 +1,38 @@ +package com.czg.utils; + +import cn.hutool.core.lang.id.NanoId; + +/** + * @author ww + * @description + */ +public class CzgRandomUtils { + + private static final char[] DEFAULT_ALPHABET = + "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ".toCharArray(); + + /** + * 默认长度 + */ + public static final int DEFAULT_SIZE = 12; + + + /** + * 随机生成指定长度的字符串 + * + * @return 随机字符串 + */ + public static String randomString() { + return NanoId.randomNanoId(null, DEFAULT_ALPHABET, DEFAULT_SIZE); + } + + /** + * 随机生成指定长度的字符串 + * + * @param length 字符串长度 + * @return 随机字符串 + */ + public static String randomString(int length) { + return NanoId.randomNanoId(null, DEFAULT_ALPHABET, length); + } +} diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionConfigServiceImpl.java index 21ac2b14..25b974bb 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionConfigServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionConfigServiceImpl.java @@ -1,42 +1,21 @@ package com.czg.service.market.service.impl; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.IdUtil; -import com.czg.account.entity.ShopInfo; -import com.czg.account.entity.ShopUser; -import com.czg.account.service.ShopInfoService; -import com.czg.account.service.ShopUserService; -import com.czg.constant.TableValueConstant; -import com.czg.exception.CzgException; import com.czg.market.dto.MkDistributionConfigDTO; -import com.czg.market.entity.MkDistributionAmountFlow; -import com.czg.market.entity.MkDistributionUser; -import com.czg.market.service.MkDistributionAmountFlowService; -import com.czg.market.service.MkDistributionUserService; -import com.czg.order.dto.MkDistributionPayDTO; +import com.czg.market.entity.MkDistributionConfig; import com.czg.market.entity.MkDistributionLevelConfig; +import com.czg.market.service.MkDistributionConfigService; import com.czg.market.service.MkDistributionLevelConfigService; import com.czg.market.vo.MkDistributionConfigVO; -import com.czg.order.entity.OrderPayment; -import com.czg.order.service.OrderPaymentService; -import com.czg.sa.StpKit; -import com.czg.system.service.WxService; -import com.czg.utils.AssertUtil; +import com.czg.service.market.mapper.MkDistributionConfigMapper; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; -import com.czg.market.entity.MkDistributionConfig; -import com.czg.market.service.MkDistributionConfigService; -import com.czg.service.market.mapper.MkDistributionConfigMapper; import jakarta.annotation.Resource; -import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; -import java.math.BigDecimal; -import java.util.Map; - /** * 分销配置 服务层实现。 * @@ -49,20 +28,14 @@ public class MkDistributionConfigServiceImpl extends ServiceImpl result = new HashMap<>(); + Map result = new HashMap<>(5); result.put("totalIncome", centerTopVO.getTotalIncome()); result.put("pendingIncome", centerTopVO.getPendingIncome()); result.put("cashOutAmount", centerTopVO.getUnCashOutAmount()); - result.put("activates",activates(userId,1,5)); - result.put("unActivates",unActivates(userId,1,3)); + result.put("activates", activates(userId, 1, 5)); + result.put("unActivates", unActivates(userId, 1, 3)); return result; } @@ -111,12 +112,12 @@ public class MkDistributionUserServiceImpl extends ServiceImpl centerConfig(Long userId) { + public Map centerConfig(Long userId, Long shopId) { + Map result = new HashMap<>(3); + ShopInfo shopInfo = shopInfoService.getById(shopId); + AssertUtil.isNull(shopInfo, "店铺不存在"); + ShopUser shopUser = shopUserService.getShopUserInfo(userId, shopId); + AssertUtil.isNull(shopUser, "店铺用户不存在"); + if (shopUser.getDistributionUserId() != null) { + MkDistributionUser mkDistributionUser = this.getById(shopUser.getDistributionUserId()); + AssertUtil.isNull(mkDistributionUser, "上级分销员不存在"); + } + MkDistributionUser mkDistributionUser = this.getOne(QueryWrapper.create() + .eq(MkDistributionUser::getShopUserId, shopUser.getId()).eq(MkDistributionUser::getShopId, shopId)); + MkDistributionConfigVO mkDistributionConfigVO = mkDistributionConfigService.detail(shopId); + if (mkDistributionUser != null) { + + } return null; } @@ -193,6 +209,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl