From a0dae5aeb2ab1daf41b0e09e0dff5990e0d56b3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AC=A8=E8=9B=8B?= <14958938+qianqiao5-6-7@user.noreply.gitee.com> Date: Sun, 24 Nov 2024 09:22:16 +0800 Subject: [PATCH] =?UTF-8?q?2204-11-20=20=20(=E6=B7=BB=E5=8A=A0=E6=8B=BC?= =?UTF-8?q?=E5=9B=A211.24)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/ActivityTeamInfoAddModel.java | 2 +- .../model/ActivityTeamInfoListModel.java | 18 +++++++++++-- .../domain/model/TeamProductStockModel.java | 27 +++++++++++++++++++ .../ActivityTeamProductSkuInfoService.java | 1 + .../impl/ActivityTeamInfoServiceImpl.java | 19 +++++-------- ...ActivityTeamProductSkuInfoServiceImpl.java | 5 ++++ 6 files changed, 57 insertions(+), 15 deletions(-) create mode 100644 muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamProductStockModel.java diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java index c8f6019..00859dc 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java @@ -10,6 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.sql.Date; import java.sql.Timestamp; +import java.util.function.Function; /** * 拼团 添加 Model @@ -66,5 +67,4 @@ public class ActivityTeamInfoAddModel { return build; } - } diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListModel.java index d602efe..61e472a 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListModel.java @@ -3,12 +3,16 @@ 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 lombok.*; +import com.muyu.marketing.domain.ActivityTeamInfo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; - import java.math.BigDecimal; import java.util.Date; +import java.util.function.Function; /** * 团购活动 列表查询 结果模型 @@ -58,4 +62,14 @@ public class ActivityTeamInfoListModel extends QueryModel function){ + return function.apply( + ActivityTeamInfoListModel.builder() + .id(activityTeamInfo.getId()) + .name(activityTeamInfo.getName()) + .endTime(activityTeamInfo.getEndTime()) + .productImage(activityTeamInfo.getProductImage()) + .status(activityTeamInfo.getStatus()) + ); + } } diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamProductStockModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamProductStockModel.java new file mode 100644 index 0000000..2208afd --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamProductStockModel.java @@ -0,0 +1,27 @@ +package com.muyu.marketing.domain.model; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 商品库存 + * @author: CuiFu Bo + * @create: 2024-11-21 16:54 + **/ + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class TeamProductStockModel { + /** + * 团购库存 + */ + private Long teamStock; + /** + * 剩余库存 + */ + private Long remainStock; +} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/ActivityTeamProductSkuInfoService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/ActivityTeamProductSkuInfoService.java index bcfb719..d8a81af 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/ActivityTeamProductSkuInfoService.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/ActivityTeamProductSkuInfoService.java @@ -3,5 +3,6 @@ package com.muyu.marketing.service; import com.muyu.marketing.domain.model.TeamProductDiscountPriceModel; public interface ActivityTeamProductSkuInfoService { + /** 商品优惠*/ public TeamProductDiscountPriceModel getDiscountPrice(Long teamId); } 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 0cf2770..f036cb9 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 @@ -38,7 +38,7 @@ implements ActivityTeamInfoService { @Autowired private ActivityTeamProductSkuInfoMapper activityTeamProductSkuInfoMapper; @Autowired - private ActivityTeamProductSkuInfoService activityTeamProductSkuInfoService; + private ActivityTeamProductSkuInfoServiceImpl activityTeamProductSkuInfoService; /** * 团购活动列表 */ @@ -46,13 +46,8 @@ implements ActivityTeamInfoService { public TableDataInfo tabDateInfo(ActivityTeamInfoListQueryModel teamInfoListQueryModel) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(teamInfoListQueryModel.getName()) ){ - queryWrapper.like(StringUtils.isNotEmpty(teamInfoListQueryModel.getName()),ActivityTeamInfo::getName,teamInfoListQueryModel.getName()); - } - if (StringUtils.isNotEmpty(teamInfoListQueryModel.getStatus()) ){ - queryWrapper.like(StringUtils.isNotEmpty(teamInfoListQueryModel.getStatus()),ActivityTeamInfo::getStatus,teamInfoListQueryModel.getStatus()); - } - + queryWrapper.like(StringUtils.isNotEmpty(teamInfoListQueryModel.getName()),ActivityTeamInfo::getName,teamInfoListQueryModel.getName()); + queryWrapper.like(StringUtils.isNotEmpty(teamInfoListQueryModel.getStatus()),ActivityTeamInfo::getStatus,teamInfoListQueryModel.getStatus()); Page activityTeamInfoPage = this.page(teamInfoListQueryModel.buildPage(), queryWrapper); List activityTeamInfoList = activityTeamInfoPage.getRecords(); @@ -103,12 +98,12 @@ implements ActivityTeamInfoService { Long goodsId = activityTeamInfo.getProductId(); List skuList = activityTeamInfoReq.getProjectSkuList(); + ArrayList infoArrayList = new ArrayList<>(); skuList.forEach(skuInfo->{ - ActivityTeamProductSkuInfoModel.saveModelBuild(projectId,goodsId,skuInfo); + ActivityTeamProductSkuInfo activityTeamProductSkuInfo = ActivityTeamProductSkuInfoModel.saveModelBuild(projectId, goodsId, skuInfo); + infoArrayList.add(activityTeamProductSkuInfo); }); - - - + activityTeamProductSkuInfoService.saveBatch(infoArrayList); } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityTeamProductSkuInfoServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityTeamProductSkuInfoServiceImpl.java index 94b924f..dbd6466 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityTeamProductSkuInfoServiceImpl.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityTeamProductSkuInfoServiceImpl.java @@ -23,6 +23,11 @@ implements ActivityTeamProductSkuInfoService { private ProjectSkuCache projectSkuCache; + /** + * 商品优惠 + * @param teamId + * @return + */ @Override // public TeamProductDiscountPriceModel getDiscountPrice(Long teamId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();