Merge remote-tracking branch 'origin/feature/0721-tenant' into feature/0721-tenant

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TenantAlbumController.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.admin.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import com.yonge.cooleshow.admin.io.request.TenantAlbumVo;
 import com.yonge.cooleshow.api.feign.dto.TenantWrapper;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
@@ -15,7 +16,6 @@ import com.yonge.cooleshow.biz.dal.wrapper.TenantAlbumWrapper;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.base.page.PageInfo;
-import com.yonge.toolset.base.page.QueryInfo;
 import com.yonge.toolset.mybatis.support.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -66,7 +66,7 @@ public class TenantAlbumController {
     public HttpResponseResult<PageInfo<TenantAlbumWrapper.TenantAlbum>> page(@RequestBody TenantAlbumWrapper.TenantAlbumQuery query) {
 
 
-        IPage<TenantAlbumWrapper.TenantAlbum> pages = tenantAlbumService.selectPage(query.getPage(query), query);
+        IPage<TenantAlbumWrapper.TenantAlbum> pages = tenantAlbumService.selectPage(QueryInfo.getPage(query), query);
         return HttpResponseResult.succeed(PageUtil.pageInfo(pages));
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TenantAlbumWrapper.java

@@ -3,7 +3,6 @@ package com.yonge.cooleshow.biz.dal.wrapper;
 import com.alibaba.fastjson.JSON;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import com.yonge.cooleshow.biz.dal.enums.SubjectTypeEnum;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -31,7 +30,8 @@ public class TenantAlbumWrapper {
     @NoArgsConstructor
     @AllArgsConstructor
     @ApiModel(" TenantAlbumQuery-机构专辑")
-    public static class   TenantAlbumQuery implements QueryInfo {
+    public static class TenantAlbumQuery implements QueryInfo {
+
 
         @ApiModelProperty("主键ID")
         private Long id;
@@ -74,41 +74,41 @@ public class TenantAlbumWrapper {
     @ApiModel(" TenantAlbum-机构专辑返回")
     public static class TenantAlbum {
 
-            @ApiModelProperty("主键ID")
-            private Long id;
+        @ApiModelProperty("主键ID")
+        private Long id;
 
-            @ApiModelProperty("机构ID")
-            private Long tenantId;
+        @ApiModelProperty("机构ID")
+        private Long tenantId;
 
-            @ApiModelProperty("专辑名称")
-            private String name;
+        @ApiModelProperty("专辑名称")
+        private String name;
 
-            @ApiModelProperty("机构名称")
-            private String tenantName;
+        @ApiModelProperty("机构名称")
+        private String tenantName;
 
-            @ApiModelProperty("专辑介绍")
-            private String describe;
+        @ApiModelProperty("专辑介绍")
+        private String describe;
 
-            @ApiModelProperty("专辑封面")
-            private String coverImg;
+        @ApiModelProperty("专辑封面")
+        private String coverImg;
 
-            @ApiModelProperty("曲目数")
-            private Integer musicNum;
+        @ApiModelProperty("曲目数")
+        private Integer musicNum;
 
-            @ApiModelProperty("平台价格")
-            private BigDecimal originalPrice;
+        @ApiModelProperty("平台价格")
+        private BigDecimal originalPrice;
 
-            @ApiModelProperty("机构价格")
-            private BigDecimal salePrice;
+        @ApiModelProperty("机构价格")
+        private BigDecimal salePrice;
 
-            @ApiModelProperty("购买周期")
-            private Integer purchaseCycle;
+        @ApiModelProperty("购买周期")
+        private Integer purchaseCycle;
 
-            @ApiModelProperty("曲目声部分类(多个,分隔)")
-            private String subjectTypes;
+        @ApiModelProperty("曲目声部分类(多个,分隔)")
+        private String subjectTypes;
 
-            @ApiModelProperty("启用状态")
-            private Boolean status;
+        @ApiModelProperty("启用状态")
+        private Boolean status;
 
         @ApiModelProperty("删除标识")
         private Boolean delFlag;
@@ -131,7 +131,7 @@ public class TenantAlbumWrapper {
         }
 
         @Data
-        public static class MusicSheetData{
+        public static class MusicSheetData {
             private SubjectTypeEnum subjectType;
 
             private List<Long> musicSheetIdList = new ArrayList<>();
@@ -183,11 +183,10 @@ public class TenantAlbumWrapper {
         @ApiModelProperty("采购倍数")
         private Integer buyMultiple;
 
-        @ApiModelProperty(value = "采购周期",hidden = true)
+        @ApiModelProperty(value = "采购周期", hidden = true)
         private Integer buyCycle;
 
-        @ApiModelProperty(value = "采购机构",hidden = true)
+        @ApiModelProperty(value = "采购机构", hidden = true)
         private Long tenantId;
 
-    }
-}
+    }}