查询

mec-application/src/main/java/com/ym/mec/web/controller/MemberRankSettingController.java

@@ -82,7 +82,7 @@ public class MemberRankSettingController extends BaseController {
     @ApiOperation(value = "分页查询")
     @PostMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('memberRankSetting/queryPage')")
-    public HttpResponseResult<PageInfo<MemberRankSettingWrapper.MemberRankSetting>> queryPage(@RequestBody MemberRankSettingWrapper.MemberRankSettingQuery queryInfo) {
+    public HttpResponseResult<List<MemberRankSettingWrapper.MemberRankSetting>> queryPage(@RequestBody MemberRankSettingWrapper.MemberRankSettingQuery queryInfo) {
         return succeed(memberRankSettingService.queryPage2(queryInfo));
     }
 

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/MemberRankSettingWrapper.java

@@ -111,6 +111,9 @@ public class MemberRankSettingWrapper {
         @ApiModelProperty("是否已被购买")
         private Boolean buyFlag = false;
 
+        @ApiModelProperty("子节点")
+        private List<MemberRankSetting> children;
+
 
         @ApiModelProperty("更新人名称")
         private String operatorName;

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/TenantMemberRankSettingWrapper.java

@@ -65,7 +65,7 @@ public class TenantMemberRankSettingWrapper {
         private String type;
 
         @ApiModelProperty("学练宝配置")
-        private List<MemberConfig> memberConfig;
+        private MemberConfig memberConfig;
         
         public String jsonString() {
             return JSON.toJSONString(this);
@@ -81,14 +81,26 @@ public class TenantMemberRankSettingWrapper {
     @ApiModel(" MemberConfig")
     public static class MemberConfig {
 
-        @ApiModelProperty("周期 day-天 month-月 quarter-季度 halfYear-半年 year-年")
-        private String period;
+//        "day_divide": "0",
+//            "month_divide": "0",
+//            "quarter_divide": "1",
+//            "half_year_divide": "0",
+//            "year_divide": "0"
 
-        @ApiModelProperty("激活金额/购买金额")
-        private BigDecimal amount;
+        @ApiModelProperty("日分成")
+        private BigDecimal dayDivide;
 
-        @ApiModelProperty("原价")
-        private BigDecimal originalAmount;
+        @ApiModelProperty("月分成")
+        private BigDecimal monthDivide;
+
+        @ApiModelProperty("季度分成")
+        private BigDecimal quarterDivide;
+
+        @ApiModelProperty("半年分成")
+        private BigDecimal halfYearDivide;
+
+        @ApiModelProperty("年分成")
+        private BigDecimal yearDivide;
 
     }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/MemberRankSettingService.java

@@ -54,7 +54,7 @@ public interface MemberRankSettingService extends BaseService<Integer, MemberRan
 
     List<SysMusicScoreCategories> getTree(Integer parentId);
 
-    PageInfo<MemberRankSettingWrapper.MemberRankSetting> queryPage2(MemberRankSettingWrapper.MemberRankSettingQuery queryInfo);
+    List<MemberRankSettingWrapper.MemberRankSetting> queryPage2(MemberRankSettingWrapper.MemberRankSettingQuery queryInfo);
 
     void del(Integer id);
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MemberRankSettingServiceImpl.java

@@ -1026,21 +1026,11 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
      * @return
      */
     @Override
-    public PageInfo<MemberRankSettingWrapper.MemberRankSetting> queryPage2(MemberRankSettingWrapper.MemberRankSettingQuery queryInfo) {
-        PageInfo<MemberRankSettingWrapper.MemberRankSetting> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+    public List<MemberRankSettingWrapper.MemberRankSetting> queryPage2(MemberRankSettingWrapper.MemberRankSettingQuery queryInfo) {
         Map<String, Object> params = new HashMap<String, Object>();
         MapUtil.populateMap(params, queryInfo);
+        List<MemberRankSetting>   dataList = this.getDAO().queryPage(params);
 
-        List<MemberRankSetting> dataList = null;
-        int count = this.findCount(params);
-        if (count > 0) {
-            pageInfo.setTotal(count);
-            params.put("offset", pageInfo.getOffset());
-            dataList = this.getDAO().queryPage(params);
-        }
-        if (count == 0) {
-            dataList = new ArrayList<>();
-        }
         List<MemberRankSettingWrapper.MemberRankSetting> memberRankSettings = JSON.parseArray(JSON.toJSONString(dataList), MemberRankSettingWrapper.MemberRankSetting.class);
 
         // 设置曲目数量
@@ -1070,8 +1060,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
                 });
             }
         }
-        pageInfo.setRows(memberRankSettings);
-        return pageInfo;
+        return memberRankSettings;
     }
 
     @Override