2204-11-20 (DDD 1.0)

muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/model/QueryModel.java

@@ -6,17 +6,19 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.muyu.common.core.web.page.PageDomain;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
 import java.util.List;
-import java.util.OptionalInt;
+
 
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @SuperBuilder
+
 public class QueryModel<T> {
     /**
      * 起始页
@@ -41,7 +43,7 @@ public class QueryModel<T> {
     /**
      * 构建模型分页对象
      */
-    public <T> T domainBuild(PageDomain domain) {
+    public T domainBuild(PageDomain domain) {
         this.pageNum=domain.getPageNum();
         this.pageSize=domain.getPageSize();
         this.orderByColum=domain.getOrderByColumn();
@@ -53,8 +55,8 @@ public class QueryModel<T> {
      * 构建分页对象
      * @return查询分页对象
      */
-    public Page<T> buildPage(){
+    public <I> Page<I> buildPage(){
-        Page<T> page = Page.of(this.getPageNum(), this.getPageSize());
+        Page<I> page = Page.of(this.getPageNum(), this.getPageSize());
         page.setOrders(List.of(this.getIsAec() ? OrderItem.asc(this.getOrderByColum()): OrderItem.desc(this.getOrderByColum())));
         return page;
     }

muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/PageDomain.java

@@ -1,12 +1,21 @@
 package com.muyu.common.core.web.page;
 
 import com.muyu.common.core.utils.StringUtils;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 /**
  * 分页数据
  *
  * @author muyu
  */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@SuperBuilder
 public class PageDomain {
     /**
      * 当前记录起始索引

muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/TableDataInfo.java

@@ -4,7 +4,6 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.poi.ss.formula.functions.T;
 
 import java.io.Serializable;
 import java.util.List;

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListModel.java

@@ -3,10 +3,10 @@ package com.muyu.marketing.domain.model;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.muyu.common.core.model.QueryModel;
-import com.muyu.marketing.domain.ActivityTeamInfo;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
+
 import java.sql.Timestamp;
 
 /**
@@ -15,9 +15,9 @@ import java.sql.Timestamp;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@Builder
+@SuperBuilder
 @EqualsAndHashCode(callSuper = true)
-public class ActivityTeamInfoListModel extends QueryModel {
+public class ActivityTeamInfoListModel extends QueryModel<ActivityTeamInfoListModel> {
 
     @TableId(type = IdType.AUTO)
     /** 主键*/

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListQueryModel.java

@@ -12,7 +12,7 @@ import lombok.experimental.SuperBuilder;
 @NoArgsConstructor
 @SuperBuilder
 @EqualsAndHashCode(callSuper = true)
-public class ActivityTeamInfoListQueryModel extends QueryModel {
+public class ActivityTeamInfoListQueryModel extends  QueryModel<ActivityTeamInfoListQueryModel>{
     /**
      *活动名查询字段
      */

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamInfoListReq.java

@@ -1,6 +1,7 @@
 package com.muyu.marketing.domain.req;
 
 import com.muyu.common.core.web.page.PageDomain;
+import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel;
 import io.swagger.annotations.ApiModel;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
@@ -9,10 +10,9 @@ import lombok.experimental.SuperBuilder;
  * 拼团req
  */
 @Data
-@Builder
+@SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-@ApiModel(value = "ActivityTeamInfoListReq", description = "拼团")
 @EqualsAndHashCode(callSuper = true)
 public class TeamInfoListReq extends PageDomain {
 
@@ -25,4 +25,10 @@ public class TeamInfoListReq extends PageDomain {
      */
     private String status;
 
+    public ActivityTeamInfoListQueryModel buildQueryModel(){
+      return ActivityTeamInfoListQueryModel.builder()
+              .name(this.getName())
+              .status(this.getStatus())
+              .build();
+    }
 }

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/controller/ActivityTeamInfoController.java

@@ -1,9 +1,13 @@
 package com.muyu.marketing.controller;
 
+
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
+
+import com.muyu.marketing.domain.model.ActivityTeamInfoListModel;
+
+import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel;
 import com.muyu.marketing.domain.req.TeamInfoListReq;
-import com.muyu.marketing.domain.resp.ActivityTeamInfoListResp;
 import com.muyu.marketing.service.ActivityTeamInfoService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,9 +31,16 @@ public class ActivityTeamInfoController {
      */
     @ApiOperation("获取拼团列表")
     @PostMapping("/list")
-    public Result<TableDataInfo<ActivityTeamInfoListResp>> ActivityTeamInfoList(TeamInfoListReq teamInfoListReq){
+    public Result<TableDataInfo<ActivityTeamInfoListModel>> ActivityTeamInfoList(TeamInfoListReq teamInfoListReq){
+        ActivityTeamInfoListQueryModel queryModel = ActivityTeamInfoListQueryModel.builder()
+                .name(teamInfoListReq.getName())
+                .status(teamInfoListReq.getStatus())
+                .build();
 
-        return Result.success();
+        TableDataInfo<ActivityTeamInfoListModel> tableDataInfo = activityTeamInfoService.tabDateInfo(queryModel);
+
+
+        return Result.success(tableDataInfo);
     }
 
 

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/ActivityTeamInfoService.java

@@ -6,7 +6,6 @@ import com.muyu.marketing.domain.ActivityTeamInfo;
 import com.muyu.marketing.domain.model.ActivityTeamInfoListModel;
 import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel;
 
-import java.util.List;
 
 /** 拼团*/
 

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityTeamInfoServiceImpl.java

@@ -8,7 +8,6 @@ import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.marketing.domain.ActivityTeamInfo;
 import com.muyu.marketing.domain.model.ActivityTeamInfoListModel;
 import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel;
-import com.muyu.marketing.domain.resp.ActivityTeamInfoListResp;
 import com.muyu.marketing.mapper.ActivityTeamInfoMapper;
 import com.muyu.marketing.service.ActivityTeamInfoService;
 import org.springframework.beans.factory.annotation.Autowired;