czg_team
/
cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
张松 2025-10-28 14:04:18 +08:00
parent 1faf6cccbb 16f357f78e
commit 70679110e2
1 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java
View File

@ -137,7 +137,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
} }
} }
// else if("manual".equals(unActivate.getOpenType())){ // else if("manual".equals(unActivate.getOpenType())){
// unActivate.setLabelContent("manual手动开通"); // unActivate.setLabelContent("manual手动开通");，
// } // }
} }
@ -213,7 +213,9 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
public void bindInviteUser(MkDistributionUserDTO param) { public void bindInviteUser(MkDistributionUserDTO param) {
ShopUser shopUser = shopUserService.getById(param.getId()); ShopUser shopUser = shopUserService.getById(param.getId());
AssertUtil.isNull(shopUser, "店铺用户不存在"); AssertUtil.isNull(shopUser, "店铺用户不存在");
AssertUtil.isNull(shopUser.getDistributionUserId(), "店铺用户已绑定分销员"); if(shopUser.getDistributionUserId() != null){
throw new CzgException("店铺用户已绑定分销员");
}
MkDistributionUser parent = getOne(QueryWrapper.create().eq(MkDistributionUser::getInviteCode, param.getInviteCode())); MkDistributionUser parent = getOne(QueryWrapper.create().eq(MkDistributionUser::getInviteCode, param.getInviteCode()));
AssertUtil.isNull(parent, "邀请人不存在"); AssertUtil.isNull(parent, "邀请人不存在");
ShopUser newShopUser = new ShopUser(); ShopUser newShopUser = new ShopUser();
@ -245,33 +247,33 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
} }
// /** /**
// * 按消费金额升级等级 * 按消费金额升级等级
// * *
// * @param distributionUserId 分销员Id * @param distributionUserId 分销员Id
// */ */
// public void costUpgradeLevel(Long distributionUserId) { public void costUpgradeLevel(Long distributionUserId) {
// MkDistributionUser distributionUser = getById(distributionUserId); MkDistributionUser distributionUser = getById(distributionUserId);
// if (distributionUser == null) { if (distributionUser == null) {
// return; return;
// } }
//
// MkDistributionConfig mkDistributionConfig = mkDistributionConfigService.getOne(QueryWrapper.create() MkDistributionConfig mkDistributionConfig = mkDistributionConfigService.getOne(QueryWrapper.create()
// .eq(MkDistributionConfig::getShopId, distributionUser.getShopId())); .eq(MkDistributionConfig::getShopId, distributionUser.getShopId()));
// AssertUtil.isNull(mkDistributionConfig, "升级失败,店铺未配置分销"); AssertUtil.isNull(mkDistributionConfig, "升级失败,店铺未配置分销");
// AssertUtil.isNotEqual(mkDistributionConfig.getUpgradeType(), "cost", "升级失败"); AssertUtil.isNotEqual(mkDistributionConfig.getUpgradeType(), "cost", "升级失败");
//
// MkDistributionLevelConfig levelConfig = levelConfigService.getOne(QueryWrapper.create() MkDistributionLevelConfig levelConfig = levelConfigService.getOne(QueryWrapper.create()
// .eq(MkDistributionLevelConfig::getShopId, distributionUser.getShopId()) .eq(MkDistributionLevelConfig::getShopId, distributionUser.getShopId())
// .le(MkDistributionLevelConfig::getInviteCount, distributionUser.getInviteCount()) .le(MkDistributionLevelConfig::getInviteCount, distributionUser.getInviteCount())
// .gt(MkDistributionLevelConfig::getId, distributionUser.getDistributionLevelId()) .gt(MkDistributionLevelConfig::getId, distributionUser.getDistributionLevelId())
// .orderBy(MkDistributionLevelConfig::getLevel).desc().limit(1)); .orderBy(MkDistributionLevelConfig::getLevel).desc().limit(1));
// if (levelConfig != null) { if (levelConfig != null) {
// distributionUser.setDistributionLevelId(levelConfig.getId()); distributionUser.setDistributionLevelId(levelConfig.getId());
// distributionUser.setDistributionLevelName(levelConfig.getName()); distributionUser.setDistributionLevelName(levelConfig.getName());
// } }
//
// } }
@Override @Override
public Page<MkDistributionUserDTO> getDistributionUser(MkDistributionUserDTO param) { public Page<MkDistributionUserDTO> getDistributionUser(MkDistributionUserDTO param) {