Merge branch 'prod' into test

cash-api/account-server/src/main/java/com/czg/controller/admin/RoleController.java

@@ -34,7 +34,7 @@ public class RoleController {
      * @param pageDTO 分页信息
      * @return 分页数据
      */
-    @SaAdminCheckPermission(parentName = "角色管理", value = "role:list", name = "角色列表")
+    @SaAdminCheckPermission(parentName = "角色管理接口", value = "role:list", name = "角色列表")
     @GetMapping("/list")
     public CzgResult<Page<SysRole>> getList(PageDTO pageDTO, String key, String startTime, String endTime) {
         return CzgResult.success(roleService.getList(StpKit.USER.getShopId(), pageDTO, key, startTime, endTime));
@@ -48,10 +48,10 @@ public class RoleController {
      * @param type 0管理端 1收银机
      * @return 分页数据
      */
-    @SaAdminCheckPermission(parentName = "角色管理", value = "role:menu", name = "角色菜单")
+    @SaAdminCheckPermission(parentName = "角色管理接口", value = "role:menu", name = "角色菜单")
     @GetMapping("/menu")
     public CzgResult<List<Long>> getRoleMenu(@RequestParam Integer id, @RequestParam Integer type) {
-        return CzgResult.success(roleService.getRoleMenu(StpKit.USER.getLoginIdAsLong(), id, type));
+        return CzgResult.success(roleService.getRoleMenu(StpKit.USER.getShopId(), id, type));
     }
 
     /**
@@ -61,7 +61,7 @@ public class RoleController {
      * @param roleAddDTO 角色信息
      * @return 是否成功
      */
-    @SaAdminCheckPermission(parentName = "角色管理", value = "role:add", name = "角色添加")
+    @SaAdminCheckPermission(parentName = "角色管理接口", value = "role:add", name = "角色添加")
     @PostMapping
     public CzgResult<Boolean> add(@RequestBody @Validated RoleAddDTO roleAddDTO) {
         return CzgResult.success(roleService.add(roleAddDTO));
@@ -75,7 +75,7 @@ public class RoleController {
      */
     @PutMapping("/permission")
     public CzgResult<Boolean> editPermission(@RequestBody @Validated RolePermissionDTO rolePermissionDTO) {
-        return CzgResult.success(roleService.editPermission(StpKit.USER.getLoginIdAsLong(), rolePermissionDTO));
+        return CzgResult.success(roleService.editPermission(StpKit.USER.getShopId(), rolePermissionDTO));
     }
 
     /**
@@ -85,7 +85,7 @@ public class RoleController {
      * @param roleEditDTO 角色信息
      * @return 是否成功
      */
-    @SaAdminCheckPermission(parentName = "角色管理", value = "role:edit", name = "角色编辑")
+    @SaAdminCheckPermission(parentName = "角色管理接口", value = "role:edit", name = "角色编辑")
     @PutMapping
     public CzgResult<Boolean> edit(@RequestBody @Validated RoleEditDTO roleEditDTO) {
         return CzgResult.success(roleService.edit(roleEditDTO));
@@ -98,7 +98,7 @@ public class RoleController {
      * @param roleRemoveDTO 角色信息
      * @return 是否成功
      */
-    @SaAdminCheckPermission(parentName = "角色管理", value = "role:remove", name = "角色删除")
+    @SaAdminCheckPermission(parentName = "角色管理接口", value = "role:remove", name = "角色删除")
     @DeleteMapping
     public CzgResult<Boolean> remove(@RequestBody @Validated RoleRemoveDTO roleRemoveDTO) {
         if (roleRemoveDTO.id() == 1L || roleRemoveDTO.id() == 2L) {

cash-api/account-server/src/main/java/com/czg/controller/admin/ShopInfoController.java

@@ -38,7 +38,7 @@ public class ShopInfoController {
      * 权限标识: shopInfo:list
      */
     @SaAdminCheckRole("管理员")
-    @SaAdminCheckPermission(parentName = "店铺管理", value = "shopInfo:list", name = "店铺列表")
+    @SaAdminCheckPermission(parentName = "店铺管理接口", value = "shopInfo:list", name = "店铺列表")
     @GetMapping
     public CzgResult<Page<ShopInfo>> get(PageDTO pageDTO, String shopName, Integer status, Integer isHeadShop) {
         return CzgResult.success(shopInfoService.get(pageDTO, shopName, status, isHeadShop));
@@ -71,7 +71,7 @@ public class ShopInfoController {
      * 权限标识: shopInfo:add
      */
     @SaAdminCheckRole("管理员")
-    @SaAdminCheckPermission(parentName = "店铺管理", value = "shopInfo:add", name = "店铺添加")
+    @SaAdminCheckPermission(parentName = "店铺管理接口", value = "shopInfo:add", name = "店铺添加")
     @PostMapping
     public CzgResult<?> add(@RequestBody @Validated ShopInfoAddDTO shopInfoAddDTO) {
         return CzgResult.success(shopInfoService.add(shopInfoAddDTO));
@@ -81,7 +81,7 @@ public class ShopInfoController {
      * 店铺编辑
      * 权限标识: shopInfo:edit
      */
-    @SaAdminCheckPermission(parentName = "店铺管理", value = "shopInfo:edit", name = "店铺编辑")
+    @SaAdminCheckPermission(parentName = "店铺管理接口", value = "shopInfo:edit", name = "店铺编辑")
     @PutMapping
     public CzgResult<?> edit(@RequestBody @Validated ShopInfoEditDTO shopInfoEditDTO) {
         return CzgResult.success(shopInfoService.edit(shopInfoEditDTO));
@@ -92,7 +92,7 @@ public class ShopInfoController {
      * 权限标识: shopInfo:del
      */
     @SaAdminCheckRole("管理员")
-    @SaAdminCheckPermission(parentName = "店铺管理", value = "shopInfo:del", name = "店铺删除")
+    @SaAdminCheckPermission(parentName = "店铺管理接口", value = "shopInfo:del", name = "店铺删除")
     @DeleteMapping
     public CzgResult<?> delete(@RequestParam Integer id) {
         return CzgResult.success(shopInfoService.remove(new QueryWrapper().eq(ShopInfo::getId, id)));

cash-common/cash-common-service/src/main/java/com/czg/TimeQueryParam.java

@@ -2,11 +2,13 @@ package com.czg;
 
 import com.czg.utils.CzgStrUtils;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * @author ww
  * @description
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class TimeQueryParam extends BaseQueryParam {
     /**

cash-common/cash-common-service/src/main/java/com/czg/account/service/SysRoleService.java

@@ -27,9 +27,9 @@ public interface SysRoleService extends IService<SysRole> {
 
     Boolean edit(RoleEditDTO roleEditDTO);
 
-    List<Long> getRoleMenu(long loginIdAsLong, Integer id, Integer type);
+    List<Long> getRoleMenu(long shopId, Integer id, Integer type);
 
-    Boolean editPermission(long userId, RolePermissionDTO rolePermissionDTO);
+    Boolean editPermission(long shopId, RolePermissionDTO rolePermissionDTO);
 
     Boolean saveByTemplate(long shopId, RoleSaveTemplateDTO dto);
 

cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionUserDTO.java

@@ -1,26 +1,25 @@
 
 package com.czg.market.dto;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.sql.Timestamp;
-
 import com.czg.TimeQueryParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 /**
  * 分销员表 实体类。
  *
  * @author ww
  * @since 2025-10-27
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @NoArgsConstructor
 @AllArgsConstructor

cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkPointsGoodsRecordDTO.java

@@ -1,17 +1,14 @@
 
 package com.czg.market.dto;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.czg.BaseQueryParam;
 import com.czg.market.entity.MkPointsGoodsRecord;
-import lombok.experimental.Accessors;
-import java.io.Serial;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
 
 /**
  * 积分兑换记录 实体类。
@@ -19,6 +16,7 @@ import lombok.NoArgsConstructor;
  * @author ww
  * @since 2025-12-08
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @NoArgsConstructor
 @AllArgsConstructor

cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkPointsGoodsRecordQueryDTO.java

@@ -4,6 +4,7 @@ package com.czg.market.dto;
 import com.czg.TimeQueryParam;
 import com.czg.utils.CzgStrUtils;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -14,6 +15,7 @@ import java.io.Serializable;
  * @author ww
  * @since 2025-12-08
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class MkPointsGoodsRecordQueryDTO extends TimeQueryParam implements Serializable {
 

cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsMoneyDetailDto.java

@@ -2,6 +2,7 @@ package com.czg.market.dto;
 
 import com.czg.TimeQueryParam;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 平台查看 商家短信余额明细
@@ -9,6 +10,7 @@ import lombok.Data;
  * @author ww
  * @description
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class SmsMoneyDetailDto extends TimeQueryParam {
     // 1 充值 2 扣款

cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsTemplateQueryDTO.java

@@ -2,12 +2,14 @@ package com.czg.market.dto;
 
 import com.czg.TimeQueryParam;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 平台 商家申请记录查询参数
  * @author ww
  * @description 平台 商家申请记录查询参数
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class SmsTemplateQueryDTO extends TimeQueryParam {
     private Integer status;

cash-common/cash-common-service/src/main/java/com/czg/market/entity/SysRoleTemplate.java

@@ -4,17 +4,14 @@ import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-import java.io.Serial;
-import java.util.ArrayList;
-import java.util.List;
-
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 角色模板 实体类。
@@ -23,7 +20,6 @@ import lombok.NoArgsConstructor;
  * @since 2025-12-08
  */
 @Data
-@Builder
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("sys_role_template")

cash-common/cash-common-service/src/main/java/com/czg/market/vo/SmsShopMoneyVO.java

@@ -2,11 +2,13 @@ package com.czg.market.vo;
 
 import com.czg.market.entity.SmsShopMoney;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * @author ww
  * @description
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class SmsShopMoneyVO extends SmsShopMoney {
 

cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java

@@ -22,7 +22,6 @@ import java.time.LocalDateTime;
  * @since 2025-11-20
  */
 @Data
-@Builder
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_shop_order_statistic")

cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java

@@ -105,9 +105,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     @Override
     public Page<SysRole> getList(Long shopId, PageDTO pageDTO, String key, String startTime, String endTime) {
         QueryWrapper queryWrapper = new QueryWrapper();
-//        if (!StpKit.USER.isAdmin()) {
+        queryWrapper.eq(SysRole::getShopId, shopId);
-        queryWrapper.eq(SysRole::getCreateUserId, StpKit.USER.getLoginIdAsLong());
-//        }
 
         if (StrUtil.isNotBlank(key)) {
             queryWrapper.and(column(SysRole::getName).like(key).or(column(SysRole::getDescription).like(key)));
@@ -127,8 +125,8 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     }
 
     @Override
-    public List<Long> getRoleMenu(long userId, Integer id, Integer type) {
+    public List<Long> getRoleMenu(long shopId, Integer id, Integer type) {
-        SysRole role = queryChain().eq(SysRole::getId, id).eq(SysRole::getCreateUserId, userId).one();
+        SysRole role = queryChain().eq(SysRole::getId, id).eq(SysRole::getCreateUserId, shopId).one();
         if (role == null) {
             throw new CzgException("角色不存在");
         }
@@ -197,8 +195,8 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean editPermission(long userId, RolePermissionDTO rolePermissionDTO) {
+    public Boolean editPermission(long shopId, RolePermissionDTO rolePermissionDTO) {
-        long count = count(new QueryWrapper().eq(SysRole::getId, rolePermissionDTO.getRoleId()).eq(SysRole::getCreateUserId, userId));
+        long count = count(new QueryWrapper().eq(SysRole::getId, rolePermissionDTO.getRoleId()).eq(SysRole::getCreateUserId, shopId));
         if (count == 0) {
             throw new CzgException("角色不存在");
         }
@@ -228,8 +226,8 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         sysRole.setName(roleAddDTO.name());
         sysRole.setLevel(roleAddDTO.level());
         sysRole.setDescription(roleAddDTO.description());
-        sysRole.setShopId(StpKit.USER.getLoginIdAsLong());
+        sysRole.setShopId(StpKit.USER.getShopId());
-        sysRole.setCreateUserId(StpKit.USER.getLoginIdAsLong());
+        sysRole.setCreateUserId(StpKit.USER.getShopId());
         sysRole.setCreateTime(DateUtil.date().toLocalDateTime());
         boolean save = save(sysRole);
         if (save) {
@@ -269,13 +267,18 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean edit(RoleEditDTO roleEditDTO) {
-        SysRole role = queryChain().eq(SysRole::getId, roleEditDTO.getId()).eq(SysRole::getCreateUserId, StpKit.USER.getLoginIdAsLong()).one();
+        SysRole role = queryChain().eq(SysRole::getId, roleEditDTO.getId()).eq(SysRole::getCreateUserId, StpKit.USER.getShopId()).one();
         if (role == null) {
             throw new CzgException("角色不存在");
         }
-
+        long roleCount;
-        long roleCount = queryChain().eq(SysRole::getName, roleEditDTO.getName()).ne(SysRole::getId, roleEditDTO.getId())
+        if (role.getShopId() == null) {
-                .eq(SysRole::getShopId, StpKit.USER.getShopId()).count();
+            roleCount = queryChain().eq(SysRole::getName, roleEditDTO.getName()).ne(SysRole::getId, roleEditDTO.getId())
+                    .isNull(SysRole::getShopId).count();
+        } else {
+            roleCount = queryChain().eq(SysRole::getName, roleEditDTO.getName()).ne(SysRole::getId, roleEditDTO.getId())
+                    .eq(SysRole::getShopId, StpKit.USER.getShopId()).count();
+        }
         if (roleCount > 0) {
             throw new CzgException("此角色名称已存在");
         }
@@ -297,20 +300,4 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         }
         throw new CzgException("保存失败");
     }
-
-    public static void main(String[] args) {
-        SysRolesMenus menus = new SysRolesMenus();
-        menus.setRoleId(1L);
-        menus.setMenuId(1L);
-        menus.setType(1);
-        SysRolesMenus menus2 = new SysRolesMenus();
-        menus.setRoleId(1L);
-        menus.setMenuId(1L);
-        menus.setType(1);
-        Set<SysRolesMenus> rolesMenus = new HashSet<>();
-        rolesMenus.add(menus);
-        rolesMenus.add(menus2);
-        System.out.println(rolesMenus);
-
-    }
 }