From f041621ae4164e77478cd0748663247bc8316d61 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: Tue, 26 Nov 2024 15:53:08 +0800 Subject: [PATCH] =?UTF-8?q?2204A-cyj(=E6=B7=BB=E5=8A=A0=2011.26)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/团购查询单挑数据模型.json | 23 ++++++ .../domain/ActivityTeamProductSkuInfo.java | 2 +- .../model/ActivityTeamInfoAddModel.java | 11 ++- .../model/ActivityTeamProductSkuAddModel.java | 3 +- .../domain/resp/ActivityTeamInfoResp.java | 72 +++++++++++++++++++ .../domain/resp/ProjectSkuInfoAddResp.java | 23 ++++++ 6 files changed, 126 insertions(+), 8 deletions(-) create mode 100644 doc/团购查询单挑数据模型.json create mode 100644 muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamInfoResp.java create mode 100644 muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ProjectSkuInfoAddResp.java diff --git a/doc/团购查询单挑数据模型.json b/doc/团购查询单挑数据模型.json new file mode 100644 index 0000000..52c748d --- /dev/null +++ b/doc/团购查询单挑数据模型.json @@ -0,0 +1,23 @@ +{ + "拼团名称": "String", + "商品活动图": "String", + "商品ID": "Long", + "策略ID": "Long", + "团购活动ID": "Long", + "商品sku": [ + "Long","Long" + ], + "轮播图": [ + + ], + "活动排序": "", + "活动详情": "", + + "策略类型": "", + + "库存": "", + "活动状态": "", + "活动结束时间": "", + "商品状态": "", + +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamProductSkuInfo.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamProductSkuInfo.java index 43521d0..b663274 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamProductSkuInfo.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamProductSkuInfo.java @@ -60,6 +60,6 @@ public class ActivityTeamProductSkuInfo extends BaseEntity { .teamStock(activityTeamProductSkuAddModel.getTeamStock()) .remainStock(activityTeamProductSkuAddModel.getTeamStock()) .teamPrice(activityTeamProductSkuAddModel.getTeamPrice()) - .build() + .build(); } } 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 df41fad..c0d0cc8 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 @@ -85,12 +85,8 @@ public class ActivityTeamInfoAddModel { /** addReq 转话addModel模型**/ public static ActivityTeamInfoAddModel convertAddModel(ActivityTeamInfoSaveReq addReq) { - List addReqList = addReq.getProjectSkuInfoAddReqList(); - addReqList.stream().map(skuInfoAdd->{ActivityTeamProductSkuAddModel.convertProductSkuList(skuInfoAdd); - } ).toList(); - ActivityTeamProductSkuAddModel.convertProductSkuList(); - return ActivityTeamInfoAddModel.builder() + return ActivityTeamInfoAddModel.builder() .name(addReq.getName()) .productId(addReq.getProductId()) .productImage(addReq.getProductImage()) @@ -99,7 +95,10 @@ public class ActivityTeamInfoAddModel { .imageList(addReq.getImageList()) .endTime(addReq.getEndTime()) .sort(addReq.getSort()) - .activityTeamProductSkuAddModelList(addModelList) + .activityTeamProductSkuAddModelList(addReq.getProjectSkuInfoAddReqList() + .stream() + .map(projectSkuInfoAddReq -> ActivityTeamProductSkuAddModel.convertProductSkuList(projectSkuInfoAddReq, addReq)) + .toList()) .content(addReq.getContent()) .status(addReq.getStatus()) .strategyType(addReq.getStrategyType()) diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuAddModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuAddModel.java index 619afdd..e209377 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuAddModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuAddModel.java @@ -49,12 +49,13 @@ public class ActivityTeamProductSkuAddModel { private Long teamStock; /** ProjectSkuInfoAddReq 转换 ProductSkuAddModel **/ - public static ActivityTeamProductSkuAddModel convertProductSkuList(ProjectSkuInfoAddReq skuInfoAdd) { + public static ActivityTeamProductSkuAddModel convertProductSkuList(ProjectSkuInfoAddReq skuInfoAdd,ActivityTeamInfoSaveReq addReq) { return ActivityTeamProductSkuAddModel .builder() .sku(skuInfoAdd.getSku()) .teamPrice(skuInfoAdd.getTeamPrice()) .teamStock(skuInfoAdd.getTeamStock()) + .productId(addReq.getProductId()) .build(); } } diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamInfoResp.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamInfoResp.java new file mode 100644 index 0000000..0dbd4d4 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamInfoResp.java @@ -0,0 +1,72 @@ +package com.muyu.marketing.domain.resp; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.marketing.domain.req.ProjectSkuInfoAddReq; + +import java.util.Date; +import java.util.List; + +/** 拼团活动回显对象*/ +public class ActivityTeamInfoResp { + /** + * 活动id + */ + private Long teamId; + /** + * 拼团名称 + */ + 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 List projectSkuInfoAddList; + /** + * 活动详情 + */ + 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/resp/ProjectSkuInfoAddResp.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ProjectSkuInfoAddResp.java new file mode 100644 index 0000000..f1df555 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ProjectSkuInfoAddResp.java @@ -0,0 +1,23 @@ +package com.muyu.marketing.domain.resp; + +import java.math.BigDecimal; + +public class ProjectSkuInfoAddResp { + /** + * 规格SKU + */ + private String sku; + + /** + * 拼团价格 + */ + private BigDecimal teamPrice; + + /** + * 拼团库存 + */ + private Long teamStock; + + /** 规格id*/ + private Integer ruleId; +}