From 4a17fc7227f94e1fe8bf42baae86d674171e73be Mon Sep 17 00:00:00 2001 From: sly <381896475@qq.com> Date: Thu, 28 Nov 2024 02:26:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=A2=E8=B4=AD=E6=B4=BB=E5=8A=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/团购修改数据结构.java | 28 ++++++ doc/团购活动修改.java | 1 - muyu-auth/src/main/resources/bootstrap.yml | 4 +- muyu-gateway/src/main/resources/bootstrap.yml | 6 +- .../src/main/resources/bootstrap.yml | 4 +- .../muyu-gen/src/main/resources/bootstrap.yml | 4 +- .../muyu-job/src/main/resources/bootstrap.yml | 4 +- .../marketing/domain/ActivityTeamInfo.java | 16 +-- .../domain/ActivityTeamProductSkuInfo.java | 9 ++ .../domain/model/ActivityTeamDetailModel.java | 4 +- .../model/ActivityTeamInfoAddModel.java | 2 +- .../model/ActivityTeamInfoListModel.java | 4 +- .../model/ActivityTeamInfoUpdModel.java | 99 ++++++++++++++++--- .../domain/req/ActivityTeamInfoSaveReq.java | 2 +- .../domain/req/ActivityTeamInfoUpdReq.java | 64 +++++++++++- .../domain/resp/TeamInfoFindByIdResp.java | 2 +- .../controller/ActivityTeamController.java | 15 ++- .../team/service/ActivityTeamInfoService.java | 9 +- .../ActivityTeamProductSkuInfoService.java | 23 ++++- .../impl/ActivityTeamInfoServiceImpl.java | 32 ++++-- ...ActivityTeamProductSkuInfoServiceImpl.java | 29 +++++- .../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 +- 26 files changed, 305 insertions(+), 78 deletions(-) create mode 100644 doc/团购修改数据结构.java diff --git a/doc/团购修改数据结构.java b/doc/团购修改数据结构.java new file mode 100644 index 0000000..b6a756f --- /dev/null +++ b/doc/团购修改数据结构.java @@ -0,0 +1,28 @@ +{ + "id":"Long", + "团购名称":"String", + "团购商品ID":"Long", + "团购商品图片":"String", + "团购商品简介":"Text", + "策略id":"Long", + "策略类型":"String", + "结束时间":"Date", + "状态":"String", + "轮播图集合": + [ + "图片":"String" + ] + "商品规格集合": + [ + "商品规格": + { + "id":"Long", + "规格" :"String", +// "拼团价格":"Decimal", +// "拼团库存":"Long", + "价格变化值":"Decimal", + "库存变化值":"Long" + } + ] + "团购规格ID集合" +} diff --git a/doc/团购活动修改.java b/doc/团购活动修改.java index 64b1b79..6eeb24c 100644 --- a/doc/团购活动修改.java +++ b/doc/团购活动修改.java @@ -21,7 +21,6 @@ ], "删除商品规格IdList" : ["Long", "Long"], "添加商品规格List": [ - "商品SKU": "String", "商品价格": "BigDecimal", "拼团价格": "BigDecimal", "拼团库存": "Long" diff --git a/muyu-auth/src/main/resources/bootstrap.yml b/muyu-auth/src/main/resources/bootstrap.yml index 26bb01c..b7c162b 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: 121.37.131.224:8848 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 121.37.131.224:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-gateway/src/main/resources/bootstrap.yml b/muyu-gateway/src/main/resources/bootstrap.yml index b15f786..dfb81f9 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: 121.37.131.224:8848 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 121.37.131.224:8848 # 配置文件格式 file-extension: yml # 共享配置 @@ -33,7 +33,7 @@ spring: datasource: ds1: nacos: - server-addr: 120.46.147.226:8848 + server-addr: 121.37.131.224: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..8f29304 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: 121.37.131.224:8848 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 121.37.131.224:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml b/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml index 3ec7c15..28f91ba 100644 --- a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 120.46.147.226:8848 + server-addr: 121.37.131.224:8848 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 121.37.131.224:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml b/muyu-modules/muyu-job/src/main/resources/bootstrap.yml index 364dc05..c4ad298 100644 --- a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-job/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 120.46.147.226:8848 + server-addr: 121.37.131.224:8848 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 121.37.131.224: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..9b4d555 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 @@ -32,11 +32,11 @@ public class ActivityTeamInfo extends BaseEntity { /** * 商品ID */ - private long productId; + private long projectId; /** * 商品活动图 */ - private String productImage; + private String projectImage; /** * 活动简介 */ @@ -82,8 +82,8 @@ public class ActivityTeamInfo extends BaseEntity { public static ActivityTeamInfo addModelBuild(ActivityTeamInfoAddModel activityTeamInfoAddModel){ return ActivityTeamInfo.builder() .name(activityTeamInfoAddModel.getName()) - .productId(activityTeamInfoAddModel.getProductId()) - .productImage(activityTeamInfoAddModel.getProductImage()) + .projectId(activityTeamInfoAddModel.getProductId()) + .projectImage(activityTeamInfoAddModel.getProductImage()) .introduction(activityTeamInfoAddModel.getIntroduction()) .unit(activityTeamInfoAddModel.getUnit()) .imageList(activityTeamInfoAddModel.getImageList()) @@ -99,8 +99,8 @@ public class ActivityTeamInfo extends BaseEntity { public static ActivityTeamInfo teamSaveBuild(ActivityTeamInfoSaveModel activityTeamInfoSaveModel) { return ActivityTeamInfo.builder() .name(activityTeamInfoSaveModel.getName()) - .productId(activityTeamInfoSaveModel.getProductId()) - .productImage(activityTeamInfoSaveModel.getProductImage()) + .projectId(activityTeamInfoSaveModel.getProductId()) + .projectImage(activityTeamInfoSaveModel.getProductImage()) .introduction(activityTeamInfoSaveModel.getIntroduction()) .unit(activityTeamInfoSaveModel.getUnit()) .imageList(activityTeamInfoSaveModel.getImageList()) @@ -116,8 +116,8 @@ public class ActivityTeamInfo extends BaseEntity { return ActivityTeamInfo.builder() .id(activityTeamInfoUpdModel.getId()) .name(activityTeamInfoUpdModel.getName()) - .productId(activityTeamInfoUpdModel.getProductId()) - .productImage(activityTeamInfoUpdModel.getProductImage()) + .projectId(activityTeamInfoUpdModel.getProductId()) + .projectImage(activityTeamInfoUpdModel.getProductImage()) .introduction(activityTeamInfoUpdModel.getIntroduction()) .unit(activityTeamInfoUpdModel.getUnit()) .imageList(activityTeamInfoUpdModel.getImageList()) 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..98bff64 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,7 @@ 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 lombok.*; import lombok.experimental.SuperBuilder; @@ -74,4 +75,12 @@ public class ActivityTeamProductSkuInfo extends BaseEntity { .build(); } + public static ActivityTeamProductSkuInfo updateModelBuild(ActivityTeamProductSkuUpdModel activityTeamProductSkuUpdModel) { + return ActivityTeamProductSkuInfo.builder() + .id(activityTeamProductSkuUpdModel.getId()) + .teamPrice(activityTeamProductSkuUpdModel.getTeamPrice()) + .teamStock(activityTeamProductSkuUpdModel.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..8b0a642 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 @@ -86,8 +86,8 @@ public class ActivityTeamDetailModel { return function.apply(ActivityTeamDetailModel.builder() .id(activityTeamInfo.getId()) .name(activityTeamInfo.getName()) - .productId(activityTeamInfo.getProductId()) - .productImage(activityTeamInfo.getProductImage()) + .productId(activityTeamInfo.getProjectId()) + .productImage(activityTeamInfo.getProjectImage()) .introduction(activityTeamInfo.getIntroduction()) .unit(activityTeamInfo.getUnit()) .imageList(activityTeamInfo.getImageList()) 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..e1215cf 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 @@ -58,7 +58,7 @@ public class ActivityTeamInfoAddModel { /** * 活动排序 */ - private Integer sort; + private Long sort; /** * 商品SkU集合 */ 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..a791df5 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 @@ -79,7 +79,7 @@ public class ActivityTeamInfoListModel { // .addTeamNumber(teamInTypeNumber) // .attendNumber(teamOpenTypeNumber + teamInTypeNumber) .endTime(activityTeamInfo.getEndTime()) - .productImage(activityTeamInfo.getProductImage()) + .productImage(activityTeamInfo.getProjectImage()) // .teamPrice(discountPrice.getTeamPrice()) // .productPrice(discountPrice.getProductPrice()) // .teamStock(teamProductStockModel.getTeamStock()) @@ -91,7 +91,7 @@ public class ActivityTeamInfoListModel { .id(activityTeamInfo.getId()) .name(activityTeamInfo.getName()) .endTime(activityTeamInfo.getEndTime()) - .productImage(activityTeamInfo.getProductImage()) + .productImage(activityTeamInfo.getProjectImage()) .status(activityTeamInfo.getStatus()) ); } 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..15013a8 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,56 +1,125 @@ package com.muyu.marketing.domain.model; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.marketing.domain.ActivityTeamInfo; import com.muyu.marketing.domain.req.ActivityTeamInfoUpdReq; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import java.util.Date; import java.util.List; /** - * @program: 2204a-cloud-server - * @description: 活动商品规格修改模型 - * @author: AoCi Tian - * @create: 2024-11-26 19:25 - **/ + * 拼团活动修改模板 + * + * @author SunLY + * @version 1.0 + * @date 2024/11/27 17:13 + */ @Data -@AllArgsConstructor @NoArgsConstructor -@Builder +@AllArgsConstructor +@SuperBuilder public class ActivityTeamInfoUpdModel { + /** + * 拼团ID + */ private Long id; + /** + * 拼团名称 + */ private String name; + /** + * 商品ID + */ private Long productId; + /** + * 商品活动图 + */ private String productImage; + /** + * 商品名称 + */ + private String productName; + /** + * 活动简介 + */ private String introduction; + /** + * 单位 + */ private String unit; + /** + * 轮播图 + */ private String imageList; + /** + * 活动结束时间 + */ + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") private Date endTime; + /** + * 排序 + */ private Long sort; + /** + * 简介 + */ private String content; + /** + * 排序 + */ private String status; - private String strategyType; + /** + * 策略ID + */ private Long strategyId; - private List activityTeamProductSkuModelList; + /** + * 策略类型 + */ + private String strategyType; + /** + * 修改商品规格list + */ + private List TeamProductSkuUpdList; - public static ActivityTeamInfoUpdModel activityTeamInfoUpdReqModelBuild (ActivityTeamInfoUpdReq activityTeamInfoUpdReq){ + /** + * 删除商品规格IDList + */ + private List TeamProductSkuDelList; + + /** + * 修改商品信息 + */ + private List TeamProductSkuAddList; + + + + public static ActivityTeamInfoUpdModel buildModel(ActivityTeamInfoUpdReq activityTeamInfoUpdReq) { return ActivityTeamInfoUpdModel.builder() .id(activityTeamInfoUpdReq.getId()) .name(activityTeamInfoUpdReq.getName()) .productId(activityTeamInfoUpdReq.getProductId()) .productImage(activityTeamInfoUpdReq.getProductImage()) + .productName(activityTeamInfoUpdReq.getProductName()) .introduction(activityTeamInfoUpdReq.getIntroduction()) .unit(activityTeamInfoUpdReq.getUnit()) - .imageList(activityTeamInfoUpdReq.getImageList()) + .imageList(activityTeamInfoUpdReq.getImageList()) .endTime(activityTeamInfoUpdReq.getEndTime()) + .strategyId(activityTeamInfoUpdReq.getStrategyId()) + .strategyType(activityTeamInfoUpdReq.getStrategyType()) .sort(activityTeamInfoUpdReq.getSort()) .content(activityTeamInfoUpdReq.getContent()) .status(activityTeamInfoUpdReq.getStatus()) - .strategyType(activityTeamInfoUpdReq.getStrategyType()) - .strategyId(activityTeamInfoUpdReq.getStrategyId()) - .activityTeamProductSkuModelList(activityTeamInfoUpdReq.getActivityTeamProductSkuList().stream().map(ActivityTeamProductSkuReqModel::activityTeamProductSkuReqModelBuild).toList()) + .TeamProductSkuAddList(activityTeamInfoUpdReq.getTeamProductSkuAddList()) + .TeamProductSkuDelList(activityTeamInfoUpdReq.getTeamProductSkuDelList()) + .TeamProductSkuUpdList(activityTeamInfoUpdReq.getTeamProductSkuUpdList()) .build(); } + + + } 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..ddc62bd 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 @@ -51,7 +51,7 @@ public class ActivityTeamInfoSaveReq extends BaseEntity { /** * 活动排序 */ - private Integer sort; + private Long sort; /** * 商品SkU集合 */ 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..82777ca 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,5 +1,8 @@ package com.muyu.marketing.domain.req; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel; +import com.muyu.marketing.domain.model.ActivityTeamProductSkuUpdModel; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -19,18 +22,75 @@ import java.util.List; @NoArgsConstructor @Builder public class ActivityTeamInfoUpdReq { + /** + * 拼团ID + */ private Long id; + /** + * 拼团名称 + */ private String name; + /** + * 商品ID + */ private Long productId; + /** + * 商品活动图 + */ private String productImage; + /** + * 商品名称 + */ + private String productName; + /** + * 活动简介 + */ private String introduction; + /** + * 单位 + */ private String unit; + /** + * 轮播图 + */ private String imageList; + /** + * 活动结束时间 + */ + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") private Date endTime; + /** + * 排序 + */ private Long sort; + /** + * 简介 + */ private String content; + /** + * 排序 + */ private String status; - private String strategyType; + /** + * 策略ID + */ private Long strategyId; - private List activityTeamProductSkuList; + /** + * 策略类型 + */ + private String strategyType; + /** + * 修改商品规格list + */ + private List TeamProductSkuUpdList; + + /** + * 删除商品规格IDList + */ + private List TeamProductSkuDelList; + + /** + * 修改商品信息 + */ + private List TeamProductSkuAddList; } 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..85466f6 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,7 @@ 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; 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..8c3b92a 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 @@ -59,13 +59,24 @@ public class ActivityTeamController { return Result.success(); } + /** + * 根据id查询团购活动详情 + * @param id + * @return + */ @PostMapping("/findById/{id}") public Result findTeamById(@PathVariable Long id){ return Result.success(TeamInfoFindByIdResp.teamInfoFindByIdBuild(activityTeamInfoService.findDetailById(id))); } - @PutMapping("/updateByTeamId") + + /** + * 修改拼团活动信息 + * @param + * @return + */ + @PostMapping("/updateByTeamId") public Result updateByTeamId(@RequestBody ActivityTeamInfoUpdReq activityTeamInfoUpdReq){ - activityTeamInfoService.update(ActivityTeamInfoUpdModel.activityTeamInfoUpdReqModelBuild(activityTeamInfoUpdReq)); + activityTeamInfoService.updateByTeamId(ActivityTeamInfoUpdModel.buildModel(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..0b71b4d 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 @@ -28,12 +28,9 @@ public interface ActivityTeamInfoService extends IService { */ ActivityTeamDetailModel findDetailById(Long id); - /** - * 修改团购活动信息 - * @param activityTeamInfoUpdModel 团购活动信息 - * @return 是否成功 - */ - boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel); + + + public boolean updateByTeamId(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..11f3aab 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 @@ -34,7 +34,7 @@ public interface ActivityTeamProductSkuInfoService extends IService activityTeamProductSkuAddModelList); @@ -46,6 +46,25 @@ public interface ActivityTeamProductSkuInfoService extends IService findListByTeamId(Long teamId); - public boolean updateBath(List activityTeamProductSkuReqModelList); + /** + * 更新团购商品SKU + * @param activityTeamProductSkuUpdModel 团购商品SKU更新模型 + * @return 是否更新成功 + */ + public boolean updateTeamProductSku(ActivityTeamProductSkuUpdModel activityTeamProductSkuUpdModel); + /** + * 批量更新团购商品SKU + * @param activityTeamProductSkuUpdModels + * @return + */ + public boolean updateTeamProductSkuList(List activityTeamProductSkuUpdModels); + + + /** + * 批量删除团购商品SKU + * @param productSkuIdList + * @return + */ + public boolean deleteTeamProductSkuList(List productSkuIdList); } 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..d02aa28 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,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.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; @@ -93,16 +94,27 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl @@ -95,9 +97,30 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl ActivityTeamProductSkuModel.FindBuild(activityTeamProductSkuInfo)).toList(); } - @Transactional @Override - public boolean updateBath(List activityTeamProductSkuReqModelList) { - return this.updateBatchById(activityTeamProductSkuReqModelList.stream().map(ActivityTeamProductSkuInfo::updateModelBuild).toList()); + public boolean updateTeamProductSku(ActivityTeamProductSkuUpdModel activityTeamProductSkuUpdModel) { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.set(ActivityTeamProductSkuInfo::getTeamPrice, activityTeamProductSkuUpdModel.getTeamPrice()); + updateWrapper.set(ActivityTeamProductSkuInfo::getTeamStock, activityTeamProductSkuUpdModel.getTeamStock()); + updateWrapper.set(ActivityTeamProductSkuInfo::getRemainStock, activityTeamProductSkuUpdModel.getTeamStock()); + updateWrapper.eq(ActivityTeamProductSkuInfo::getId, activityTeamProductSkuUpdModel.getId()); + return this.update(updateWrapper); + } + + @Override + public boolean updateTeamProductSkuList(List activityTeamProductSkuUpdModelList) { + return this.updateBatchById( + activityTeamProductSkuUpdModelList.stream(). + map(ActivityTeamProductSkuInfo::updateModelBuild) + .collect(Collectors.toList()) + ); + } + + @Override + public boolean deleteTeamProductSkuList(List productSkuIdList) { + return removeBatchByIds(productSkuIdList); + } + + } 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..d360c5a 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-marketing profiles: # 环境配置 active: dev @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 120.46.147.226:8848 + server-addr: 121.37.131.224:8848 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 121.37.131.224: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..de6bffc 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: 121.37.131.224:8848 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 121.37.131.224: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..b4c2eef 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: 121.37.131.224:8848 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 121.37.131.224: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..6bb1a83 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: 121.37.131.224:8848 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 121.37.131.224: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..30195a6 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: 121.37.131.224:8848 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 121.37.131.224:8848 # 配置文件格式 file-extension: yml # 共享配置