From ce1b8f30bd0517451afb27c4e5103aa0cfa25422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=90=E8=8B=B1=E6=9D=B0?= <3427731738@qq.com> Date: Sun, 1 Dec 2024 19:59:52 +0800 Subject: [PATCH] =?UTF-8?q?2204A-cyj=EF=BC=88=E5=85=A5=E5=9B=A2=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActivityTeamProductSkuSettingModel.java | 14 ---- .../domain/resp/ActivityTeamDetailResp.java | 81 ------------------- ...ActivityTeamProductSkuInfoServiceImpl.java | 10 +++ 3 files changed, 10 insertions(+), 95 deletions(-) delete mode 100644 muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamDetailResp.java diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuSettingModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuSettingModel.java index 38da02d..da8fff3 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuSettingModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuSettingModel.java @@ -42,18 +42,4 @@ public class ActivityTeamProductSkuSettingModel { */ private List activityTeamProductSkuUpdModelList; - public static ActivityTeamProductSkuSettingModel settingReqModel(ActivityTeamProductSkuSettingReq activityTeamProductSkuSettingReq, Supplier productId) { - return ActivityTeamProductSkuSettingModel.builder() - .removeIds(activityTeamProductSkuSettingReq.getRemoveIds()) - .activityTeamProductSkuAddModelList( - activityTeamProductSkuSettingReq.getTeamProjectSkuInfoAddReqList().stream() - .map(teamProjectSkuInfoAddReq -> ActivityTeamProductSkuAddModel.addReqBuild(teamProjectSkuInfoAddReq, productId)) - .toList() - ) - .activityTeamProductSkuUpdModelList( - activityTeamProductSkuSettingReq.getTeamProjectSkuInfoUpdReqList().stream() - .map(ActivityTeamProductSkuUpdModel::updReqBuild) - .toList() - ).build(); - } } diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamDetailResp.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamDetailResp.java deleted file mode 100644 index 40b1712..0000000 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamDetailResp.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.muyu.marketing.domain.resp; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.muyu.common.core.web.domain.BaseEntity; -import com.muyu.marketing.domain.req.TeamProjectSkuInfoAddReq; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.util.Date; -import java.util.List; - -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class ActivityTeamDetailResp extends BaseEntity { - - /** - * 团购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 activityTeamProjectSkuList; - /** - * 活动详情 - */ - private String content; - /** - * 活动状态 - */ - private String status; - /** - * 策略类型 - */ - private String strategyType; - /** - * 策略ID - */ - private Long strategyId; -} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java index 739d7ed..89c25ee 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java @@ -119,6 +119,16 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl activityTeamProductSkuUpdModelList) { + return false; + } + /** * */