菜单权限放开,允许管理员任意调用

cash-api/account-server/src/main/java/com/czg/AccountApplication.java

@@ -50,8 +50,16 @@ public class AccountApplication implements CommandLineRunner {
             SaAdminCheckPermission annotation = AnnotationUtils.getAnnotation(method, SaAdminCheckPermission.class);
             if (annotation == null) return;
             for (String s : annotation.value()) {
-                long count = sysMenuService.queryChain().eq(SysMenu::getPermission, s).count();
+                SysMenu menu1 = sysMenuService.queryChain().eq(SysMenu::getPermission, s).one();
-                if (count > 0) {
+                if (menu1 !=null) {
+                    long count1 = sysRolesMenusService.queryChain().eq(SysRolesMenus::getMenuId, menu1.getMenuId()).eq(SysRolesMenus::getRoleId, 1L).count();
+                    if (count1 == 0) {
+                        SysRolesMenus sysRolesMenus = new SysRolesMenus();
+                        sysRolesMenus.setMenuId(menu1.getMenuId());
+                        sysRolesMenus.setRoleId(1L);
+                        sysRolesMenusService.save(sysRolesMenus);
+                        log.info("接口菜单添加成功, 菜单名称: {}, 菜单权限: {}", menu1.getName(), menu1.getPermission());
+                    }
                     continue;
                 }
                 SysMenu sysMenu = new SysMenu();

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

@@ -40,7 +40,7 @@ public class MenuController {
      * @return 菜单结构
      */
     @SaAdminCheckRole("管理员")
-    @SaAdminCheckPermission("menu:list")
+//    @SaAdminCheckPermission("menu:list")
     @GetMapping("/list")
     public CzgResult<List<MenuVO>> all(String title, String startTime, String endTime) {
         return CzgResult.success(menuService.getAll(title, startTime, endTime));
@@ -51,7 +51,7 @@ public class MenuController {
      * @return 菜单结构
      */
     @SaAdminCheckRole("管理员")
-    @SaAdminCheckPermission("menu:detail")
+//    @SaAdminCheckPermission("menu:detail")
     @GetMapping("/detail")
     public CzgResult<SysMenu> detail(@RequestParam Integer id) {
         return CzgResult.success(menuService.getById(id));
@@ -62,7 +62,7 @@ public class MenuController {
      * @return 是否成功
      */
     @SaAdminCheckRole("管理员")
-    @SaAdminCheckPermission("menu:add")
+//    @SaAdminCheckPermission("menu:add")
     @PostMapping
     public CzgResult<Boolean> add(@RequestBody @Validated MenuAddDTO menuAddDTO) {
         return CzgResult.success(menuService.add(menuAddDTO));
@@ -73,7 +73,7 @@ public class MenuController {
      * @return 是否成功
      */
     @SaAdminCheckRole("管理员")
-    @SaAdminCheckPermission("menu:edit")
+//    @SaAdminCheckPermission("menu:edit")
     @PutMapping()
     public CzgResult<Boolean> edit(@RequestBody @Validated MenuEditDTO menuEditDTO) {
         return CzgResult.success(menuService.edit(menuEditDTO));
@@ -84,7 +84,7 @@ public class MenuController {
      * @return 是否成功
      */
     @SaAdminCheckRole("管理员")
-    @SaAdminCheckPermission("menu:del")
+//    @SaAdminCheckPermission("menu:del")
     @DeleteMapping()
     public CzgResult<Boolean> edit(@RequestBody @Validated MenuDelDTO menuDelDTO) {
         return CzgResult.success(menuService.removeById(menuDelDTO.getId()));

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

@@ -5,10 +5,7 @@ import com.czg.account.entity.ShopActivateOutRecord;
 import com.czg.account.entity.ShopCoupon;
 import com.mybatisflex.core.service.IService;
 
-import java.math.BigDecimal;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 /**
  * 优惠券 服务层。
@@ -20,11 +17,12 @@ public interface ShopCouponService extends IService<ShopCoupon> {
 
     /**
      * 优惠券列表
+     *
      * @param shopId 店铺id
      * @param status 状态 0 未使用 1已使用 -1已过期
      * @return
      */
-    List<ShopCouponDTO> getList(Long shopId, Integer status);
+    List<ShopCoupon> getList(Long shopId, Integer status);
     ShopCouponDTO getCouponById(ShopCouponDTO couponDTO);
 
     Boolean add(ShopCouponDTO couponDTO);

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

@@ -14,7 +14,6 @@ import com.czg.service.account.mapper.ShopCouponMapper;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -32,7 +31,7 @@ public class ShopCouponServiceImpl extends ServiceImpl<ShopCouponMapper, ShopCou
     private ShopActivateOutRecordService outService;
 
     @Override
-    public List<ShopCouponDTO> getList(Long shopId, Integer status) {
+    public List<ShopCoupon> getList(Long shopId, Integer status) {
         QueryWrapper queryWrapper = new QueryWrapper();
         if (shopId != null) {
             if (status == 1) {
@@ -44,10 +43,10 @@ public class ShopCouponServiceImpl extends ServiceImpl<ShopCouponMapper, ShopCou
         return switch (status) {
             case -1 -> {
                 queryWrapper.ge(ShopActivateInRecord::getUseEndTime, DateUtil.date());
-//                yield list(queryWrapper);
+                yield list(queryWrapper);
-                yield null;
             }
             case 0 -> {
+//                yield outService.list(queryWrapper);
                 yield null;
 
             }