From 1d5ccbe74b3e86308c88e862bd0754e3bc98d86b Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 15 Dec 2025 14:59:46 +0800 Subject: [PATCH 1/3] =?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/admin/DrainageConfigController.java | 2 +- .../controller/user/UDrainageConfigController.java | 11 +++++------ .../service/impl/AuthorizationServiceImpl.java | 5 +++-- .../account/service/impl/SysRoleServiceImpl.java | 2 +- .../code-generator/src/main/java/com/czg/Main.java | 12 +++++++++++- .../market/service/impl/ChatCouponServiceImpl.java | 3 +-- .../service/impl/TbMemberConfigServiceImpl.java | 2 ++ 7 files changed, 24 insertions(+), 13 deletions(-) diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/DrainageConfigController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/DrainageConfigController.java index dbc1cd28d..29e2a8172 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/DrainageConfigController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/DrainageConfigController.java @@ -11,7 +11,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; /** - * 私域引流配置 + * 管理端/私域引流配置 * * @author Administrator */ 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/code-generator/src/main/java/com/czg/Main.java b/cash-service/code-generator/src/main/java/com/czg/Main.java index bc4f08ed0..05740f184 100644 --- a/cash-service/code-generator/src/main/java/com/czg/Main.java +++ b/cash-service/code-generator/src/main/java/com/czg/Main.java @@ -1,5 +1,6 @@ package com.czg; +import cn.hutool.crypto.SecureUtil; import com.czg.market.entity.MkLimitTimeDiscount; import com.mybatisflex.codegen.Generator; import com.mybatisflex.codegen.config.*; @@ -27,6 +28,8 @@ public class Main { public static void main(String[] args) { //or条件sql写法示例 // orSqlTest(); + //修改密码 +// getPassword(1L, "czg2303"); // String packageName = "system"; @@ -39,7 +42,7 @@ public class Main { //是否生成DTO实体 默认生成 boolean isGenerateDto = true; - initTableEntity(packageName, tableName, author, isGenerateDto); +// initTableEntity(packageName, tableName, author, isGenerateDto); } public static void initTableEntity(String packageName, String tableName, String author, boolean isGenerateDto) { @@ -252,4 +255,11 @@ public class Main { return globalConfig; } + + public static void getPassword(Long sysUserId, String accountPwd) { + System.out.println("将生成的密码 替换sys_user表中的密码即可"); + System.out.println(SecureUtil.md5(sysUserId + accountPwd)); + System.out.println("-------------------------------------"); + } + } 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 Date: Mon, 15 Dec 2025 15:32:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/sa/MyStpLogic.java | 42 ++++++++++--------- .../impl/AuthorizationServiceImpl.java | 9 +--- 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java b/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java index 3137c9052..cf76a8563 100644 --- a/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java +++ b/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java @@ -35,7 +35,6 @@ public class MyStpLogic { } - public enum LoginType { MANAGER, USER, STAFF } @@ -71,26 +70,29 @@ public class MyStpLogic { */ public void switchTo(boolean isMain, Long id, String account, Long shopId, String shopName, LoginType loginType, boolean isAdmin) { StpLogic logic = getLogic(); - long headId = logic.getLoginIdAsLong(); - // 设置主店id - Object mainShopId = logic.getSession().get("mainShopId"); SaSession session = logic.getSession(); - Object parentId1 = session.get("headShopId"); - logic.getSaTokenDao().set(splicingKeyTokenValue(logic.getTokenValue()), id.toString(), logic.getTokenTimeout()); - session = logic.getSession(); - if (session == null) { - logic.createLoginSession(id); - session = logic.getSession(); - } - // 主店没有headShopId - if (!isMain && parentId1 == null) { - session.set("headId", headId); - } - - session.set("userId", id).set("isAdmin", isAdmin).set("isManager", loginType.equals(LoginType.MANAGER)) - .set("loginType", loginType).set("account", account).set("shopId", shopId).set("shopName", shopName) - .set("isMainShop", isMain) - .set("mainShopId", mainShopId); + session.set("shopId", shopId).set("shopName", shopName); + +// long headId = logic.getLoginIdAsLong(); +// // 设置主店id +// Object mainShopId = logic.getSession().get("mainShopId"); +// +// Object parentId1 = session.get("headShopId"); +// logic.getSaTokenDao().set(splicingKeyTokenValue(logic.getTokenValue()), id.toString(), logic.getTokenTimeout()); +// session = logic.getSession(); +// if (session == null) { +// logic.createLoginSession(id); +// session = logic.getSession(); +// } +// // 主店没有headShopId +// if (!isMain && parentId1 == null) { +// session.set("headId", headId); +// } +// +// session.set("userId", id).set("isAdmin", isAdmin).set("isManager", loginType.equals(LoginType.MANAGER)) +// .set("loginType", loginType).set("account", account).set("shopId", shopId).set("shopName", shopName) +// .set("isMainShop", isMain) +// .set("mainShopId", mainShopId); } /** 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 ecc823637..80f8e9549 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 @@ -76,10 +76,6 @@ public class AuthorizationServiceImpl implements AuthorizationService { return Map.of("code", captcha.toBase64(), "uuid", captchaKey); } - public static void main(String[] args) { - System.out.println(DateUtil.format(DateUtil.date(), "HHmm")); - } - @Override public LoginVO login(SysLoginDTO loginDTO, String platType) { Object code = redisService.get(RedisCst.LOGIN_CODE + loginDTO.uuid()); @@ -208,8 +204,7 @@ 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 (currentInfo.getIsHeadShop() != YesNoEnum.YES.value()) { + if (headId != null && currentInfo.getIsHeadShop() != YesNoEnum.YES.value()) { throw new CzgException("登录账号无权限切换"); } @@ -224,7 +219,7 @@ public class AuthorizationServiceImpl implements AuthorizationService { } // 主店铺切换子店铺 - if (headId != null && !shopInfo.getMainId().equals(shopId)) { + if (!shopInfo.getMainId().equals(shopId)) { throw new CzgException("目标店铺非登录账号所有"); } From 53d8100734cbc27ace06b5361ef696b90d3091d6 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 15 Dec 2025 15:37:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/account/service/impl/AuthorizationServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 80f8e9549..ee2fe7c83 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 @@ -219,7 +219,7 @@ public class AuthorizationServiceImpl implements AuthorizationService { } // 主店铺切换子店铺 - if (!shopInfo.getMainId().equals(shopId)) { + if (shopInfo.getMainId() != null && !shopInfo.getMainId().equals(shopId)) { throw new CzgException("目标店铺非登录账号所有"); }