From 47bae409f9f2cd84805005c192c3baf232c1ff6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 23 Oct 2025 18:08:53 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czg/service/account/service/impl/AShopUserServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java index fa3548286..633923935 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java @@ -193,6 +193,7 @@ public class AShopUserServiceImpl implements AShopUserService { .limit(1).orderBy(MemberLevelConfig::getExperienceValue, true)); if (config != null) { shopUserDTO.setNextExperience(config.getExperienceValue() - (shopUser.getExperience() == null ? 0 : shopUser.getExperience())); + shopUserDTO.setNextExperience(shopUserDTO.getNextExperience() < 0 ? 0: shopUserDTO.getNextExperience()); shopUserDTO.setNextMemberLevelName(config.getName()); } return shopUserDTO; From 1f34a8c227a541011ab7b2d46fb88cbf98afb00b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 23 Oct 2025 18:16:17 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czg/service/account/service/impl/AShopUserServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java index 633923935..dd007630b 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java @@ -190,6 +190,7 @@ public class AShopUserServiceImpl implements AShopUserService { } MemberLevelConfig config = memberLevelConfigService.getOne(new QueryWrapper().eq(MemberLevelConfig::getShopId, mainId) .ge(MemberLevelConfig::getExperienceValue, memberLevelConfig == null ? null : memberLevelConfig.getExperienceValue()) + .ne(MemberLevelConfig::getId, shopUserDTO.getMemberLevelId()) .limit(1).orderBy(MemberLevelConfig::getExperienceValue, true)); if (config != null) { shopUserDTO.setNextExperience(config.getExperienceValue() - (shopUser.getExperience() == null ? 0 : shopUser.getExperience())); From 5853d2b333d7af9dffd73567d42b4d18e4e21304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Fri, 24 Oct 2025 09:35:38 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=89=80=E6=9C=89=E8=B7=9F=E4=BD=99?= =?UTF-8?q?=E9=A2=9D=E7=9B=B8=E5=85=B3=E6=A8=A1=E5=9D=97=E5=BC=80=E5=85=B3?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=BC=80=E5=90=AF=E5=85=B3=E9=97=AD=E4=BD=99?= =?UTF-8?q?=E9=A2=9D=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/account/entity/ShopConfig.java | 6 ++- .../account/service/ShopConfigService.java | 6 ++- .../impl/FreeDineConfigServiceImpl.java | 10 ++++ .../service/impl/ShopConfigServiceImpl.java | 46 ++++++++++++++++++- .../impl/MkConsumeCashbackServiceImpl.java | 7 +++ .../impl/MkShopRechargeServiceImpl.java | 9 ++++ 6 files changed, 80 insertions(+), 4 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopConfig.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopConfig.java index f598e1a98..a0f5f49c0 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopConfig.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopConfig.java @@ -5,6 +5,7 @@ import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; import lombok.Data; +import lombok.experimental.Accessors; import java.io.Serial; import java.io.Serializable; @@ -17,6 +18,7 @@ import java.io.Serializable; */ @Data @Table("tb_shop_config") +@Accessors(chain = true) public class ShopConfig implements Serializable { @Serial @@ -84,7 +86,7 @@ public class ShopConfig implements Serializable { */ private Integer isTableFee; /** - * 是否启用会员价 1-是 0-否 + * 是否启用会员价 1-是 0-否 */ private Integer isMemberPrice; /** @@ -104,4 +106,4 @@ public class ShopConfig implements Serializable { * '自动清台 支付几分钟后 默认10分钟后' */ private Integer tableClearTime; -} \ No newline at end of file +} diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopConfigService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopConfigService.java index cea58cb4e..565539b4e 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopConfigService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopConfigService.java @@ -2,6 +2,9 @@ package com.czg.account.service; import com.czg.account.entity.ShopConfig; import com.mybatisflex.core.service.IService; +import com.mybatisflex.core.util.LambdaGetter; + +import java.util.List; /** * 店铺配置扩展 @@ -11,4 +14,5 @@ import com.mybatisflex.core.service.IService; */ public interface ShopConfigService extends IService { -} \ No newline at end of file + void editStatusByShopIdList(Long mainShopId, Integer isEnable, LambdaGetter property, String useShopType, List shopIdList); +} diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java index 8e6f54b40..61a620a78 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java @@ -6,12 +6,16 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONArray; import com.czg.account.dto.freeding.FreeDineConfigEditDTO; import com.czg.account.entity.FreeDineConfig; +import com.czg.account.entity.ShopConfig; import com.czg.account.service.FreeDineConfigService; +import com.czg.account.service.ShopConfigService; import com.czg.account.vo.FreeDineConfigVO; import com.czg.exception.ApiNotPrintException; import com.czg.service.account.mapper.FreeDineConfigMapper; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; +import jakarta.annotation.Resource; +import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboService; /** @@ -22,6 +26,10 @@ import org.apache.dubbo.config.annotation.DubboService; */ @DubboService public class FreeDineConfigServiceImpl extends ServiceImpl implements FreeDineConfigService{ + + @DubboReference + private ShopConfigService shopConfigService; + @Override public FreeDineConfigVO getConfig(long shopId) { FreeDineConfig freeDineConfig = getOne(new QueryWrapper().eq(FreeDineConfig::getShopId, shopId)); @@ -52,6 +60,8 @@ public class FreeDineConfigServiceImpl extends ServiceImpl void editStatusByShopIdList(Long mainShopId, Integer isEnable, LambdaGetter property, String useShopType, List shopIdList) { + ShopConfig shopConfig = getOne(new QueryWrapper().eq(ShopConfig::getId, mainShopId)); + if (shopConfig == null) { + shopConfig = new ShopConfig(); + shopConfig.setId(mainShopId); + save(shopConfig); + } + + if (!shopIdList.isEmpty()) { + List extistList = list(new QueryWrapper().in(ShopConfig::getId, shopIdList).select(ShopConfig::getId)).stream().map(ShopConfig::getId).toList(); + shopIdList.stream().filter(id -> !extistList.contains(id)).forEach(id -> { + save(new ShopConfig().setId(id).setMainId(mainShopId)); + }); + } + + if (isEnable == 0) { + updateChain().or(or -> { + or.eq(ShopConfig::getMainId, mainShopId); + }).or(or -> { + or.in(ShopConfig::getId, shopIdList); + }).set(property, 0).update(); + }else { + if ("all".equals(useShopType)) { + updateChain().or(or -> { + or.eq(ShopConfig::getMainId, mainShopId); + }).or(or -> { + or.in(ShopConfig::getId, shopIdList); + }).set(property, 1).update(); + }else { + if (shopIdList.isEmpty()) { + updateChain().eq(ShopConfig::getMainId, mainShopId).set(property, 1).update(); + }else { + updateChain().notIn(ShopConfig::getId, shopIdList).set(property, 0).update(); + updateChain().in(ShopConfig::getId, shopIdList).set(property, 1).update(); + } + } + } + + } + +} diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java index 24120e3d7..30299e911 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java @@ -5,8 +5,10 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONArray; import com.czg.account.dto.shopuser.ShopUserMoneyEditDTO; +import com.czg.account.entity.ShopConfig; import com.czg.account.entity.ShopInfo; import com.czg.account.entity.ShopUser; +import com.czg.account.service.ShopConfigService; import com.czg.account.service.ShopInfoService; import com.czg.account.service.ShopUserService; import com.czg.constant.TableValueConstant; @@ -53,6 +55,8 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl Date: Fri, 24 Oct 2025 09:47:00 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/service/impl/MkBirthdayGiftServiceImpl.java | 6 ++++++ .../market/service/impl/MkConsumeCashbackServiceImpl.java | 6 ++++++ .../market/service/impl/MkConsumeDiscountServiceImpl.java | 6 ++++++ .../market/service/impl/MkEnableConfigServiceImpl.java | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkBirthdayGiftServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkBirthdayGiftServiceImpl.java index cd34e6202..b1a14c198 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkBirthdayGiftServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkBirthdayGiftServiceImpl.java @@ -32,6 +32,9 @@ import com.czg.service.market.mapper.MkBirthdayGiftMapper; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; 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.time.LocalDate; @@ -52,6 +55,7 @@ import java.util.stream.Collectors; */ @Slf4j @Service +@CacheConfig(cacheNames = "birthdayGift") public class MkBirthdayGiftServiceImpl extends ServiceImpl implements MkBirthdayGiftService { @Resource private MkBirthdayGiftRecordService birthdayGiftRecordService; @@ -72,6 +76,7 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl implements MkConsumeCashbackService { @DubboReference private ShopInfoService shopInfoService; @@ -61,6 +65,7 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl implements MkConsumeDiscountService { @Override + @Cacheable(key = "#shopId") public MkConsumeDiscountVO detail(Long shopId) { MkConsumeDiscount consumeDiscount = getOne(new QueryWrapper().eq(MkConsumeDiscount::getShopId, shopId)); if (consumeDiscount == null) { @@ -47,6 +52,7 @@ public class MkConsumeDiscountServiceImpl extends ServiceImpl implements MkEnableConfigService{ @Override + @Cacheable(key = "#mainShopId + ':' + #shopId") public MkEnableConfigVO detail(Long mainShopId, Long shopId, TableValueConstant.EnableConfig.Type type) { MkEnableConfig one = getOne(new QueryWrapper().eq(MkEnableConfig::getMainShopId, mainShopId).eq(MkEnableConfig::getType, type.getCode())); if (one == null) { @@ -43,6 +48,7 @@ public class MkEnableConfigServiceImpl extends ServiceImpl Date: Fri, 24 Oct 2025 09:54:57 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BD=99=E9=A2=9D=E5=BC=80=E5=85=B3?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=A8=A1=E5=9D=97=E5=BD=B1=E5=93=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/account/service/ShopConfigService.java | 2 +- .../account/service/impl/FreeDineConfigServiceImpl.java | 2 +- .../account/service/impl/ShopConfigServiceImpl.java | 8 +++++--- .../market/service/impl/MkConsumeCashbackServiceImpl.java | 2 +- .../market/service/impl/MkShopRechargeServiceImpl.java | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopConfigService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopConfigService.java index 565539b4e..aae84f595 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopConfigService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopConfigService.java @@ -14,5 +14,5 @@ import java.util.List; */ public interface ShopConfigService extends IService { - void editStatusByShopIdList(Long mainShopId, Integer isEnable, LambdaGetter property, String useShopType, List shopIdList); + void editStatusByShopIdList(Long mainShopId, Integer isEnable, boolean onyUpValid, LambdaGetter property, String useShopType, List shopIdList); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java index 61a620a78..3c2b2eea8 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java @@ -61,7 +61,7 @@ public class FreeDineConfigServiceImpl extends ServiceImpl void editStatusByShopIdList(Long mainShopId, Integer isEnable, LambdaGetter property, String useShopType, List shopIdList) { + public void editStatusByShopIdList(Long mainShopId, Integer isEnable, boolean onyUpValid, LambdaGetter property, String useShopType, List shopIdList) { ShopConfig shopConfig = getOne(new QueryWrapper().eq(ShopConfig::getId, mainShopId)); if (shopConfig == null) { shopConfig = new ShopConfig(); @@ -56,7 +56,7 @@ public class ShopConfigServiceImpl extends ServiceImpl { or.eq(ShopConfig::getMainId, mainShopId); }).or(or -> { @@ -73,7 +73,9 @@ public class ShopConfigServiceImpl extends ServiceImpl Date: Fri, 24 Oct 2025 10:03:26 +0800 Subject: [PATCH 6/8] =?UTF-8?q?dubbo=E6=97=A0=E6=B3=95=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E5=8C=96lambda=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/czg/account/service/ShopConfigService.java | 2 +- .../service/account/service/impl/FreeDineConfigServiceImpl.java | 2 +- .../czg/service/account/service/impl/ShopConfigServiceImpl.java | 2 +- .../market/service/impl/MkConsumeCashbackServiceImpl.java | 2 +- .../service/market/service/impl/MkShopRechargeServiceImpl.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopConfigService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopConfigService.java index aae84f595..b7575e4e3 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopConfigService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopConfigService.java @@ -14,5 +14,5 @@ import java.util.List; */ public interface ShopConfigService extends IService { - void editStatusByShopIdList(Long mainShopId, Integer isEnable, boolean onyUpValid, LambdaGetter property, String useShopType, List shopIdList); + void editStatusByShopIdList(Long mainShopId, Integer isEnable, boolean onyUpValid, String name, String useShopType, List shopIdList); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java index 3c2b2eea8..048262f2f 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java @@ -61,7 +61,7 @@ public class FreeDineConfigServiceImpl extends ServiceImpl void editStatusByShopIdList(Long mainShopId, Integer isEnable, boolean onyUpValid, LambdaGetter property, String useShopType, List shopIdList) { + public void editStatusByShopIdList(Long mainShopId, Integer isEnable, boolean onyUpValid, String property, String useShopType, List shopIdList) { ShopConfig shopConfig = getOne(new QueryWrapper().eq(ShopConfig::getId, mainShopId)); if (shopConfig == null) { shopConfig = new ShopConfig(); diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java index fa81e3054..8c27a07dc 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeCashbackServiceImpl.java @@ -101,7 +101,7 @@ public class MkConsumeCashbackServiceImpl extends ServiceImpl Date: Fri, 24 Oct 2025 10:09:37 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=BA=97=E9=93=BA=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=BC=9A=E5=91=98=E6=8A=98=E6=89=A3=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/czg/account/entity/ShopUser.java | 3 +++ .../account/service/impl/ShopUserServiceImpl.java | 12 ++++++++++++ 2 files changed, 15 insertions(+) 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 410cd1ebd..d5962414a 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 @@ -153,7 +153,10 @@ public class ShopUser implements Serializable { private LocalDateTime deliverTime; private LocalDateTime nextDeliverTime; + @Column(ignore = true) private String memberName; private String openType; + @Column(ignore = true) + private Integer discount; } 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 225f2385d..8921bd9fc 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 @@ -12,11 +12,14 @@ import com.czg.account.service.ShopUserService; import com.czg.account.service.UserInfoService; import com.czg.enums.ShopUserFlowBizEnum; import com.czg.exception.ApiNotPrintException; +import com.czg.market.entity.MemberLevelConfig; +import com.czg.market.service.MemberLevelConfigService; import com.czg.service.account.mapper.ShopUserMapper; import com.czg.utils.MyQueryWrapper; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; import jakarta.annotation.Resource; +import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.transaction.annotation.Transactional; @@ -40,6 +43,8 @@ public class ShopUserServiceImpl extends ServiceImpl i private UserInfoService userInfoService; @Resource private ShopInfoService shopInfoService; + @DubboReference + private MemberLevelConfigService memberLevelConfigService; private ShopUser getUserInfo(Long shopUserId) { ShopUser shopUser = queryChain().eq(ShopUser::getId, shopUserId).one(); @@ -73,6 +78,13 @@ public class ShopUserServiceImpl extends ServiceImpl i shopUser.setId(null); save(shopUser); } + if (shopUser.getMemberLevelId() != null) { + MemberLevelConfig memberLevelConfig = memberLevelConfigService.getById(shopUser.getMemberLevelId()); + if (memberLevelConfig != null) { + shopUser.setMemberName(memberLevelConfig.getName()); + shopUser.setDiscount(memberLevelConfig.getDiscount()); + } + } return shopUser; } From ee219f637c8fb65b592f16ff00863b48f9a35545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Fri, 24 Oct 2025 14:59:53 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=BA=97=E9=93=BA=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=BC=9A=E5=91=98=E6=8A=98=E6=89=A3=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/account/entity/ShopUser.java | 2 ++ .../service/account/service/impl/ShopUserServiceImpl.java | 6 ++++++ 2 files changed, 8 insertions(+) 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 d5962414a..b8a42cf2f 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 @@ -158,5 +158,7 @@ public class ShopUser implements Serializable { private String openType; @Column(ignore = true) private Integer discount; + @Column(ignore = true) + private Integer isMemberPrice; } 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 8921bd9fc..b50eb5248 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 @@ -14,6 +14,8 @@ import com.czg.enums.ShopUserFlowBizEnum; import com.czg.exception.ApiNotPrintException; import com.czg.market.entity.MemberLevelConfig; import com.czg.market.service.MemberLevelConfigService; +import com.czg.market.service.TbMemberConfigService; +import com.czg.market.vo.MemberConfigVO; import com.czg.service.account.mapper.ShopUserMapper; import com.czg.utils.MyQueryWrapper; import com.mybatisflex.core.query.QueryWrapper; @@ -45,6 +47,8 @@ public class ShopUserServiceImpl extends ServiceImpl i private ShopInfoService shopInfoService; @DubboReference private MemberLevelConfigService memberLevelConfigService; + @DubboReference + private TbMemberConfigService memberConfigService; private ShopUser getUserInfo(Long shopUserId) { ShopUser shopUser = queryChain().eq(ShopUser::getId, shopUserId).one(); @@ -83,6 +87,8 @@ public class ShopUserServiceImpl extends ServiceImpl i if (memberLevelConfig != null) { shopUser.setMemberName(memberLevelConfig.getName()); shopUser.setDiscount(memberLevelConfig.getDiscount()); + MemberConfigVO configVO = memberConfigService.detail(memberLevelConfig.getShopId()); + shopUser.setIsMemberPrice(configVO.getIsMemberPrice()); } } return shopUser;