From f617343a0193bfac8ff93ae1c1523046dd0a957f Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 5 Nov 2025 10:31:06 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=B8=8D=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E6=97=B6=20=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czg/service/system/service/impl/SysParamsServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cash-service/system-service/src/main/java/com/czg/service/system/service/impl/SysParamsServiceImpl.java b/cash-service/system-service/src/main/java/com/czg/service/system/service/impl/SysParamsServiceImpl.java index 2ca3a05e..47ad6b69 100644 --- a/cash-service/system-service/src/main/java/com/czg/service/system/service/impl/SysParamsServiceImpl.java +++ b/cash-service/system-service/src/main/java/com/czg/service/system/service/impl/SysParamsServiceImpl.java @@ -10,6 +10,7 @@ import com.czg.system.service.SysParamsService; import com.czg.utils.AssertUtil; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; +import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; @@ -23,6 +24,7 @@ import java.util.List; * @author mac * @since 2025-02-07 */ +@Slf4j @DubboService @CacheConfig(cacheNames = "params") public class SysParamsServiceImpl extends ServiceImpl implements SysParamsService { @@ -110,6 +112,7 @@ public class SysParamsServiceImpl extends ServiceImpl Date: Wed, 5 Nov 2025 13:59:42 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E5=88=86=E9=94=80=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/controller/admin/MenuController.java | 2 +- .../service/impl/MkDistributionConfigServiceImpl.java | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/MenuController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/MenuController.java index e937a41e..8d223247 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/MenuController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/MenuController.java @@ -55,7 +55,7 @@ public class MenuController { @SaAdminCheckPermission(value = "menu:list", name = "菜单列表") @GetMapping("/list") public CzgResult> all(String title, String startTime, String endTime) { - return CzgResult.success(menuService.getAll(title, startTime, endTime)); + return CzgResult.success(menuService.getAll(title, startTime, endTime)); } /** 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 e8855e1f..991608ee 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 @@ -66,6 +66,12 @@ public class MkDistributionConfigServiceImpl extends ServiceImpl distributionUserList = distributionUserService.list(new QueryWrapper().eq(MkDistributionUser::getShopId, shopId)); // 邀请人数变动 if (!config.getInviteCount().equals(dto.getInviteCount())) { @@ -80,12 +86,13 @@ public class MkDistributionConfigServiceImpl extends ServiceImpl { - distributionUserService.initLevel(config, item); + distributionUserService.initLevel(finalConfig, item); }); distributionUserService.updateBatch(distributionUserList); } From 608921b366f27a7d4c372a113702d9c45bda1586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Wed, 5 Nov 2025 14:19:47 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E9=9C=B8=E7=8E=8B=E9=A4=90=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/service/impl/FreeDineConfigServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 048262f2..7631e30f 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 @@ -18,6 +18,8 @@ import jakarta.annotation.Resource; import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboService; +import java.util.ArrayList; + /** * 霸王餐配置信息表 服务层实现。 * @@ -61,7 +63,7 @@ public class FreeDineConfigServiceImpl extends ServiceImpl() : freeDineConfigEditDTO.getShopIdList()); if (freeDineConfigEditDTO.getUseType() != null) { config.setUseType(JSONObject.toJSONString(freeDineConfigEditDTO.getUseType())); } From 6530f24f2aa95465664c9154258b14dc394819ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Wed, 5 Nov 2025 15:18:39 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E8=BF=94=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/market/dto/MkConsumeCashbackDTO.java | 1 - 1 file changed, 1 deletion(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkConsumeCashbackDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkConsumeCashbackDTO.java index 46b1de05..44b7ba68 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkConsumeCashbackDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkConsumeCashbackDTO.java @@ -43,7 +43,6 @@ public class MkConsumeCashbackDTO implements Serializable { /** * 门店列表 */ - @NotEmpty(message = "门店列表不为空") private List shopIdList; /** From fe0c9f26c7deea3b5948e15613def00bc843a592 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Wed, 5 Nov 2025 15:22:50 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E8=BF=94=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/service/impl/ShopConfigServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopConfigServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopConfigServiceImpl.java index e8a60c8c..967a826a 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopConfigServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopConfigServiceImpl.java @@ -55,6 +55,9 @@ public class ShopConfigServiceImpl extends ServiceImpl(); + } // 防止报错 shopIdList.add(-9999L); List extistList; @@ -68,17 +71,19 @@ public class ShopConfigServiceImpl extends ServiceImpl finalShopIdList = shopIdList; updateChain().or(or -> { or.eq(ShopConfig::getId, mainShopId); }).or(or -> { - or.in(ShopConfig::getId, shopIdList); + or.in(ShopConfig::getId, finalShopIdList); }).set(property, 0).update(); }else { if ("all".equals(useShopType)) { + List finalShopIdList1 = shopIdList; updateChain().or(or -> { or.eq(ShopConfig::getId, mainShopId); }).or(or -> { - or.in(ShopConfig::getId, shopIdList); + or.in(ShopConfig::getId, finalShopIdList1); }).set(property, 1).update(); }else { if (shopIdList.isEmpty()) { From 3ea25c831ecce39f1400a0e651c0ef48248e7eb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Wed, 5 Nov 2025 16:04:53 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/market/service/impl/MkEnableConfigServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkEnableConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkEnableConfigServiceImpl.java index a0a7fe5d..7ea3f5b3 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkEnableConfigServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkEnableConfigServiceImpl.java @@ -29,7 +29,6 @@ import org.springframework.stereotype.Service; public class MkEnableConfigServiceImpl 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) { @@ -48,7 +47,6 @@ public class MkEnableConfigServiceImpl extends ServiceImpl Date: Wed, 5 Nov 2025 16:40:40 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E5=88=86=E9=94=80=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/service/impl/MkDistributionConfigServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 991608ee..94aa1510 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 @@ -52,7 +52,10 @@ public class MkDistributionConfigServiceImpl extends ServiceImpl Date: Wed, 5 Nov 2025 17:06:43 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E5=88=86=E9=94=80=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/controller/admin/DistributionController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java index e1aec208..834fa182 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java @@ -56,7 +56,6 @@ public class DistributionController { * @return 是否成功 */ @SaAdminCheckPermission(value = "distribution:edit", name = "分销修改") - @SaCheckMainShop @PutMapping public CzgResult edit( @RequestBody MkDistributionConfigDTO dto) { return CzgResult.success(configService.edit(StpKit.USER.getShopId(), dto)); From 353b170975e45cbbf00349b756938c55d1b8d962 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Wed, 5 Nov 2025 14:19:47 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E9=9C=B8=E7=8E=8B=E9=A4=90=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/service/impl/FreeDineConfigServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 048262f2..7631e30f 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 @@ -18,6 +18,8 @@ import jakarta.annotation.Resource; import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboService; +import java.util.ArrayList; + /** * 霸王餐配置信息表 服务层实现。 * @@ -61,7 +63,7 @@ public class FreeDineConfigServiceImpl extends ServiceImpl() : freeDineConfigEditDTO.getShopIdList()); if (freeDineConfigEditDTO.getUseType() != null) { config.setUseType(JSONObject.toJSONString(freeDineConfigEditDTO.getUseType())); } From d9d92011e5e541d10c7a9b9424676f2bed8d8e8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Wed, 5 Nov 2025 15:18:39 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E8=BF=94=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/market/dto/MkConsumeCashbackDTO.java | 1 - 1 file changed, 1 deletion(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkConsumeCashbackDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkConsumeCashbackDTO.java index 46b1de05..44b7ba68 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkConsumeCashbackDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkConsumeCashbackDTO.java @@ -43,7 +43,6 @@ public class MkConsumeCashbackDTO implements Serializable { /** * 门店列表 */ - @NotEmpty(message = "门店列表不为空") private List shopIdList; /** From 181064a38c53bfa8540b6d8e2a881dfe6744952d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Wed, 5 Nov 2025 15:22:50 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E8=BF=94=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/service/impl/ShopConfigServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopConfigServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopConfigServiceImpl.java index e8a60c8c..967a826a 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopConfigServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopConfigServiceImpl.java @@ -55,6 +55,9 @@ public class ShopConfigServiceImpl extends ServiceImpl(); + } // 防止报错 shopIdList.add(-9999L); List extistList; @@ -68,17 +71,19 @@ public class ShopConfigServiceImpl extends ServiceImpl finalShopIdList = shopIdList; updateChain().or(or -> { or.eq(ShopConfig::getId, mainShopId); }).or(or -> { - or.in(ShopConfig::getId, shopIdList); + or.in(ShopConfig::getId, finalShopIdList); }).set(property, 0).update(); }else { if ("all".equals(useShopType)) { + List finalShopIdList1 = shopIdList; updateChain().or(or -> { or.eq(ShopConfig::getId, mainShopId); }).or(or -> { - or.in(ShopConfig::getId, shopIdList); + or.in(ShopConfig::getId, finalShopIdList1); }).set(property, 1).update(); }else { if (shopIdList.isEmpty()) { From bde0552cf83a77ef05ae5a1dfe050896f8a0d2c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Wed, 5 Nov 2025 16:04:53 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/market/service/impl/MkEnableConfigServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkEnableConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkEnableConfigServiceImpl.java index a0a7fe5d..7ea3f5b3 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkEnableConfigServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkEnableConfigServiceImpl.java @@ -29,7 +29,6 @@ import org.springframework.stereotype.Service; public class MkEnableConfigServiceImpl 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) { @@ -48,7 +47,6 @@ public class MkEnableConfigServiceImpl extends ServiceImpl Date: Wed, 5 Nov 2025 16:40:40 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E5=88=86=E9=94=80=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/service/impl/MkDistributionConfigServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 991608ee..94aa1510 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 @@ -52,7 +52,10 @@ public class MkDistributionConfigServiceImpl extends ServiceImpl Date: Wed, 5 Nov 2025 17:06:43 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E5=88=86=E9=94=80=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/controller/admin/DistributionController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java index e1aec208..834fa182 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java @@ -56,7 +56,6 @@ public class DistributionController { * @return 是否成功 */ @SaAdminCheckPermission(value = "distribution:edit", name = "分销修改") - @SaCheckMainShop @PutMapping public CzgResult edit( @RequestBody MkDistributionConfigDTO dto) { return CzgResult.success(configService.edit(StpKit.USER.getShopId(), dto)); From 0a4a89edbb50a5256d737d2b4965a5cc62cbdfcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Wed, 5 Nov 2025 17:12:54 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E5=88=86=E9=94=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/service/impl/MkDistributionConfigServiceImpl.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/MkDistributionConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionConfigServiceImpl.java index 94aa1510..a857be86 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 @@ -77,7 +77,7 @@ public class MkDistributionConfigServiceImpl extends ServiceImpl distributionUserList = distributionUserService.list(new QueryWrapper().eq(MkDistributionUser::getShopId, shopId)); // 邀请人数变动 - if (!config.getInviteCount().equals(dto.getInviteCount())) { + if (config.getInviteCount() != null && !config.getInviteCount().equals(dto.getInviteCount())) { distributionUserList.forEach(item -> item.setStatus(item.getInviteCount() >= dto.getInviteCount() ? 1 : 0)); distributionUserService.updateBatch(distributionUserList); } From 8a99c54729a908b973dd1930b1e7d6833b40a3d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Wed, 5 Nov 2025 17:16:51 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E5=88=86=E9=94=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/service/impl/MkDistributionConfigServiceImpl.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/MkDistributionConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionConfigServiceImpl.java index a857be86..af91fd82 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 @@ -77,7 +77,7 @@ public class MkDistributionConfigServiceImpl extends ServiceImpl distributionUserList = distributionUserService.list(new QueryWrapper().eq(MkDistributionUser::getShopId, shopId)); // 邀请人数变动 - if (config.getInviteCount() != null && !config.getInviteCount().equals(dto.getInviteCount())) { + if (dto.getInviteCount() != null && !config.getInviteCount().equals(dto.getInviteCount())) { distributionUserList.forEach(item -> item.setStatus(item.getInviteCount() >= dto.getInviteCount() ? 1 : 0)); distributionUserService.updateBatch(distributionUserList); }