From 001e2bd4be1346d1d30bb257a46a8b185401987a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E6=9F=90?= <3086801962@qq.com> Date: Fri, 29 Nov 2024 17:07:52 +0800 Subject: [PATCH] 222 --- doc/策略.md | 21 +++++ .../domain/model/ActivityTeamAddSkuInfo.java | 48 +++++++++++ .../model/ActivityTeamInfoSaveModel.java | 1 - .../model/ActivityTeamProductSkuDelModel.java | 23 ++++++ .../domain/model/ActivityTeamUpdModel.java | 81 +++++++++++++++++++ .../domain/model/ProductSkuModel.java | 35 ++++++++ .../domain/resp/TeamInfoFindByIdResp.java | 1 - 7 files changed, 208 insertions(+), 2 deletions(-) create mode 100644 doc/策略.md create mode 100644 muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamAddSkuInfo.java create mode 100644 muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuDelModel.java create mode 100644 muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamUpdModel.java create mode 100644 muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ProductSkuModel.java diff --git a/doc/策略.md b/doc/策略.md new file mode 100644 index 0000000..4d706d5 --- /dev/null +++ b/doc/策略.md @@ -0,0 +1,21 @@ +# 拼团策略功能划分 +# 1 拼团列表 + 策略列表: + 5人团 + 百人团 + 团长免单团 +# 2. 点击拼团 进入商品列表 +# 3. 拼团详情 +# 4. 拼团成功 +# 5 支付订单 +# 6. 拼团失败 +# 7 重新加入拼团 + + + + +# 商品列表 +# 参团列表 +# 购买 +# 评论 + diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamAddSkuInfo.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamAddSkuInfo.java new file mode 100644 index 0000000..d1dc067 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamAddSkuInfo.java @@ -0,0 +1,48 @@ +package com.muyu.marketing.domain.model; + +import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.math.BigDecimal; + +/** + * @ClassName ActivityTeamAddSkuInfo + * @Description 描述 + * @Author zhen_xiong_feng + * @Date 2024/11/27 20:30 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +public class ActivityTeamAddSkuInfo { + // "添加商品规格List": [ + // "商品SKU": "String", + // "商品价格": "BigDecimal", + // "拼团价格": "BigDecimal", + // "拼团库存": "Long" + // ] + /** + * 商品SKU + */ + private String productSku; + /** + * 拼团价格 + */ + private BigDecimal teamPrice; + /** + * 拼团库存 + */ + private Long teamStock; + + public static ActivityTeamAddSkuInfo addSkuInfo(ActivityTeamProductSkuInfo activityTeamProductSkuInfo){ + return ActivityTeamAddSkuInfo.builder() + .productSku(activityTeamProductSkuInfo.getProductSku()) + .teamPrice(activityTeamProductSkuInfo.getTeamPrice()) + .teamStock(activityTeamProductSkuInfo.getTeamStock()) + .build(); + } +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoSaveModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoSaveModel.java index beb468f..ed5884b 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoSaveModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoSaveModel.java @@ -82,7 +82,6 @@ public class ActivityTeamInfoSaveModel { .unit(activityTeamInfoAddModel.getUnit()) .imageList(activityTeamInfoAddModel.getImageList()) .endTime(activityTeamInfoAddModel.getEndTime()) - .sort(activityTeamInfoAddModel.getSort()) .content(activityTeamInfoAddModel.getContent()) .status(activityTeamInfoAddModel.getStatus()) .strategyType(activityTeamInfoAddModel.getStrategyType()) diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuDelModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuDelModel.java new file mode 100644 index 0000000..e17d6d2 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuDelModel.java @@ -0,0 +1,23 @@ +package com.muyu.marketing.domain.model; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * @ClassName ActivityTeamProductSkuDelModel + * @Description 描述 + * @Author zhen_xiong_feng + * @Date 2024/11/27 19:00 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +public class ActivityTeamProductSkuDelModel { + /** + * 活动id + */ + private Integer productSkuId; +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamUpdModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamUpdModel.java new file mode 100644 index 0000000..14478ab --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamUpdModel.java @@ -0,0 +1,81 @@ +package com.muyu.marketing.domain.model; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.apache.commons.math3.stat.descriptive.summary.Product; + +import java.util.Date; +import java.util.List; + +/** + * @ClassName ActivityTeamUpdModel + * @Description 描述 + * @Author zhen_xiong_feng + * @Date 2024/11/27 22:22 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class ActivityTeamUpdModel { + + /** + * 拼团名称 + */ + private String name; + /** + * 商品ID + */ + private Long productId; + /** + * 商品活动图 + */ + private String productImage; + /** + * 活动简介 + */ + private String introduction; + /** + * 单位 + */ + + private String unit; + /** + * 轮播图 + */ + + private String imageList; + /** + * 活动结束时间 + */ + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + private Date endTime; + /** + * 活动排序 + */ + private Integer sort; + /** + * 商品SkU对象 + */ + private ProductSkuModel productSkuModel; + /** + * 活动详情 + */ + private String content; + /** + * 活动状态 + */ + private String status; + /** + * 策略类型 + */ + private String strategyType; + /** + * 策略ID + */ + private Long strategyId; + +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ProductSkuModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ProductSkuModel.java new file mode 100644 index 0000000..5d48876 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ProductSkuModel.java @@ -0,0 +1,35 @@ +package com.muyu.marketing.domain.model; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @ClassName ProductSkuModel + * @Description 描述 + * @Author zhen_xiong_feng + * @Date 2024/11/27 22:24 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class ProductSkuModel { + /** + * 修改商品规格List + */ + private List activityTeamProductSkuUpdModelList; + + /** + *删除商品规格IdList + */ + private List productIdList; + + /** + * 添加商品规格List + */ + private List activityTeamProductSkuAddModelList; +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoFindByIdResp.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoFindByIdResp.java index 3efe23a..c99b334 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoFindByIdResp.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoFindByIdResp.java @@ -2,7 +2,6 @@ package com.muyu.marketing.domain.resp; import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.marketing.domain.model.ActivityTeamDetailModel; -import com.muyu.marketing.domain.req.ProjectSkuInfoAddReq; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data;