From b1e9c38b6381b6953f66faf8b97b91de42b06318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E9=9C=87?= <14767874+chenyuchen618@user.noreply.gitee.com> Date: Wed, 27 Nov 2024 14:25:44 +0800 Subject: [PATCH] =?UTF-8?q?1126=E6=B4=BB=E5=8A=A8=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=92=8C=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/团购添加数据结构.java | 5 ++ .../marketing/domain/ActivityTeamInfo.java | 27 +++++++- .../domain/ActivityTeamOpenInfo.java | 4 +- .../domain/ActivityTeamProductSkuInfo.java | 9 ++- .../model/ActivityTeamInfoAddModel.java | 28 ++++++++- .../model/ActivityTeamProductSkuAddModel.java | 12 ++++ .../model/TeamProductDiscountPriceModel.java | 2 +- .../marketing/domain/req/TeamInfoListReq.java | 3 +- .../controller/ActivityTeamController.java | 39 ++++++++++-- .../team/service/ActivityTeamInfoService.java | 14 +++-- .../ActivityTeamProductSkuInfoService.java | 11 ++-- .../impl/ActivityTeamInfoServiceImpl.java | 63 ++++++++++++++++--- .../impl/ActivityTeamOpenInfoServiceImpl.java | 1 - ...ActivityTeamProductSkuInfoServiceImpl.java | 24 ++++++- .../src/main/resources/bootstrap.yml | 8 ++- .../domain/model/AttributeGroupSaveModel.java | 1 + 16 files changed, 211 insertions(+), 40 deletions(-) diff --git a/doc/团购添加数据结构.java b/doc/团购添加数据结构.java index 8f8b26d..de95da9 100644 --- a/doc/团购添加数据结构.java +++ b/doc/团购添加数据结构.java @@ -12,6 +12,8 @@ $.{ "策略ID": "Long", "商品规格List": [ // activity_team_product_sku_info { + "productId": 6, + "teamId": 6, "规格SKU": "String", // activity_team_product_sku_info.product_sku "拼团价格": "BigDecimal", "拼团库存": "Long" @@ -45,3 +47,6 @@ activity_team_product_sku_info.product_sku(商品SKU) <- ActivityTeamProductSkuI activity_team_product_sku_info.team_stock(拼团库存) <- ActivityTeamProductSkuInfo.teamStock <- @商品规格.拼团库存 activity_team_product_sku_info.remain_stock(剩余库存) <- ActivityTeamProductSkuInfo.remainStock <- @商品规格.拼团库存 activity_team_product_sku_info.team_price(拼团价格) <- ActivityTeamProductSkuInfo.teamPrice <- @商品规格.拼团价格 + + + 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 e94e0db..e907e91 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 @@ -5,11 +5,14 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel; +import com.muyu.marketing.domain.model.ActivityTeamUpdModel; import lombok.*; import lombok.experimental.SuperBuilder; import java.util.Date; - +/** + * 商品拼团信息 + */ @Data @SuperBuilder @NoArgsConstructor @@ -74,10 +77,11 @@ public class ActivityTeamInfo extends BaseEntity { /** * 公共添加模型，转换成添加对象 + * * @param activityTeamInfoAddModel 添加模型 * @return 添加对象 */ - public static ActivityTeamInfo addModelBuild(ActivityTeamInfoAddModel activityTeamInfoAddModel){ + public static ActivityTeamInfo addModelBuild(ActivityTeamInfoAddModel activityTeamInfoAddModel) { return ActivityTeamInfo.builder() .name(activityTeamInfoAddModel.getName()) .productId(activityTeamInfoAddModel.getProductId()) @@ -93,4 +97,23 @@ public class ActivityTeamInfo extends BaseEntity { .strategyId(activityTeamInfoAddModel.getStrategyId()) .build(); } + + public static ActivityTeamInfo updModelBuild(ActivityTeamUpdModel activityTeamUpdModel) { + return ActivityTeamInfo.builder() + .id(activityTeamUpdModel.getTeamId()) + .name(activityTeamUpdModel.getName()) + .productId(activityTeamUpdModel.getProductId()) + .productImage(activityTeamUpdModel.getProductImage()) + .introduction(activityTeamUpdModel.getIntroduction()) + .unit(activityTeamUpdModel.getUnit()) + .imageList(activityTeamUpdModel.getImageList()) + .endTime(activityTeamUpdModel.getEndTime()) + .sort(activityTeamUpdModel.getSort()) + .content(activityTeamUpdModel.getContent()) + .status(activityTeamUpdModel.getStatus()) + .strategyType(activityTeamUpdModel.getStrategyType()) + .strategyId(activityTeamUpdModel.getStrategyId()) + .build(); + } + } 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..6f4bda0 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 @@ -8,7 +8,9 @@ import lombok.*; import lombok.experimental.SuperBuilder; import java.util.Date; - +/** + * 团购活动 + */ @Data @SuperBuilder @NoArgsConstructor 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..aa70b32 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 @@ -9,7 +9,9 @@ import lombok.*; import lombok.experimental.SuperBuilder; import java.math.BigDecimal; - +/** + * 商品拼团规格 + */ @Data @SuperBuilder @NoArgsConstructor @@ -60,6 +62,9 @@ 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/ActivityTeamInfoAddModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java index 40b2def..512a399 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 @@ -2,6 +2,8 @@ package com.muyu.marketing.domain.model; import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; +import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq; import com.muyu.marketing.domain.req.ProjectSkuInfoAddReq; import lombok.AllArgsConstructor; import lombok.Builder; @@ -22,7 +24,6 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor public class ActivityTeamInfoAddModel { - /** * 拼团名称 */ @@ -78,4 +79,29 @@ public class ActivityTeamInfoAddModel { * 策略ID */ private Long strategyId; + + + public static ActivityTeamInfoAddModel dobuild(ActivityTeamInfoSaveReq activityTeamInfoSaveReq){ + return ActivityTeamInfoAddModel.builder() + .name(activityTeamInfoSaveReq.getName()) + .productId(activityTeamInfoSaveReq.getProductId()) + .productImage(activityTeamInfoSaveReq.getProductImage()) + .introduction(activityTeamInfoSaveReq.getIntroduction()) + .unit(activityTeamInfoSaveReq.getUnit()) + .imageList(activityTeamInfoSaveReq.getImageList()) + .endTime(activityTeamInfoSaveReq.getEndTime()) + .sort(activityTeamInfoSaveReq.getSort()) + .content(activityTeamInfoSaveReq.getContent()) + .status(activityTeamInfoSaveReq.getStatus()) + .strategyType(activityTeamInfoSaveReq.getStrategyType()) + .strategyId(activityTeamInfoSaveReq.getStrategyId()) + .activityTeamProductSkuAddModelList(activityTeamInfoSaveReq.getProjectSkuInfoAddReqList().stream().map(addReq-> + ActivityTeamProductSkuAddModel.dbuild(addReq,activityTeamInfoSaveReq::getProductId) + ).toList() + ).build(); + } + + + + } diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuAddModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuAddModel.java index 62195d0..4dc8c05 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuAddModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuAddModel.java @@ -1,12 +1,14 @@ package com.muyu.marketing.domain.model; +import com.muyu.marketing.domain.req.ProjectSkuInfoAddReq; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import java.math.BigDecimal; +import java.util.function.Supplier; /** * 团购spu库存添加模型 @@ -44,4 +46,14 @@ public class ActivityTeamProductSkuAddModel { * 拼团库存 */ private Long teamStock; + + public static ActivityTeamProductSkuAddModel dbuild (ProjectSkuInfoAddReq projectSkuInfoAddReq, Supplier productId){ + return ActivityTeamProductSkuAddModel.builder() + .productId(productId.get()) + .sku(projectSkuInfoAddReq.getSku()) + .teamStock(projectSkuInfoAddReq.getTeamStock()) + .teamPrice(projectSkuInfoAddReq.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..838d8e7 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-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 4694815..61d12f9 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 @@ -3,16 +3,20 @@ package com.muyu.marketing.team.controller; import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.page.TableDataInfo; -import com.muyu.marketing.domain.model.ActivityTeamInfoListModel; +import com.muyu.marketing.domain.ActivityTeamInfo; +import com.muyu.marketing.domain.model.*; +import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq; +import com.muyu.marketing.domain.req.ProjectSkuInfoAddReq; import com.muyu.marketing.domain.req.TeamInfoListReq; +import com.muyu.marketing.domain.resp.ActivityTeamDetailResp; import com.muyu.marketing.domain.resp.TeamInfoListResp; +import com.muyu.marketing.domain.resp.TeamProjectSkuInfoResp; import com.muyu.marketing.team.service.ActivityTeamInfoService; +import com.muyu.marketing.team.service.ActivityTeamProductSkuInfoService; 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 javax.websocket.server.PathParam; import java.util.List; /** @@ -27,6 +31,9 @@ public class ActivityTeamController { @Autowired private ActivityTeamInfoService activityTeamInfoService;; + @Autowired + private ActivityTeamProductSkuInfoService activityTeamProductSkuInfoService; + /** * 查询营销团购活动列表 @@ -44,4 +51,26 @@ public class ActivityTeamController { }} ); } + + @PostMapping("/add") + public Result add (@RequestBody ActivityTeamInfoSaveReq projectSkuInfoAddReq){ + activityTeamInfoService.save(ActivityTeamInfoAddModel.dobuild(projectSkuInfoAddReq)); + + return Result.success("ok"); + } + + + @GetMapping("/id") + public Result findById(@RequestParam("id")Long id){ + ActivityTeamInfoDetailModel teamInfo = activityTeamInfoService.findById(id); + + ActivityTeamDetailResp teamInfoDetailResp = ActivityTeamDetailResp.setUpDatailResp( + teamInfo, + teamId -> TeamProjectSkuInfoResp.teamProjectSkuInfoResp(activityTeamProductSkuInfoService.findByTeamId(teamId)) + ); + + return Result.success(teamInfoDetailResp); + } + + } 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..86cc606 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 @@ -1,27 +1,29 @@ package com.muyu.marketing.team.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.page.TableDataInfo; 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.*; +import com.muyu.marketing.domain.resp.ActivityTeamDetailResp; +import com.muyu.marketing.domain.resp.ActivityTeamProjectSkuResp; import java.util.List; public interface ActivityTeamInfoService extends IService { - - /** * 通过查询模型查询团购活动列表 * @param activityTeamInfoListQueryModel 团购活动查询模型 * @return 团购活动列表 */ public TableDataInfo query(ActivityTeamInfoListQueryModel activityTeamInfoListQueryModel); - /** * 通过添加模型，去进行商品拼团活动的操作 * @param activityTeamInfoAddModel 团购添加模型 */ public void save(ActivityTeamInfoAddModel activityTeamInfoAddModel); + + ActivityTeamInfoDetailModel findById(Long id); + + public void upd(ActivityTeamUpdModel activityTeamUpdModelList); } 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..51ca119 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 @@ -3,10 +3,7 @@ package com.muyu.marketing.team.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.TeamProductDiscountPriceModel; -import com.muyu.marketing.domain.model.TeamProductStockModel; +import com.muyu.marketing.domain.model.*; import java.util.List; @@ -26,7 +23,6 @@ public interface ActivityTeamProductSkuInfoService extends IService activityTeamProductSkuAddModelList); + + public List findByTeamId(Long teamId); + + public void updsku(List activityTeamSKuModelList); + } 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 e4e9313..7dfc974 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 @@ -2,23 +2,34 @@ package com.muyu.marketing.team.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.domain.Result; 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.domain.req.ProjectSkuInfoAddReq; +import com.muyu.marketing.domain.resp.ActivityTeamDetailResp; +import com.muyu.marketing.domain.resp.ActivityTeamProjectSkuResp; 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 com.muyu.product.domain.AsCategoryAttribute; +import com.muyu.product.domain.CategoryInfo; +import com.muyu.product.domain.req.CategoryInfoEditReq; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; +import java.util.stream.Collectors; @Service @@ -75,14 +86,48 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl activityTeamProductSkuAddModelList = activityTeamInfoAddModel.getActivityTeamProductSkuAddModelList(); + activityTeamProductSkuAddModelList.forEach(activityTeamProductSkuAddModel -> { + activityTeamProductSkuAddModel.setTeamId(activityTeamInfo.getId()); + }); + activityTeamProductSkuInfoService.batchSave(activityTeamProductSkuAddModelList); } + + +// @Override +// public Result updbyid(Long id, ActivityTeamDetailResp activityTeamDetailResp) { +// ActivityTeamInfo activityTeamInfo = new ActivityTeamInfo(); +// BeanUtils.copyProperties(activityTeamDetailResp,activityTeamInfo); +// +// List projectSkuInfoModelList = activityTeamDetailResp.getProjectSkuInfoModelList(); +// +// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); +// queryWrapper.eq(ActivityTeamProductSkuInfo::getTeamId,id); +// +// +// activityTeamProductSkuInfoService.updateBatchById(activityTeamDetailResp,) +// +// return null; +// } + @Override + public ActivityTeamInfoDetailModel findById(Long id) { + return ActivityTeamInfoDetailModel.activityTeamInfoDetailModel(this.getById(id)); + } + + @Override + public void upd(ActivityTeamUpdModel activityTeamUpdModelList) { + ActivityTeamInfo activityTeamInfo = ActivityTeamInfo.updModelBuild(activityTeamUpdModelList); + boolean update = this.updateById(activityTeamInfo); + List projectSkuInfoAddReqList = activityTeamUpdModelList.getProjectSkuInfoAddReqList(); + + projectSkuInfoAddReqList.forEach(model->{ + model.setProductId(activityTeamInfo.getProductId()); + model.setTeamId(activityTeamInfo.getId()); + }); + } + } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamOpenInfoServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamOpenInfoServiceImpl.java index 7111bf7..e685dd0 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamOpenInfoServiceImpl.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamOpenInfoServiceImpl.java @@ -27,5 +27,4 @@ public class ActivityTeamOpenInfoServiceImpl extends ServiceImpl findByTeamId(Long teamId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper() + .eq(ActivityTeamProductSkuInfo::getTeamId, teamId); + List activityTeamProductSkuInfoList = this.list(wrapper); + return activityTeamProductSkuInfoList.stream(). + map(ActivityTeamProductSkuInfoListModel::infoListModel) + .toList(); + } + + + @Override + public void updsku(List activityTeamSKuModelList) { + + } + + } 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..e5bb132 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 @@ -1,6 +1,6 @@ # Tomcat server: - port: 9209 + port: 9286 # Spring spring: @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 1.94.98.9:8848 + namespace: asdasd config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 1.94.98.9:8848 + namespace: asdasd # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/AttributeGroupSaveModel.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/AttributeGroupSaveModel.java index eecfb3f..b4d2831 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/AttributeGroupSaveModel.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/model/AttributeGroupSaveModel.java @@ -46,6 +46,7 @@ public class AttributeGroupSaveModel extends BaseEntity { .build(); } + public AttributeGroup buildAttributeGroup () { return AttributeGroup.builder() .name(this.getName())