11

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/combo/ComboController.java

@@ -69,6 +69,7 @@ public class ComboController {
     @PreAuthorize("@ss.hasPermission('t:combo:query')")
     public CommonResult<ComboRespVO> getCombo(@RequestParam("id") Long id) {
         ComboDO combo = comboService.getCombo(id);
+
         return success(BeanUtils.toBean(combo, ComboRespVO.class));
     }
 

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/combo/vo/ComboPageReqVO.java

@@ -38,5 +38,6 @@ public class ComboPageReqVO extends PageParam {
 
     @Schema(description = "状态", example = "2")
     private Integer status;
-
+    @Schema(description = "2普通管理员1用户0超级管理员", example = "2")
+    private Integer type;
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/combo/vo/ComboRespVO.java

@@ -46,5 +46,6 @@ public class ComboRespVO {
     @Schema(description = "状态", example = "2")
     @ExcelProperty("状态")
     private Integer status;
-
+    @Schema(description = "2普通管理员1用户0超级管理员", example = "2")
+    private Integer type;
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/combo/vo/ComboSaveReqVO.java

@@ -35,5 +35,8 @@ public class ComboSaveReqVO {
 
     @Schema(description = "状态", example = "2")
     private Integer status;
+    @Schema(description = "2普通管理员1用户0超级管理员", example = "2")
+    @NotNull(message = "套餐权限不能为空")
+    private Integer type;
 
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/combo/ComboDO.java

@@ -51,5 +51,9 @@ public class ComboDO extends BaseDO {
      * 状态
      */
     private Integer status;
+    /**
+     * 1普通管理员0用户2超级管理员
+     */
+    private Integer type;
 
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/combo/ComboMapper.java

@@ -24,6 +24,7 @@ public interface ComboMapper extends BaseMapperX<ComboDO> {
                 .eqIfPresent(ComboDO::getMinutes, reqVO.getMinutes())
                 .eqIfPresent(ComboDO::getRemark, reqVO.getRemark())
                 .eqIfPresent(ComboDO::getCarteenId, reqVO.getCarteenId())
+                .eqIfPresent(ComboDO::getType, reqVO.getType())
                 .betweenIfPresent(ComboDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(ComboDO::getStatus, reqVO.getStatus())
                 .orderByDesc(ComboDO::getId));