From 67d1a4637bbc2411bec90703c53fc6177a485efc Mon Sep 17 00:00:00 2001 From: neverAwake <14807348+neverawake@user.noreply.gitee.com> Date: Thu, 28 Nov 2024 10:01:53 +0800 Subject: [PATCH] =?UTF-8?q?fix():=E6=96=B0=E5=A2=9E=E4=BA=86=E5=9B=A2?= =?UTF-8?q?=E8=B4=AD=E6=B4=BB=E5=8A=A8=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- muyu-auth/src/main/resources/bootstrap.yml | 4 +- muyu-gateway/src/main/resources/bootstrap.yml | 6 +-- .../src/main/resources/bootstrap.yml | 4 +- .../marketing/domain/ActivityTeamInfo.java | 7 ++- .../domain/ActivityTeamOpenInfo.java | 4 ++ .../domain/ActivityTeamProductSkuInfo.java | 23 +++++++- .../domain/model/ActivityTeamDetailModel.java | 4 +- .../model/ActivityTeamInfoAddModel.java | 4 +- .../model/ActivityTeamInfoListModel.java | 4 ++ .../model/ActivityTeamInfoSaveModel.java | 6 ++- .../model/ActivityTeamInfoUpdModel.java | 53 ++++++++++++++++++- .../model/ActivityTeamProductSkuUpdModel.java | 8 +++ .../model/ActivityTeamProductSkuUpdReq.java | 33 ++++++++++++ .../domain/req/ActivityTeamInfoSaveReq.java | 4 +- .../domain/req/ActivityTeamInfoUpdReq.java | 48 ++++++++++++++++- .../domain/req/TeamProjectSkuInfoAddReq.java | 13 +++++ .../domain/resp/ActivityTeamDetailResp.java | 4 +- .../domain/resp/TeamInfoFindByIdResp.java | 5 +- .../domain/resp/TeamInfoListResp.java | 4 ++ .../controller/ActivityTeamController.java | 11 +++- .../team/service/ActivityTeamInfoService.java | 3 +- .../ActivityTeamProductSkuInfoService.java | 16 +++++- .../impl/ActivityTeamInfoServiceImpl.java | 44 ++++++++++++--- ...ActivityTeamProductSkuInfoServiceImpl.java | 32 +++++++++-- .../src/main/resources/bootstrap.yml | 6 +-- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- 29 files changed, 320 insertions(+), 46 deletions(-) create mode 100644 muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdReq.java diff --git a/muyu-auth/src/main/resources/bootstrap.yml b/muyu-auth/src/main/resources/bootstrap.yml index 26bb01c..e59d339 100644 --- a/muyu-auth/src/main/resources/bootstrap.yml +++ b/muyu-auth/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 120.46.147.226:8848 + server-addr: 101.35.234.240:8848 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 101.35.234.240:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-gateway/src/main/resources/bootstrap.yml b/muyu-gateway/src/main/resources/bootstrap.yml index b15f786..9b99d13 100644 --- a/muyu-gateway/src/main/resources/bootstrap.yml +++ b/muyu-gateway/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 120.46.147.226:8848 + server-addr: 101.35.234.240:8848 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 101.35.234.240:8848 # 配置文件格式 file-extension: yml # 共享配置 @@ -33,7 +33,7 @@ spring: datasource: ds1: nacos: - server-addr: 120.46.147.226:8848 + server-addr: 101.35.234.240:8848 dataId: sentinel-muyu-gateway groupId: DEFAULT_GROUP data-type: json diff --git a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml b/muyu-modules/muyu-file/src/main/resources/bootstrap.yml index 956f52b..41b2a51 100644 --- a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-file/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 120.46.147.226:8848 + server-addr: 101.35.234.240:8848 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 101.35.234.240:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java index 323ad45..683008c 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java @@ -3,12 +3,14 @@ package com.muyu.marketing.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel; import com.muyu.marketing.domain.model.ActivityTeamInfoSaveModel; import com.muyu.marketing.domain.model.ActivityTeamInfoUpdModel; import lombok.*; import lombok.experimental.SuperBuilder; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -52,6 +54,8 @@ public class ActivityTeamInfo extends BaseEntity { /** * 活动结束时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:ss:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm") private Date endTime; /** * 活动排序 @@ -112,7 +116,8 @@ public class ActivityTeamInfo extends BaseEntity { .strategyId(activityTeamInfoSaveModel.getStrategyId()) .build(); } - public static ActivityTeamInfo TeamUpdateBuild (ActivityTeamInfoUpdModel activityTeamInfoUpdModel){ + + public static ActivityTeamInfo updTeamInfoBuild(ActivityTeamInfoUpdModel activityTeamInfoUpdModel) { return ActivityTeamInfo.builder() .id(activityTeamInfoUpdModel.getId()) .name(activityTeamInfoUpdModel.getName()) diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamOpenInfo.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamOpenInfo.java index 572299e..63286e2 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamOpenInfo.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamOpenInfo.java @@ -3,9 +3,11 @@ package com.muyu.marketing.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.common.core.web.domain.BaseEntity; import lombok.*; import lombok.experimental.SuperBuilder; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -41,6 +43,8 @@ public class ActivityTeamOpenInfo extends BaseEntity { /** * 结束团购时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:ss:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm") private Date endTime; /** * 商品ID 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 697b5b4..66b9c19 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 @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel; import com.muyu.marketing.domain.model.ActivityTeamProductSkuReqModel; +import com.muyu.marketing.domain.model.ActivityTeamProductSkuUpdModel; +import com.muyu.marketing.domain.req.TeamProjectSkuInfoAddReq; import lombok.*; import lombok.experimental.SuperBuilder; @@ -27,7 +29,7 @@ public class ActivityTeamProductSkuInfo extends BaseEntity { /** * 活动ID */ - private long teamId; + private Long teamId; /** * 商品ID */ @@ -74,4 +76,23 @@ public class ActivityTeamProductSkuInfo extends BaseEntity { .build(); } + public static ActivityTeamProductSkuInfo updModelBuild(ActivityTeamProductSkuUpdModel activityTeamProductSkuUpdModel) { + return ActivityTeamProductSkuInfo.builder() + .id(activityTeamProductSkuUpdModel.getId()) + .teamPrice(activityTeamProductSkuUpdModel.getTeamPrice()) + .teamStock(activityTeamProductSkuUpdModel.getTeamStock()) + .remainStock(activityTeamProductSkuUpdModel.getTeamStock()) + .build(); + } + + public static ActivityTeamProductSkuInfo buildAddSku(TeamProjectSkuInfoAddReq teamProjectSkuInfoAddReq) { + return ActivityTeamProductSkuInfo.builder() + .teamId(teamProjectSkuInfoAddReq.getTeamId()) + .productId(teamProjectSkuInfoAddReq.getProductId()) + .productSku(teamProjectSkuInfoAddReq.getSku()) + .teamPrice(teamProjectSkuInfoAddReq.getTeamPrice()) + .teamStock(teamProjectSkuInfoAddReq.getTeamStock()) + .build(); + } + } diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamDetailModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamDetailModel.java index 9e9f9f8..03c1ddd 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamDetailModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamDetailModel.java @@ -6,6 +6,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; import java.util.List; @@ -55,7 +56,8 @@ public class ActivityTeamDetailModel { /** * 活动结束时间 */ - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:ss:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm") private Date endTime; /** * 活动排序 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 8dcbfe4..b4991c5 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 @@ -7,6 +7,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; import java.util.List; @@ -53,7 +54,8 @@ public class ActivityTeamInfoAddModel { /** * 活动结束时间 */ - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:ss:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm") private Date endTime; /** * 活动排序 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 e38fadf..d717000 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 @@ -1,9 +1,11 @@ package com.muyu.marketing.domain.model; +import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.common.core.web.model.QueryModel; import com.muyu.marketing.domain.ActivityTeamInfo; import lombok.*; import lombok.experimental.SuperBuilder; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.util.Date; @@ -40,6 +42,8 @@ public class ActivityTeamInfoListModel { /** * 团购结束时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:ss:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm") private Date endTime; /** * 开团人数 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..9bba087 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 @@ -6,6 +6,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; import java.util.List; @@ -51,12 +52,13 @@ public class ActivityTeamInfoSaveModel { /** * 活动结束时间 */ - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:ss:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm") private Date endTime; /** * 活动排序 */ - private Long sort; + private Integer sort; /** * 活动详情 */ diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoUpdModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoUpdModel.java index 6ebfd78..2e1c1a9 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoUpdModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoUpdModel.java @@ -1,10 +1,14 @@ package com.muyu.marketing.domain.model; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.marketing.domain.ActivityTeamInfo; import com.muyu.marketing.domain.req.ActivityTeamInfoUpdReq; +import com.muyu.marketing.domain.req.TeamProjectSkuInfoAddReq; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; import java.util.List; @@ -20,20 +24,62 @@ import java.util.List; @NoArgsConstructor @Builder public class ActivityTeamInfoUpdModel { + + /** 主键自增 */ private Long id; + + /** 活动表名称 */ private String name; + + /** 主键商品id */ private Long productId; + + /** 商品图片 */ private String productImage; + + /** 活动介绍 */ private String introduction; + + /** 单位 */ private String unit; + + /** 轮播图 */ private String imageList; + + /** 结束时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:ss:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm") private Date endTime; + + /** 排序 */ private Long sort; + + /** 主键介绍 */ private String content; + + /** 活动状态 */ private String status; + + /** 策略类型 */ private String strategyType; + + /** 策略id */ private Long strategyId; - private List activityTeamProductSkuModelList; + + /** + * 拼团商品sku集合 + */ + private List teamProductSkuIds; + + /** + * 修改的活动商品sku集合 + */ + private List activityTeamProductSkuList; + + /** + * 新增的活动商品sku集合 + */ + private List teamProjectSkuInfoAddList; public static ActivityTeamInfoUpdModel activityTeamInfoUpdReqModelBuild (ActivityTeamInfoUpdReq activityTeamInfoUpdReq){ return ActivityTeamInfoUpdModel.builder() @@ -50,7 +96,10 @@ public class ActivityTeamInfoUpdModel { .status(activityTeamInfoUpdReq.getStatus()) .strategyType(activityTeamInfoUpdReq.getStrategyType()) .strategyId(activityTeamInfoUpdReq.getStrategyId()) - .activityTeamProductSkuModelList(activityTeamInfoUpdReq.getActivityTeamProductSkuList().stream().map(ActivityTeamProductSkuReqModel::activityTeamProductSkuReqModelBuild).toList()) + .teamProductSkuIds(activityTeamInfoUpdReq.getTeamProductSkuIds()) + .activityTeamProductSkuList(activityTeamInfoUpdReq.getActivityTeamProductSkuList()) + .teamProjectSkuInfoAddList(activityTeamInfoUpdReq.getTeamProjectSkuInfoAddList()) .build(); } + } diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdModel.java index 5039ce6..a85769e 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdModel.java @@ -34,4 +34,12 @@ public class ActivityTeamProductSkuUpdModel { * 团购库存 */ private Long teamStock; + + public static ActivityTeamProductSkuUpdModel skuUpdBuild(ActivityTeamProductSkuUpdReq activityTeamProductSkuUpdReq) { + return ActivityTeamProductSkuUpdModel.builder() + .id(activityTeamProductSkuUpdReq.getId()) + .teamPrice(activityTeamProductSkuUpdReq.getTeamPrice()) + .teamStock(activityTeamProductSkuUpdReq.getTeamStock()) + .build(); + } } diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdReq.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdReq.java new file mode 100644 index 0000000..2047faa --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdReq.java @@ -0,0 +1,33 @@ +package com.muyu.marketing.domain.model; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +/** + * @Author 夜は眠れるかい? + * @Date 2024/11/27 16:49 + * 好好学习，天天向上 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ActivityTeamProductSkuUpdReq { + + /** + * 商品规格ID + */ + private Long id; + + /** + * 团购价格 + */ + private BigDecimal teamPrice; + + /** + * 团购库存 + */ + private Long teamStock; +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamInfoSaveReq.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamInfoSaveReq.java index 89b20e1..ebb6c51 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamInfoSaveReq.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamInfoSaveReq.java @@ -8,6 +8,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; import java.util.List; @@ -46,7 +47,8 @@ public class ActivityTeamInfoSaveReq extends BaseEntity { /** * 活动结束时间 */ - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:ss:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm") private Date endTime; /** * 活动排序 diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamInfoUpdReq.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamInfoUpdReq.java index 82939fa..b1cc9af 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamInfoUpdReq.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamInfoUpdReq.java @@ -1,9 +1,12 @@ package com.muyu.marketing.domain.req; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.marketing.domain.model.ActivityTeamProductSkuUpdReq; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; import java.util.List; @@ -19,18 +22,61 @@ import java.util.List; @NoArgsConstructor @Builder public class ActivityTeamInfoUpdReq { + + /** 主键自增 */ private Long id; + + /** 活动表名称 */ private String name; + + /** 主键商品id */ private Long productId; + + /** 商品图片 */ private String productImage; + + /** 活动简介 */ private String introduction; + + /** 单位 */ private String unit; + + /** 轮播图 */ private String imageList; + + /** 结束时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:ss:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm") private Date endTime; + + /** 排序 */ private Long sort; + + /** 详情 */ private String content; + + /** 活动状态 */ private String status; + + /** 策略类型 */ private String strategyType; + + /** 策略id */ private Long strategyId; - private List activityTeamProductSkuList; + + /** + * 拼团商品sku集合 + */ + private List teamProductSkuIds; + + /** + * 修改的活动商品sku集合 + */ + private List activityTeamProductSkuList; + + /** + * 新增的活动商品sku集合 + */ + private List teamProjectSkuInfoAddList; + } diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamProjectSkuInfoAddReq.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamProjectSkuInfoAddReq.java index 7be1dee..44d7beb 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamProjectSkuInfoAddReq.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamProjectSkuInfoAddReq.java @@ -9,6 +9,7 @@ import java.math.BigDecimal; /** * 添加的 + * @author zhuyufeng */ @Data @SuperBuilder @@ -16,6 +17,16 @@ import java.math.BigDecimal; @NoArgsConstructor public class TeamProjectSkuInfoAddReq { + /** + * 活动id + */ + private Long teamId; + + /** + * 商品id + */ + private Long productId; + /** * 规格SKU */ @@ -30,4 +41,6 @@ public class TeamProjectSkuInfoAddReq { * 拼团库存 */ private Long teamStock; + + } 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 index 40b1712..4ff4e31 100644 --- 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 @@ -8,6 +8,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; import java.util.List; @@ -52,7 +53,8 @@ public class ActivityTeamDetailResp extends BaseEntity { /** * 活动结束时间 */ - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:ss:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm") private Date endTime; /** * 活动排序 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..3a3ead3 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,11 +2,11 @@ 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; import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; import java.util.List; @@ -55,7 +55,8 @@ public class TeamInfoFindByIdResp { /** * 活动结束时间 */ - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:ss:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm") private Date endTime; /** * 活动排序 diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoListResp.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoListResp.java index f3e2219..141a2d9 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoListResp.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoListResp.java @@ -1,11 +1,13 @@ package com.muyu.marketing.domain.resp; +import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.marketing.domain.model.ActivityTeamInfoListModel; import com.muyu.marketing.domain.req.TeamInfoListReq; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.util.Date; @@ -35,6 +37,8 @@ public class TeamInfoListResp { /** * 团购结束时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:ss:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm") private Date endTime; /** * 开团人数 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 9494be5..2221007 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 @@ -13,6 +13,7 @@ import com.muyu.marketing.domain.resp.TeamInfoFindByIdResp; import com.muyu.marketing.domain.resp.TeamInfoListResp; import com.muyu.marketing.team.service.ActivityTeamInfoService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -63,8 +64,14 @@ public class ActivityTeamController { public Result findTeamById(@PathVariable Long id){ return Result.success(TeamInfoFindByIdResp.teamInfoFindByIdBuild(activityTeamInfoService.findDetailById(id))); } - @PutMapping("/updateByTeamId") - public Result updateByTeamId(@RequestBody ActivityTeamInfoUpdReq activityTeamInfoUpdReq){ + + /** + * 修改拼团活动信息 + * @param activityTeamInfoUpdReq + * @return + */ + @PutMapping("/updateActivityTeamInfo") + public Result updateByTeamId(@RequestBody ActivityTeamInfoUpdReq activityTeamInfoUpdReq){ activityTeamInfoService.update(ActivityTeamInfoUpdModel.activityTeamInfoUpdReqModelBuild(activityTeamInfoUpdReq)); 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 f1409d4..966bb1a 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 @@ -33,7 +33,6 @@ public interface ActivityTeamInfoService extends IService { * @param activityTeamInfoUpdModel 团购活动信息 * @return 是否成功 */ - boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel); - + public void update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel); } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamProductSkuInfoService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamProductSkuInfoService.java index 3bf453a..2fa904f 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamProductSkuInfoService.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamProductSkuInfoService.java @@ -46,6 +46,20 @@ public interface ActivityTeamProductSkuInfoService extends IService findListByTeamId(Long teamId); - public boolean updateBath(List activityTeamProductSkuReqModelList); + /** + * 修改团购商品sku信息 + * + * @param activityTeamProductSkuUpdModel + * @return + */ + public boolean update(ActivityTeamProductSkuUpdModel activityTeamProductSkuUpdModel); + + /** + * 修改团购商品sku信息（批量修改） + * + * @param activityTeamProductSkuUpdModelList + * @return + */ + public void batchUpdate(List activityTeamProductSkuUpdModelList); } 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 a75f0e0..3813034 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 @@ -1,11 +1,14 @@ package com.muyu.marketing.team.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.exception.ServiceException; import com.muyu.common.core.utils.StringUtils; 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.team.mapper.ActivityTeamInfoMapper; import com.muyu.marketing.team.service.ActivityTeamInfoService; @@ -13,14 +16,17 @@ import com.muyu.marketing.team.service.ActivityTeamOpenInfoService; import com.muyu.marketing.team.service.ActivityTeamProductSkuInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; +import java.rmi.ServerException; import java.util.List; +import java.util.stream.Collectors; @Service public class ActivityTeamInfoServiceImpl extends ServiceImpl - implements ActivityTeamInfoService { + implements ActivityTeamInfoService { @Autowired private ActivityTeamOpenInfoService activityTeamOpenInfoService; @@ -81,6 +87,7 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ActivityTeamInfo::getId,activityTeamInfoUpdModel.getId()); + ActivityTeamInfo activityTeamInfo = this.getOne(queryWrapper); + if ("已开启".equals(activityTeamInfo.getStatus())){ + throw new ServiceException("活动已开启，无法修改"); + } + //修改拼团活动表信息 + this.updateById(ActivityTeamInfo.updTeamInfoBuild(activityTeamInfoUpdModel)); + //根据根据前台传过来的skuIds集合，批量删除团购商品sku集合 + activityTeamProductSkuInfoService.removeBatchByIds(activityTeamInfoUpdModel.getTeamProductSkuIds()); + //批量添加团购商品sku集合 + activityTeamProductSkuInfoService.saveBatch( + //将activityTeamInfoUpdModel类型转成ActivityTeamProductSkuInfo类型集合 + activityTeamInfoUpdModel.getTeamProjectSkuInfoAddList().stream() + .map(ActivityTeamProductSkuInfo::buildAddSku) + .collect(Collectors.toList()) + ); + //根据activityTeamProductSkuList集合，批量修改团购商品sku集合 + List activityTeamProductSkuList = activityTeamInfoUpdModel.getActivityTeamProductSkuList(); + activityTeamProductSkuInfoService.batchUpdate( + activityTeamProductSkuList.stream() + .map(ActivityTeamProductSkuUpdModel::skuUpdBuild) + .collect(Collectors.toList()) + ); } } 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 f1c3369..2800e2d 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 @@ -1,6 +1,7 @@ package com.muyu.marketing.team.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.exception.ServiceException; import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; @@ -19,6 +20,7 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.List; import java.util.Optional; +import java.util.stream.Collectors; @Service public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl @@ -95,9 +97,33 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl ActivityTeamProductSkuModel.FindBuild(activityTeamProductSkuInfo)).toList(); } - @Transactional + /** + * 修改团购商品sku信息（单个信息修改） + * + * @param activityTeamProductSkuUpdModel + * @return + */ @Override - public boolean updateBath(List activityTeamProductSkuReqModelList) { - return this.updateBatchById(activityTeamProductSkuReqModelList.stream().map(ActivityTeamProductSkuInfo::updateModelBuild).toList()); + public boolean update(ActivityTeamProductSkuUpdModel activityTeamProductSkuUpdModel) { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.set(ActivityTeamProductSkuInfo::getTeamPrice,activityTeamProductSkuUpdModel.getTeamPrice()); + updateWrapper.set(ActivityTeamProductSkuInfo::getTeamStock,activityTeamProductSkuUpdModel.getTeamStock()); + updateWrapper.eq(ActivityTeamProductSkuInfo::getId,activityTeamProductSkuUpdModel.getId()); + return this.update(updateWrapper); } + + /** + * 修改团购商品sku信息（批量修改） + * + * @param activityTeamProductSkuUpdModelList + * @return + */ + @Override + public void batchUpdate(List activityTeamProductSkuUpdModelList) { + List teamProductSkuInfos = activityTeamProductSkuUpdModelList.stream() + .map(ActivityTeamProductSkuInfo::updModelBuild) + .toList(); + this.updateBatchById(teamProductSkuInfos); + } + } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml b/muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml index 699e778..9628618 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: muyu-buy + name: muyu-team profiles: # 环境配置 active: dev @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 120.46.147.226:8848 + server-addr: 101.35.234.240:8848 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 101.35.234.240:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml index 8ece81d..1b6a610 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 120.46.147.226:8848 + server-addr: 101.35.234.240:8848 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 101.35.234.240:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml index 9467547..4eacb13 100644 --- a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml @@ -16,10 +16,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 120.46.147.226:8848 + server-addr: 101.35.234.240:8848 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 101.35.234.240:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml b/muyu-modules/muyu-system/src/main/resources/bootstrap.yml index ee5ca7f..8f3036d 100644 --- a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-system/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 120.46.147.226:8848 + server-addr: 101.35.234.240:8848 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 101.35.234.240:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml b/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml index c730a55..3fe5a70 100644 --- a/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml +++ b/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 120.46.147.226:8848 + server-addr: 101.35.234.240:8848 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 101.35.234.240:8848 # 配置文件格式 file-extension: yml # 共享配置