From 8dd6dfcd49b5c3dd6bbf4143686c580828a261d1 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 15 Dec 2025 14:57:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=BA=97=E9=93=BA=20?= =?UTF-8?q?=E6=97=A0=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98=20=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E6=A8=A1=E6=9D=BF=20=E5=85=B3=E9=97=AD=E5=8D=B4?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=97=AE=E9=A2=98=20=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=20=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/user/UDrainageConfigController.java | 11 +++++------ .../service/impl/AuthorizationServiceImpl.java | 5 +++-- .../account/service/impl/SysRoleServiceImpl.java | 2 +- .../market/service/impl/ChatCouponServiceImpl.java | 3 +-- .../service/impl/TbMemberConfigServiceImpl.java | 2 ++ 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/cash-api/market-server/src/main/java/com/czg/controller/user/UDrainageConfigController.java b/cash-api/market-server/src/main/java/com/czg/controller/user/UDrainageConfigController.java index b2b72e281..06aea34bf 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/user/UDrainageConfigController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/user/UDrainageConfigController.java @@ -1,17 +1,16 @@ package com.czg.controller.user; -import com.czg.annotation.SaAdminCheckPermission; -import com.czg.market.dto.MkDrainageConfigDTO; import com.czg.market.service.MkDrainageConfigService; import com.czg.market.vo.MkDrainageConfigVO; import com.czg.resp.CzgResult; -import com.czg.sa.StpKit; import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; /** - * 私域引流配置 + * 用户端/私域引流配置 * @author Administrator */ @RestController diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java index db2a20a21..ecc823637 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java @@ -208,7 +208,8 @@ public class AuthorizationServiceImpl implements AuthorizationService { Long headId = StpKit.USER.getHeadId(); long shopId = StpKit.USER.getLoginIdAsLong(); ShopInfo currentInfo = shopInfoService.getById(shopId); - if (headId != null && currentInfo.getIsHeadShop() != YesNoEnum.YES.value()) { +// if (headId != null && currentInfo.getIsHeadShop() != YesNoEnum.YES.value()) { + if (currentInfo.getIsHeadShop() != YesNoEnum.YES.value()) { throw new CzgException("登录账号无权限切换"); } @@ -217,7 +218,7 @@ public class AuthorizationServiceImpl implements AuthorizationService { throw new CzgException("用户不存在"); } - ShopInfo shopInfo = shopInfoService.getById(sysUser.getId()); + ShopInfo shopInfo = shopInfoService.getById(sysUserId); if (shopInfo == null) { throw new CzgException("店铺信息不存在"); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java index 4760fa390..d7df67ed2 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java @@ -251,7 +251,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl @Override @Transactional public Boolean saveByTemplate(long shopId, RoleSaveTemplateDTO dto) { - roleTemplateService.list(new QueryWrapper().eq(SysRoleTemplate::getPid, dto.getId())).forEach(item -> { + roleTemplateService.list(new QueryWrapper().eq(SysRoleTemplate::getPid, dto.getId()).eq(SysRoleTemplate::getIsEnable, 1)).forEach(item -> { SysRole role = getById(item.getRoleId()); role.setShopId(shopId); role.setCreateUserId(shopId); diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java index 1c12461d9..7e3b5ca45 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java @@ -79,14 +79,13 @@ public class ChatCouponServiceImpl extends ServiceImpl pageChatCoupon(Long shopId, Integer page, Integer size, Integer status) { - Page pages = pageAs(Page.of(page, size), + return pageAs(Page.of(page, size), QueryWrapper.create() .eq(ChatCoupon::getShopId, shopId) .eq(ChatCoupon::getStatus, status) .orderBy(ChatCoupon::getStatus).asc() .orderBy(ChatCoupon::getId).desc(), ChatCouponVO.class); - return pages; } /** diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java index 13d7581dd..376c3a204 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java @@ -41,6 +41,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; @@ -518,6 +519,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl