From e2d2634ee8a3ca7f4fd85366bd1dbdbabc6bf90e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98mahaoran=E2=80=99?= <2570310046@qq.com> Date: Tue, 3 Dec 2024 11:59:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/muyu/Main.java | 7 ------- .../domain/ActivityTeamOpenInfo.java | 3 +++ .../controller/ActivityTeamController.java | 20 +++++++++++-------- .../impl/ActivityOpenInfoServiceImpl.java | 4 ++-- .../impl/ActivityTeamInfoServiceImpl.java | 2 +- .../impl/AttributeGroupServiceImpl.java | 2 ++ 6 files changed, 20 insertions(+), 18 deletions(-) delete mode 100644 muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/Main.java diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/Main.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/Main.java deleted file mode 100644 index 75fcd65..0000000 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/Main.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.muyu; - -public class Main { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamOpenInfo.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamOpenInfo.java index 5d01d61..863e9f8 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamOpenInfo.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamOpenInfo.java @@ -7,6 +7,8 @@ import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; @@ -22,6 +24,7 @@ import org.hibernate.validator.constraints.Length; @NoArgsConstructor @AllArgsConstructor @Builder +@TableName(value = "activity_team_open_info") public class ActivityTeamOpenInfo implements Serializable { /** diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/controller/ActivityTeamController.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/controller/ActivityTeamController.java index 0dc35f2..a01fdac 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/controller/ActivityTeamController.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/controller/ActivityTeamController.java @@ -1,5 +1,7 @@ package com.muyu.marketing.controller; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.marketing.domain.model.ActivityTeamInfoListModel; @@ -15,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; +import java.util.concurrent.Phaser; + @Api(tags = "商品拼团信息") @RestController @RequestMapping("/team") @@ -27,16 +31,16 @@ public class ActivityTeamController { * @return */ @PostMapping("list") - public Result> list(@RequestBody TeamInfoReqListReq teamInfoReqListReq){ + public Result> list(@RequestBody TeamInfoReqListReq teamInfoReqListReq){ + PageHelper.startPage(teamInfoReqListReq.getPageNum(),teamInfoReqListReq.getPageSize()); TableDataInfo tableDataInfo = activityTeamInfoService.query(teamInfoReqListReq.buildQueryModel()); List respList = tableDataInfo.getRows().stream().map(TeamInfoListResp::listModelBuild).toList(); - return Result.success( - new TableDataInfo<>(){{ - setRows(respList); - setTotal(tableDataInfo.getTotal()); - }} - ); - + PageInfo pageInfo = new PageInfo<>(respList); + return Result.success(pageInfo); +// new TableDataInfo<>(){{ +// setRows(respList); +// setTotal(tableDataInfo.getTotal()); +// }} } /** diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityOpenInfoServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityOpenInfoServiceImpl.java index 597e33e..386d37e 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityOpenInfoServiceImpl.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityOpenInfoServiceImpl.java @@ -14,7 +14,7 @@ public class ActivityOpenInfoServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ActivityTeamOpenInfo::getTeamId,teamId); - queryWrapper.eq(ActivityTeamOpenInfo::getTeamType,TeamOpenTypeEnum.OPEN_TEAM.Code()); + queryWrapper.eq(ActivityTeamOpenInfo::getTeamType,TeamOpenTypeEnum.OPEN_TEAM.Label()); return this.count(queryWrapper); } @@ -22,7 +22,7 @@ public class ActivityOpenInfoServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ActivityTeamOpenInfo::getTeamId,teamId); - queryWrapper.eq(ActivityTeamOpenInfo::getTeamType,TeamOpenTypeEnum.IN_TEAM.Code()); + queryWrapper.eq(ActivityTeamOpenInfo::getTeamType,TeamOpenTypeEnum.IN_TEAM.Label()); return this.count(queryWrapper); } } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityTeamInfoServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityTeamInfoServiceImpl.java index 771d53f..2c80d42 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityTeamInfoServiceImpl.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityTeamInfoServiceImpl.java @@ -52,7 +52,7 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl { Long openNumberByTeamIdAndType = activityOpenInfoService.getTeamOpenNumberByTeamIdAndType(activityTeamInfo.getId()); Long inNumberByTeamIdAndType = activityOpenInfoService.getTeamInNumberByTeamIdAndType(activityTeamInfo.getId()); -// TeamProductDiscountPriceModel discountPrice = activityTeamProductSkuInfoService.getDiscountPrice(activityTeamInfo.getId()); + // TeamProductDiscountPriceModel discountPrice = activityTeamProductSkuInfoService.getDiscountPrice(activityTeamInfo.getId()); TeamProductStockModel teamProductStockModel = activityTeamProductSkuInfoService.getStock(activityTeamInfo.getId()); return activityTeamInfoListModelBuilder diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java index f2cd42c..5366a9d 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/AttributeGroupServiceImpl.java @@ -29,6 +29,8 @@ import java.util.List; import java.util.function.Function; import java.util.stream.Stream; +import static com.muyu.common.core.utils.PageUtils.startPage; + /** * 属性组Service业务层处理 *