From 8577c3260c50c7f508cee3e5eb7f0f2907fcd6e3 Mon Sep 17 00:00:00 2001 From: masongjia <3322083607@qq.com> Date: Tue, 26 Nov 2024 22:13:23 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8B=BC=E5=9B=A2=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- muyu-auth/src/main/resources/bootstrap.yml | 6 +- muyu-gateway/src/main/resources/bootstrap.yml | 8 +- .../src/main/resources/bootstrap.yml | 6 +- .../muyu-gen/src/main/resources/bootstrap.yml | 6 +- .../muyu-job/src/main/resources/bootstrap.yml | 6 +- .../domain/ActivityTeamProductSkuInfo.java | 4 +- .../model/ActivityTeamInfoListModel.java | 2 +- .../domain/model/ActivityTeamInfoModel.java | 108 ++++++++++++++++++ .../ActivityTeamProductSkuInfoModel.java | 65 +++++++++++ .../model/TeamProductDiscountPriceModel.java | 2 +- .../marketing/domain/req/TeamInfoListReq.java | 3 +- .../domain/resp/ActivityTeamInfoResponse.java | 77 +++++++++++++ .../ActivityTeamProductSkuInfoResponse.java | 45 ++++++++ .../controller/ActivityTeamController.java | 19 ++- .../team/service/ActivityTeamInfoService.java | 19 +++ .../ActivityTeamProductSkuInfoService.java | 9 ++ .../impl/ActivityTeamInfoServiceImpl.java | 51 +++++++++ ...ActivityTeamProductSkuInfoServiceImpl.java | 27 +++++ .../src/main/resources/bootstrap.yml | 6 +- .../src/main/resources/bootstrap.yml | 6 +- .../src/main/resources/bootstrap.yml | 6 +- .../src/main/resources/bootstrap.yml | 6 +- .../src/main/resources/bootstrap.yml | 6 +- 23 files changed, 464 insertions(+), 29 deletions(-) create mode 100644 muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoModel.java create mode 100644 muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuInfoModel.java create mode 100644 muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamInfoResponse.java create mode 100644 muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamProductSkuInfoResponse.java diff --git a/muyu-auth/src/main/resources/bootstrap.yml b/muyu-auth/src/main/resources/bootstrap.yml index b309a3d..9d73e24 100644 --- a/muyu-auth/src/main/resources/bootstrap.yml +++ b/muyu-auth/src/main/resources/bootstrap.yml @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.71.140.64:8848 + namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.71.140.64:8848 + namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-gateway/src/main/resources/bootstrap.yml b/muyu-gateway/src/main/resources/bootstrap.yml index d7367b4..8bf97bd 100644 --- a/muyu-gateway/src/main/resources/bootstrap.yml +++ b/muyu-gateway/src/main/resources/bootstrap.yml @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.71.140.64:8848 + namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.71.140.64:8848 + namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2 # 配置文件格式 file-extension: yml # 共享配置 @@ -33,7 +35,7 @@ spring: datasource: ds1: nacos: - server-addr: 127.0.0.1:8848 + server-addr: 124.71.140.64: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 0cb85bd..db1a7f5 100644 --- a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-file/src/main/resources/bootstrap.yml @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.71.140.64:8848 + namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.71.140.64:8848 + namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2 # 配置文件格式 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 b628931..30c54fe 100644 --- a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.71.140.64:8848 + namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.71.140.64:8848 + namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2 # 配置文件格式 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 618f3e8..4449dbc 100644 --- a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-job/src/main/resources/bootstrap.yml @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.71.140.64:8848 + namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.71.140.64:8848 + namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2 # 配置文件格式 file-extension: yml # 共享配置 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..06fc668 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 @@ -1,6 +1,7 @@ package com.muyu.marketing.domain; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.web.domain.BaseEntity; @@ -26,6 +27,7 @@ public class ActivityTeamProductSkuInfo extends BaseEntity { /** * 活动ID */ + @TableField(value = "team_id") private long teamId; /** * 商品ID @@ -60,6 +62,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/ActivityTeamInfoListModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListModel.java index e38fadf..6a133ef 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 @@ -11,7 +11,7 @@ import java.util.function.Consumer; import java.util.function.Function; /** - * 团购活动雷彪查询结果模型 + * 团购活动列表查询结果模型 * @author DongZeLiang * @date 2024-11-20 14:18:10 */ diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoModel.java new file mode 100644 index 0000000..498a58a --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoModel.java @@ -0,0 +1,108 @@ +package com.muyu.marketing.domain.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.muyu.marketing.domain.ActivityTeamInfo; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; +import java.util.List; + +/** + * 拼团活动响应模型 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class ActivityTeamInfoModel { + + /** + * 主键 + */ + private long id; + /** + * 拼团名称 + */ + private String name; + /** + * 商品ID + */ + private long productId; + /** + * 商品活动图 + */ + private String productImage; + /** + * 活动简介 + */ + private String introduction; + /** + * 单位 + */ + private String unit; + /** + * 轮播图 + */ + private String imageList; + /** + * 活动结束时间 + */ + private Date endTime; + /** + * 活动排序 + */ + private long sort; + /** + * 活动详情 + */ + private String content; + /** + * 活动状态 + */ + private String status; + /** + * 策略类型 + */ + private String strategyType; + /** + * 策略ID + */ + private long strategyId; + + /** + * 拼团活动规格信息 + */ + private List activityTeamProductSkuInfoModelList; + + + /** + * 拼团活动响应模型转换 + * @param activityTeamInfo + * @param activityTeamProductSkuInfoModelList + * @return + */ + public static ActivityTeamInfoModel ActivityTeamInfoModelBuilder(ActivityTeamInfo activityTeamInfo, List activityTeamProductSkuInfoModelList){ + return ActivityTeamInfoModel.builder() + .id(activityTeamInfo.getId()) + .name(activityTeamInfo.getName()) + .productId(activityTeamInfo.getProductId()) + .productImage(activityTeamInfo.getProductImage()) + .introduction(activityTeamInfo.getIntroduction()) + .unit(activityTeamInfo.getUnit()) + .imageList(activityTeamInfo.getImageList()) + .endTime(activityTeamInfo.getEndTime()) + .sort(activityTeamInfo.getSort()) + .content(activityTeamInfo.getContent()) + .status(activityTeamInfo.getStatus()) + .strategyType(activityTeamInfo.getStrategyType()) + .strategyId(activityTeamInfo.getStrategyId()) + .activityTeamProductSkuInfoModelList(activityTeamProductSkuInfoModelList) + .build(); + } + + +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuInfoModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuInfoModel.java new file mode 100644 index 0000000..ebf0d4f --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuInfoModel.java @@ -0,0 +1,65 @@ +package com.muyu.marketing.domain.model; + +import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +/** + * 拼团活动规则模型响应 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ActivityTeamProductSkuInfoModel { + /** + * 主键 + */ + private long id; + /** + * 活动ID + */ + private long teamId; + /** + * 商品ID + */ + private Long productId; + /** + * 商品SKU + */ + private String productSku; + /** + * 拼团库存 + */ + private Long teamStock; + /** + * 剩余库存 + */ + private Long remainStock; + /** + * 拼团价格 + */ + private BigDecimal teamPrice; + + + /** + * 回显拼团活动规格模型 + * @param activityTeamProductSkuInfo + * @return + */ + public static ActivityTeamProductSkuInfoModel reqSkuBulider(ActivityTeamProductSkuInfo activityTeamProductSkuInfo){ + return ActivityTeamProductSkuInfoModel.builder() + .id(activityTeamProductSkuInfo.getId()) + .teamId(activityTeamProductSkuInfo.getTeamId()) + .productId(activityTeamProductSkuInfo.getProductId()) + .productSku(activityTeamProductSkuInfo.getProductSku()) + .teamStock(activityTeamProductSkuInfo.getTeamStock()) + .remainStock(activityTeamProductSkuInfo.getRemainStock()) + .teamPrice(activityTeamProductSkuInfo.getTeamPrice()) + .build(); + } +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamProductDiscountPriceModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamProductDiscountPriceModel.java index 61f9d08..e7a98a2 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamProductDiscountPriceModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamProductDiscountPriceModel.java @@ -44,7 +44,7 @@ public class TeamProductDiscountPriceModel { * @return 优惠力度 */ public static TeamProductDiscountPriceModel of(BigDecimal productPrice, BigDecimal teamPrice) { - TeamProductDiscountPriceModel.builder() + return TeamProductDiscountPriceModel.builder() .productPrice(productPrice) .teamPrice(teamPrice) .discount( diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamInfoListReq.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamInfoListReq.java index fcfc308..4dab2b5 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamInfoListReq.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamInfoListReq.java @@ -3,9 +3,10 @@ package com.muyu.marketing.domain.req; import com.muyu.common.core.web.page.PageDomain; import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel; import lombok.*; +import lombok.experimental.SuperBuilder; @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamInfoResponse.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamInfoResponse.java new file mode 100644 index 0000000..acfa19c --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamInfoResponse.java @@ -0,0 +1,77 @@ +package com.muyu.marketing.domain.resp; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +import java.util.Date; +import java.util.List; + +/** + * 拼团活动回显 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class ActivityTeamInfoResponse { + /** + * 主键 + */ + 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 Integer sort; + /** + * 活动详情 + */ + private String content; + /** + * 活动状态 + */ + private String status; + /** + * 策略类型 + */ + private String strategyType; + /** + * 策略ID + */ + private Long strategyId; + /** + * 商品SkU集合 + */ + private List teamProjectSkuInfoAddReqList; +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamProductSkuInfoResponse.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamProductSkuInfoResponse.java new file mode 100644 index 0000000..2759e8b --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamProductSkuInfoResponse.java @@ -0,0 +1,45 @@ +package com.muyu.marketing.domain.resp; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.math.BigDecimal; + +/** + * 拼团活动规格回显 + */ +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor +public class ActivityTeamProductSkuInfoResponse { + /** + * 主键 + */ + private long id; + /** + * 商品ID + */ + private Long productId; + /** + * 商品SKU + */ + private String productSku; + /** + * 拼团库存 + */ + private Long teamStock; + /** + * 剩余库存 + */ + private Long remainStock; + /** + * 拼团价格 + */ + private BigDecimal teamPrice; + +} 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 342b35d..c88f13f 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 @@ -1,19 +1,19 @@ package com.muyu.marketing.team.controller; +import com.dtflys.forest.annotation.Get; import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel; import com.muyu.marketing.domain.model.ActivityTeamInfoListModel; +import com.muyu.marketing.domain.model.ActivityTeamInfoModel; import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq; import com.muyu.marketing.domain.req.TeamInfoListReq; +import com.muyu.marketing.domain.resp.ActivityTeamInfoResponse; import com.muyu.marketing.domain.resp.TeamInfoListResp; import com.muyu.marketing.team.service.ActivityTeamInfoService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -58,4 +58,15 @@ public class ActivityTeamController { activityTeamInfoService.save(ActivityTeamInfoAddModel.addReqBuild(activityTeamInfoSaveReq)); return Result.success(); } + + /** + * 拼团活动回显 + * @param id + * @return + */ + @GetMapping("/Echo/{id}") + public Result echo(@PathVariable Long id){ + ActivityTeamInfoResponse activityTeamInfoResponse = activityTeamInfoService.activityTeamInfoModel(id); + return Result.success(activityTeamInfoResponse); + } } 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 21d9f00..bee42c8 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 @@ -6,6 +6,8 @@ import com.muyu.marketing.domain.ActivityTeamInfo; 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.model.ActivityTeamInfoModel; +import com.muyu.marketing.domain.resp.ActivityTeamInfoResponse; import java.util.List; @@ -24,4 +26,21 @@ public interface ActivityTeamInfoService extends IService { * @param activityTeamInfoAddModel 团购添加模型 */ public void save(ActivityTeamInfoAddModel activityTeamInfoAddModel); + + + /** + * 通过id返回拼团活动信息 + * @param id + * @return + */ + public ActivityTeamInfoResponse activityTeamInfoModel(Long id); + + /** + * 修改拼团活动 + */ + public void updactivityTeamInfo(ActivityTeamInfoAddModel activityTeamInfoAddModel,Long id); + + + + } 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 6a5d6dd..6224b1c 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 @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; import com.muyu.marketing.domain.TeamStrategyExemptionHundred; import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel; +import com.muyu.marketing.domain.model.ActivityTeamProductSkuInfoModel; import com.muyu.marketing.domain.model.TeamProductDiscountPriceModel; import com.muyu.marketing.domain.model.TeamProductStockModel; @@ -41,4 +42,12 @@ public interface ActivityTeamProductSkuInfoService extends IService activityTeamProductSkuAddModelList); + + /** + * 通过活动teamId查询活动规格信息 + * @param teamId + * @return + */ + public List ActivityTeamProductSkuInfoModelList(Long teamId); + } 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 c65d649..d1b9a93 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 @@ -9,10 +9,13 @@ 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.model.*; +import com.muyu.marketing.domain.resp.ActivityTeamInfoResponse; +import com.muyu.marketing.domain.resp.ActivityTeamProductSkuInfoResponse; import com.muyu.marketing.team.mapper.ActivityTeamInfoMapper; import com.muyu.marketing.team.service.ActivityTeamInfoService; import com.muyu.marketing.team.service.ActivityTeamOpenInfoService; import com.muyu.marketing.team.service.ActivityTeamProductSkuInfoService; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.Assert; @@ -32,6 +35,7 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl query(ActivityTeamInfoListQueryModel activityTeamInfoListQueryModel) { @@ -82,4 +86,51 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl activityTeamProductSkuAddModel.setTeamId(activityTeamInfo.getId())); this.activityTeamProductSkuInfoService.batchSave(teamProductSkuAddModelList); } + + @Override + public ActivityTeamInfoResponse activityTeamInfoModel(Long id) { + List activityTeamProductSkuInfoModelList = activityTeamProductSkuInfoService.ActivityTeamProductSkuInfoModelList(id); + + ActivityTeamInfoModel activityTeamInfoModel = ActivityTeamInfoModel.ActivityTeamInfoModelBuilder(this.getById(id), activityTeamProductSkuInfoModelList); + + List activityTeamInfoModelActivityTeamProductSkuInfoModelList = activityTeamInfoModel.getActivityTeamProductSkuInfoModelList(); + + ArrayList activityTeamProductSkuInfoResponses = new ArrayList<>(); + + + activityTeamInfoModelActivityTeamProductSkuInfoModelList.stream().map(ActivityTeamProductSkuInfoModel->{ + return activityTeamProductSkuInfoResponses.add( + ActivityTeamProductSkuInfoResponse.builder() + .id(ActivityTeamProductSkuInfoModel.getId()) + .productId(ActivityTeamProductSkuInfoModel.getProductId()) + .productSku(ActivityTeamProductSkuInfoModel.getProductSku()) + .teamStock(ActivityTeamProductSkuInfoModel.getTeamStock()) + .remainStock(ActivityTeamProductSkuInfoModel.getRemainStock()) + .teamPrice(ActivityTeamProductSkuInfoModel.getTeamPrice()) + .build() + ); + + }).toList(); + return ActivityTeamInfoResponse.builder() + .id(activityTeamInfoModel.getId()) + .name(activityTeamInfoModel.getName()) + .productId(activityTeamInfoModel.getProductId()) + .productImage(activityTeamInfoModel.getProductImage()) + .introduction(activityTeamInfoModel.getIntroduction()) + .unit(activityTeamInfoModel.getUnit()) + .imageList(activityTeamInfoModel.getImageList()) + .endTime((activityTeamInfoModel.getEndTime())) + .sort((int) activityTeamInfoModel.getSort()) + .status(activityTeamInfoModel.getStatus()) + .content(activityTeamInfoModel.getContent()) + .strategyType(activityTeamInfoModel.getStrategyType()) + .strategyId(activityTeamInfoModel.getStrategyId()) + .teamProjectSkuInfoAddReqList(activityTeamProductSkuInfoResponses) + .build(); + } + + @Override + public void updactivityTeamInfo(ActivityTeamInfoAddModel activityTeamInfoAddModel,Long id) { + + } } 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 6e87518..8317f73 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 @@ -5,12 +5,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.exception.ServiceException; import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel; +import com.muyu.marketing.domain.model.ActivityTeamProductSkuInfoModel; import com.muyu.marketing.domain.model.TeamProductDiscountPriceModel; import com.muyu.marketing.domain.model.TeamProductStockModel; import com.muyu.marketing.team.mapper.ActivityTeamProductSkuInfoMapper; import com.muyu.marketing.team.service.ActivityTeamProductSkuInfoService; import com.muyu.product.cache.ProjectSkuCache; import com.muyu.product.domain.ProjectSkuInfo; +import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -80,4 +82,29 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl ActivityTeamProductSkuInfoModelList(Long teamId) { + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + queryWrapper.eq(ActivityTeamProductSkuInfo::getTeamId,teamId); + + List list = this.list(queryWrapper); + + List activityTeamProductSkuInfoModelList = list.stream(). + map(ActivityTeamProductSkuInfo -> { + ActivityTeamProductSkuInfoModel teamProductSkuInfoModel = ActivityTeamProductSkuInfoModel.reqSkuBulider(ActivityTeamProductSkuInfo); + return teamProductSkuInfoModel; + }).toList(); + + return activityTeamProductSkuInfoModelList; + +// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); +// queryWrapper.eq(ActivityTeamProductSkuInfo::getTeamId,teamId); +// List list = this.list(queryWrapper); +// List activityTeamProductSkuInfoModels = list.stream().map(ActivityTeamProductSkuInfoModel::reqSkuBulider).toList(); +// return activityTeamProductSkuInfoModels; + } } 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 78b5a7b..7d40172 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 @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.71.140.64:8848 + namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.71.140.64:8848 + namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2 # 配置文件格式 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 e8bd02d..1a09d1a 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,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.71.140.64:8848 + namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.71.140.64:8848 + namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2 # 配置文件格式 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 8e54ec5..b3bcaf3 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,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.71.140.64:8848 + namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.71.140.64:8848 + namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2 # 配置文件格式 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 a66fd4c..c06ea99 100644 --- a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-system/src/main/resources/bootstrap.yml @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.71.140.64:8848 + namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.71.140.64:8848 + namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2 # 配置文件格式 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 1276c8e..bc92bf4 100644 --- a/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml +++ b/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.71.140.64:8848 + namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.71.140.64:8848 + namespace: 95a93f7f-1c87-4d5b-bc19-307ca59032d2 # 配置文件格式 file-extension: yml # 共享配置