From efab73e637aadc19c08025808285b9e30764b412 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B2=B3=E5=B9=B3?= <14767849+liuehping@user.noreply.gitee.com> Date: Thu, 28 Nov 2024 09:58:52 +0800 Subject: [PATCH] =?UTF-8?q?fix():=E8=90=A5=E9=94=80=E5=9B=A2=E8=B4=AD?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/req/ActivityProductUpdReq.java | 75 +++++++++++++++++++ .../controller/ActivityTeamController.java | 5 +- .../team/service/ActivityTeamInfoService.java | 5 +- .../impl/ActivityTeamInfoServiceImpl.java | 7 +- 4 files changed, 85 insertions(+), 7 deletions(-) create mode 100644 muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityProductUpdReq.java diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityProductUpdReq.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityProductUpdReq.java new file mode 100644 index 0000000..7df56c3 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityProductUpdReq.java @@ -0,0 +1,75 @@ +package com.muyu.marketing.domain.req; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.marketing.domain.resp.ActivityProductUpdResp; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class ActivityProductUpdReq { + /** + * 活动id + */ + private Long id; + /** + * 拼团名称 + */ + 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 Long sort; + /** + * 商品SkU + */ + private ActivityProductUpdResp activityProductUpdResp; + /** + * 活动详情 + */ + 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/controller/ActivityTeamController.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java index 05d11c4..9d94310 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java @@ -6,6 +6,7 @@ import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.marketing.domain.model.ActivityProductUpdModel; import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel; import com.muyu.marketing.domain.model.ActivityTeamInfoListModel; +import com.muyu.marketing.domain.req.ActivityProductUpdReq; import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq; import com.muyu.marketing.domain.req.TeamInfoListReq; import com.muyu.marketing.domain.resp.ActivityTeamInfoDetailResp; @@ -68,8 +69,8 @@ public class ActivityTeamController { * 营销活动的修改 */ @PutMapping("update") - public Result update(@RequestBody ActivityProductUpdModel activityProductUpdModel){ - activityTeamInfoService.edit(activityProductUpdModel); + public Result update(@RequestBody ActivityProductUpdReq activityProductUpdReq){ + activityTeamInfoService.edit(activityProductUpdReq); return Result.success(); } } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java index 356cc33..2c6a2ab 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java @@ -7,6 +7,7 @@ import com.muyu.marketing.domain.model.ActivityProductUpdModel; import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel; import com.muyu.marketing.domain.model.ActivityTeamInfoListModel; import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel; +import com.muyu.marketing.domain.req.ActivityProductUpdReq; import com.muyu.marketing.domain.resp.ActivityTeamInfoDetailResp; import java.util.List; @@ -35,7 +36,7 @@ public interface ActivityTeamInfoService extends IService { /** * 修改团购活动信息 - * @param activityProductUpdModel + * @param activityProductUpdReq */ - void edit(ActivityProductUpdModel activityProductUpdModel); + void edit(ActivityProductUpdReq activityProductUpdReq); } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java index 5d9abd4..6400e74 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java @@ -10,6 +10,7 @@ import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.marketing.domain.ActivityTeamInfo; import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; import com.muyu.marketing.domain.model.*; +import com.muyu.marketing.domain.req.ActivityProductUpdReq; import com.muyu.marketing.domain.resp.ActivityProductUpdResp; import com.muyu.marketing.domain.resp.ActivityTeamInfoDetailResp; import com.muyu.marketing.domain.resp.ActivityTeamProductSkuResp; @@ -135,13 +136,13 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl deleteSkuIdList = activityProductUpdResp.getDeleteSkuIdList(); //判断是否为空