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 7e1b7ab..daee31f 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,10 +5,12 @@ 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.ActivityTeamInfoUpdModel; import lombok.*; import lombok.experimental.SuperBuilder; import java.util.Date; +import java.util.List; @Data @SuperBuilder @@ -93,4 +95,20 @@ public class ActivityTeamInfo extends BaseEntity { .strategyId(activityTeamInfoAddModel.getStrategyId()) .build(); } + + + public static ActivityTeamInfo updBuildModel(ActivityTeamInfoUpdModel activityTeamInfoUpdModel){ + return ActivityTeamInfo.builder() + .id(activityTeamInfoUpdModel.getId()) + .name(activityTeamInfoUpdModel.getName()) + .productId(activityTeamInfoUpdModel.getProductId()) + .productImage(activityTeamInfoUpdModel.getProductImage()) + .introduction(activityTeamInfoUpdModel.getIntroduction()) + .unit(activityTeamInfoUpdModel.getUnit()) + .imageList(activityTeamInfoUpdModel.getImageList()) + .sort(activityTeamInfoUpdModel.getSort()) + .content(activityTeamInfoUpdModel.getContent()) + .status(activityTeamInfoUpdModel.getStatus()) + .build(); + } } 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 b663274..af539ff 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 @@ -5,6 +5,7 @@ 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.ActivityTeamProductSkuAddModel; +import com.muyu.marketing.domain.model.ActivityTeamProductSkuInfoUpdModel; import lombok.*; import lombok.experimental.SuperBuilder; @@ -62,4 +63,35 @@ public class ActivityTeamProductSkuInfo extends BaseEntity { .teamPrice(activityTeamProductSkuAddModel.getTeamPrice()) .build(); } + + public static ActivityTeamProductSkuInfo updateBuildModel(ActivityTeamProductSkuInfoUpdModel activityTeamProductSkuInfoUpdModel){ + return ActivityTeamProductSkuInfo.builder() + .id(activityTeamProductSkuInfoUpdModel.getId()) + .teamPrice(activityTeamProductSkuInfoUpdModel.getTeamPrice()) + .teamStock(activityTeamProductSkuInfoUpdModel.getTeamStock()) + .build(); + } + + public static ActivityTeamProductSkuInfo addBuildModel(ActivityTeamProductSkuAddModel activityTeamProductSkuAddModel) { + return ActivityTeamProductSkuInfo.builder() + .teamId(activityTeamProductSkuAddModel.getTeamId()) + .productSku(activityTeamProductSkuAddModel.getProductSku()) + .teamStock(activityTeamProductSkuAddModel.getTeamStock()) + .remainStock(activityTeamProductSkuAddModel.getTeamStock()) + .teamPrice(activityTeamProductSkuAddModel.getTeamPrice()) + .build(); + } + + + public static ActivityTeamProductSkuInfo addProductBuildModel(ActivityTeamProductSkuAddModel activityTeamProductSkuAddModel) { + return ActivityTeamProductSkuInfo.builder() + .productId(activityTeamProductSkuAddModel.getProductId()) + .teamId(activityTeamProductSkuAddModel.getTeamId()) + .productSku(activityTeamProductSkuAddModel.getProductSku()) + .teamStock(activityTeamProductSkuAddModel.getTeamStock()) + .remainStock(activityTeamProductSkuAddModel.getTeamStock()) + .teamPrice(activityTeamProductSkuAddModel.getTeamPrice()) + .build(); + } + } 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 83e3558..7452ec1 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,13 +1,17 @@ package com.muyu.marketing.domain.model; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; + +import com.muyu.common.core.utils.bean.BeanUtils; +import com.muyu.marketing.domain.req.ActivityTeamInfoUpdReq; +import com.muyu.marketing.domain.req.ActivityTeamProductSkuInfoReq; +import com.muyu.marketing.domain.req.ActivityTeamProductSkuInfoUpdReq; +import com.muyu.marketing.domain.req.TeamProjectSkuInfoAddReq; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.Date; + import java.util.List; /** @@ -18,6 +22,11 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor public class ActivityTeamInfoUpdModel { + /** + * 活动id + */ + private Long id; + /** * 拼团名称 */ @@ -42,7 +51,6 @@ public class ActivityTeamInfoUpdModel { /** * 轮播图 */ - private String imageList; /** @@ -59,10 +67,54 @@ public class ActivityTeamInfoUpdModel { */ private String status; - - /** - * 商品SkU集合 - */ private ActivityTeamProductSkuInfoModel activityTeamProductSkuInfoModel; + /** + * + * @param activityTeamInfoUpdReq + * @return + */ + + + public static ActivityTeamInfoUpdModel activityTeamInfoUpdModel(ActivityTeamInfoUpdReq activityTeamInfoUpdReq){ + ActivityTeamProductSkuInfoReq activityTeamProductSkuInfoReq = activityTeamInfoUpdReq.getActivityTeamProductSkuInfoReq(); + List activityTeamProductSkuInfoUpdReq = activityTeamProductSkuInfoReq.getActivityTeamProductSkuInfoUpdReq(); + ActivityTeamProductSkuInfoModel teamProductSkuInfoModel = new ActivityTeamProductSkuInfoModel(); + List teamProductSkuInfoUpdModels = activityTeamProductSkuInfoUpdReq.stream().map(activityTeamProductSkuInfoUpdReq1 -> { + ActivityTeamProductSkuInfoUpdModel activityTeamProductSkuInfoUpdModel = ActivityTeamProductSkuInfoUpdModel.builder() + .id(activityTeamProductSkuInfoUpdReq1.getId()) + .teamStock(activityTeamProductSkuInfoUpdReq1.getTeamStock()) + .teamPrice(activityTeamProductSkuInfoUpdReq1.getTeamPrice()) + .build(); + return activityTeamProductSkuInfoUpdModel; + }).toList(); + teamProductSkuInfoModel.setActivityTeamProductSkuUpdModel(teamProductSkuInfoUpdModels); + List teamProjectSkuInfoAddReq = activityTeamProductSkuInfoReq.getTeamProjectSkuInfoAddReq(); + List skuAddModels = teamProjectSkuInfoAddReq.stream().map(teamProjectSkuInfoAddReq1 -> { + ActivityTeamProductSkuAddModel productSkuAddModel = ActivityTeamProductSkuAddModel.builder() + .teamId(activityTeamInfoUpdReq.getId()) + .productId(activityTeamInfoUpdReq.getProductId()) + .productSku(teamProjectSkuInfoAddReq1.getProductSku()) + .teamPrice(teamProjectSkuInfoAddReq1.getTeamPrice()) + .teamStock(teamProjectSkuInfoAddReq1.getTeamStock()) + .build(); + return productSkuAddModel; + }).toList(); + teamProductSkuInfoModel.setActivityTeamProductSkuAddModelList(skuAddModels); + teamProductSkuInfoModel.setSkuIdList(activityTeamInfoUpdReq.getActivityTeamProductSkuInfoReq().getSkuIdList()); + + return ActivityTeamInfoUpdModel.builder() + .id(activityTeamInfoUpdReq.getId()) + .name(activityTeamInfoUpdReq.getName()) + .productId(activityTeamInfoUpdReq.getProductId()) + .productImage(activityTeamInfoUpdReq.getProductImage()) + .introduction(activityTeamInfoUpdReq.getIntroduction()) + .unit(activityTeamInfoUpdReq.getUnit()) + .imageList(activityTeamInfoUpdReq.getImageList()) + .sort(activityTeamInfoUpdReq.getSort()) + .content(activityTeamInfoUpdReq.getContent()) + .status(activityTeamInfoUpdReq.getStatus()) + .activityTeamProductSkuInfoModel(teamProductSkuInfoModel) + .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 03e3891..af7b5bf 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 @@ -51,7 +51,7 @@ public class ActivityTeamProductSkuAddModel { public static ActivityTeamProductSkuAddModel addReqBuild(TeamProjectSkuInfoAddReq teamProjectSkuInfoAddReq, Supplier productId){ return ActivityTeamProductSkuAddModel.builder() .productId(productId.get()) - .productSku(teamProjectSkuInfoAddReq.getSku()) + .productSku(teamProjectSkuInfoAddReq.getProductSku()) .teamStock(teamProjectSkuInfoAddReq.getTeamStock()) .teamPrice(teamProjectSkuInfoAddReq.getTeamPrice()) .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 index 0f09b02..628ea2c 100644 --- 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 @@ -7,12 +7,24 @@ import lombok.NoArgsConstructor; import java.util.List; +/** + * 活动拼团模型 + */ @Data @NoArgsConstructor @AllArgsConstructor @Builder public class ActivityTeamProductSkuInfoModel { - private List activityTeamProductSkuUpdModel; + /** + * 活动规格sku修改模型 + */ + private List activityTeamProductSkuUpdModel; + /** + * 活动规格id + */ private List skuIdList; + /** + * 活动规格sku添加模型 + */ private List activityTeamProductSkuAddModelList; } diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuInfoUpdModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuInfoUpdModel.java new file mode 100644 index 0000000..4de785c --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuInfoUpdModel.java @@ -0,0 +1,30 @@ +package com.muyu.marketing.domain.model; + +import com.muyu.marketing.domain.req.ActivityTeamInfoUpdReq; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ActivityTeamProductSkuInfoUpdModel { + /** + * 商品规格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/model/ActivityTeamProductSkuUpdModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdModel.java deleted file mode 100644 index a5395a6..0000000 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdModel.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.muyu.marketing.domain.model; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 拼团活动规格修改 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class ActivityTeamProductSkuUpdModel { - private String productSku; -} 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..43ea290 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 @@ -11,6 +11,10 @@ import lombok.experimental.SuperBuilder; import java.util.Date; import java.util.List; + +/** + * 拼团活动添加接受参数 + */ @Data @SuperBuilder @NoArgsConstructor 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 6e50386..1915d64 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,6 +1,8 @@ package com.muyu.marketing.domain.req; import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.marketing.domain.model.ActivityTeamInfoUpdModel; +import com.muyu.marketing.domain.model.ActivityTeamProductSkuInfoModel; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -17,6 +19,10 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor public class ActivityTeamInfoUpdReq { + /** + * 活动id + */ + private Long id; /** * 拼团名称 */ @@ -52,10 +58,6 @@ public class ActivityTeamInfoUpdReq { * 活动排序 */ private Integer sort; - /** - * 商品SkU集合 - */ - private List teamProjectSkuInfoAddReqList; /** * 活动详情 */ @@ -73,6 +75,10 @@ public class ActivityTeamInfoUpdReq { */ private Long strategyId; + /** + * 商品SkU模型 + */ + private ActivityTeamProductSkuInfoReq activityTeamProductSkuInfoReq; + - private List skuId; } diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamProductSkuInfoReq.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamProductSkuInfoReq.java new file mode 100644 index 0000000..fca0f2a --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamProductSkuInfoReq.java @@ -0,0 +1,32 @@ +package com.muyu.marketing.domain.req; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * 拼团活动规格sku请求参数 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder + +public class ActivityTeamProductSkuInfoReq { + + /** + * 活动规格sku修改模型 + */ + private List activityTeamProductSkuInfoUpdReq; + /** + * 活动规格id + */ + private List skuIdList; + /** + * 活动规格sku添加模型 + */ + private List teamProjectSkuInfoAddReq; +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamProductSkuInfoUpdReq.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamProductSkuInfoUpdReq.java new file mode 100644 index 0000000..30ef8ec --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamProductSkuInfoUpdReq.java @@ -0,0 +1,30 @@ +package com.muyu.marketing.domain.req; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.math.BigDecimal; +/** + * 活动规格sku修改模型 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class ActivityTeamProductSkuInfoUpdReq { + /** + * 商品规格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/TeamInfoListReq.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamInfoListReq.java index 4dab2b5..fb3049c 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 @@ -5,6 +5,9 @@ import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel; import lombok.*; import lombok.experimental.SuperBuilder; +/** + * 活动列表请求参数 + */ @Data @SuperBuilder @NoArgsConstructor 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..7464d56 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 @@ -8,7 +8,7 @@ import lombok.experimental.SuperBuilder; import java.math.BigDecimal; /** - * 添加的 + * 拼团活动规格添加请求参数 */ @Data @SuperBuilder @@ -19,7 +19,7 @@ public class TeamProjectSkuInfoAddReq { /** * 规格SKU */ - private String sku; + private String productSku; /** * 拼团价格 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 d25556a..d3117a6 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,10 +3,7 @@ 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.ActivityTeamInfoAddModel; -import com.muyu.marketing.domain.model.ActivityTeamInfoDetailModel; -import com.muyu.marketing.domain.model.ActivityTeamInfoListModel; -import com.muyu.marketing.domain.model.ActivityTeamProductSkuInfoListModel; +import com.muyu.marketing.domain.model.*; import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq; import com.muyu.marketing.domain.req.ActivityTeamInfoUpdReq; import com.muyu.marketing.domain.req.TeamInfoListReq; @@ -88,6 +85,7 @@ public class ActivityTeamController { */ @PutMapping("update") public Result upd(@RequestBody ActivityTeamInfoUpdReq activityTeamInfoUpdReq){ + activityTeamInfoService.update(ActivityTeamInfoUpdModel.activityTeamInfoUpdModel(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 cb7551b..e3fecbc 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 @@ -3,12 +3,7 @@ package com.muyu.marketing.team.service; import com.baomidou.mybatisplus.extension.service.IService; 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.ActivityTeamInfoDetailModel; -import com.muyu.marketing.domain.model.ActivityTeamInfoListModel; -import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel; - -import java.util.List; +import com.muyu.marketing.domain.model.*; public interface ActivityTeamInfoService extends IService { @@ -30,4 +25,9 @@ public interface ActivityTeamInfoService extends IService { * 拼团活动详情 */ public ActivityTeamInfoDetailModel findById(Long id); + + /** + * 修稿拼团活动 + */ + public void update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel); } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamOpenInfoService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamOpenInfoService.java index dcd70eb..307caa8 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamOpenInfoService.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamOpenInfoService.java @@ -3,7 +3,6 @@ package com.muyu.marketing.team.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.common.core.enums.market.team.TeamOpenTypeEnum; import com.muyu.marketing.domain.ActivityTeamOpenInfo; -import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; public interface ActivityTeamOpenInfoService extends IService { 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 36dc828..8a01792 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,11 +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.ActivityTeamProductSkuInfoListModel; -import com.muyu.marketing.domain.model.TeamProductDiscountPriceModel; -import com.muyu.marketing.domain.model.TeamProductStockModel; +import com.muyu.marketing.domain.model.*; import java.util.List; @@ -50,4 +46,23 @@ public interface ActivityTeamProductSkuInfoService extends IService findByTeamId(Long teamId); + + /** + * 批量修改活动拼团sku + * @param activityTeamProductSkuInfoUpdModel + * @return + */ + public boolean updateBatch(List activityTeamProductSkuInfoUpdModel); + + /** + * 删除活动sku + */ + public boolean BatchDelete(List ids); + + + /** + * 添加商品规格 + */ + public boolean insertBatch(List activityTeamProductSkuAddModels); + } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionHundredService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionHundredService.java index e8f4444..e4d1f75 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionHundredService.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionHundredService.java @@ -2,7 +2,6 @@ package com.muyu.marketing.team.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.marketing.domain.TeamStrategyExemptionHundred; -import com.muyu.marketing.domain.TeamStrategyExemptionOrdinary; public interface TeamStrategyExemptionHundredService extends IService { } 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 71a0216..adacdaa 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,13 +1,12 @@ 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.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; @@ -15,11 +14,10 @@ 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.util.ArrayList; import java.util.List; -import java.util.function.Consumer; @Service @@ -90,4 +88,23 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl activityTeamProductSkuAddModelList = activityTeamInfoUpdModel.getActivityTeamProductSkuInfoModel().getActivityTeamProductSkuAddModelList(); + //批量添加商品规格 + activityTeamProductSkuInfoService.saveBatch(activityTeamProductSkuAddModelList.stream().map(ActivityTeamProductSkuInfo::addProductBuildModel).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 55c0a7a..f011d1e 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 @@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.ActivityTeamProductSkuInfoListModel; -import com.muyu.marketing.domain.model.TeamProductDiscountPriceModel; -import com.muyu.marketing.domain.model.TeamProductStockModel; +import com.muyu.marketing.domain.model.*; import com.muyu.marketing.team.mapper.ActivityTeamProductSkuInfoMapper; import com.muyu.marketing.team.service.ActivityTeamProductSkuInfoService; import com.muyu.product.cache.ProjectSkuCache; @@ -15,10 +12,6 @@ import com.muyu.product.domain.ProjectSkuInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.ArrayList; -import java.util.Comparator; import java.util.List; import java.util.Optional; @@ -96,4 +89,35 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl activityTeamProductSkuInfoUpdModel) { + List activityTeamProductSkuInfoList = activityTeamProductSkuInfoUpdModel.stream(). + map(ActivityTeamProductSkuInfo::updateBuildModel) + .toList(); + return this.updateBatchById(activityTeamProductSkuInfoList); + } + + /** + * 删除活动sku + */ + @Override + public boolean BatchDelete(List ids) { + return this.removeBatchByIds(ids); + } + + /** + * 添加商品规格 + */ + @Override + public boolean insertBatch(List activityTeamProductSkuAddModels) { + return this.saveBatch(activityTeamProductSkuAddModels.stream() + .map(ActivityTeamProductSkuInfo::addBuildModel) + .toList()); + } }