feat():修改

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.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.ActivityTeamInfoAddModel;
 import com.muyu.marketing.domain.model.ActivityTeamInfoEditModel;
+import com.muyu.marketing.domain.model.ActivityTeamInfoUpdModel;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
@@ -116,4 +117,25 @@ public class ActivityTeamInfo extends BaseEntity {
             .sort(activityTeamInfoEditModel.getSort())
             .build();
   }
+  /**
+   * 公共修改模型  转换成修改对象
+   * @param activityTeamInfoUpdModel
+   */
+  public static ActivityTeamInfo infoBuildModel(ActivityTeamInfoUpdModel activityTeamInfoUpdModel) {
+    return  ActivityTeamInfo.builder()
+            .name(activityTeamInfoUpdModel.getName())
+            .unit(activityTeamInfoUpdModel.getUnit())
+            .status(activityTeamInfoUpdModel.getStatus())
+            .productId(activityTeamInfoUpdModel.getProductId())
+            .strategyType(activityTeamInfoUpdModel.getStrategyType())
+            .strategyId(activityTeamInfoUpdModel.getStrategyId())
+            .productImage(activityTeamInfoUpdModel.getProductImage())
+            .introduction(activityTeamInfoUpdModel.getIntroduction())
+            .imageList(activityTeamInfoUpdModel.getImageList())
+            .endTime(activityTeamInfoUpdModel.getEndTime())
+            .id(activityTeamInfoUpdModel.getId())
+            .content(activityTeamInfoUpdModel.getContent())
+            .sort(activityTeamInfoUpdModel.getSort())
+            .build();
+  }
 }

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamProductSkuInfo.java

@@ -6,11 +6,15 @@ 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.ActivityTeamProductSkuEditModel;
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuUpdModel;
+import com.muyu.marketing.domain.model.ActivityTeamSkuAddModel;
+import com.muyu.marketing.domain.req.ActivityTeamSkuReq;
 import com.muyu.marketing.domain.resp.ActivityTeamSkuInfoDetail;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Data
 @SuperBuilder
@@ -78,5 +82,23 @@ public class ActivityTeamProductSkuInfo extends BaseEntity {
             .productId(activityTeamProductSkuEditModel.getProductId())
             .build();
   }
+  public static ActivityTeamProductSkuInfo skuBuild(ActivityTeamProductSkuUpdModel activityTeamProductSkuUpdModel){
+    return ActivityTeamProductSkuInfo.builder()
+            .id(activityTeamProductSkuUpdModel.getId())
+            .teamPrice(activityTeamProductSkuUpdModel.getTeamPrice())
+            .remainStock(activityTeamProductSkuUpdModel.getTeamStock())
+            .teamStock(activityTeamProductSkuUpdModel.getTeamStock())
+            .build();
+  }
+  public static ActivityTeamProductSkuInfo skuBuildModel(ActivityTeamSkuAddModel activityTeamSkuAddModel){
+    return ActivityTeamProductSkuInfo.builder()
+            .productSku(activityTeamSkuAddModel.getSku())
+            .teamPrice(activityTeamSkuAddModel.getTeamPrice())
+            .remainStock(activityTeamSkuAddModel.getTeamStock())
+            .teamStock(activityTeamSkuAddModel.getTeamStock())
+            .productId(activityTeamSkuAddModel.getProductId())
+            .teamId(activityTeamSkuAddModel.getTeamId())
+            .build();
+  }
 }
 

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoDetailModel.java

@@ -3,7 +3,6 @@ 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 com.muyu.marketing.domain.ActivityTeamOpenInfo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -14,16 +13,16 @@ import java.util.List;
 
 /**
  * @program: 2204a-cloud-server
- * @description: 团购活动商品信息规格模型
+ * @description: 团购活动商品信息规格详情模型
- * @author: MengFanKuo
+ *   MengFanKuo
- * @create: 2024-11-26 14:22
+ *   2024-11-26 14:22
  * *
  */
 @Data
 @AllArgsConstructor
 @SuperBuilder
 @NoArgsConstructor
-public class ActivityTeamInfoProductSkuDetailModel {
+public class ActivityTeamInfoDetailModel {
     /**
      * 主键
      */
@@ -81,8 +80,9 @@ public class ActivityTeamInfoProductSkuDetailModel {
      * 规格
      */
     private List<ActivityTeamSkuInfoDetailModel> projectSkuInfoAddReqList;
-    public static ActivityTeamInfoProductSkuDetailModel skuInfoDetailBuild(ActivityTeamInfo activityTeamInfo, List<ActivityTeamSkuInfoDetailModel> infoServiceByListSkuInfo){
+
-        return ActivityTeamInfoProductSkuDetailModel.builder()
+    public static ActivityTeamInfoDetailModel skuInfoDetailBuild(ActivityTeamInfo activityTeamInfo, List<ActivityTeamSkuInfoDetailModel> infoServiceByListSkuInfo){
+        return ActivityTeamInfoDetailModel.builder()
                 .id(activityTeamInfo.getId())
                 .name(activityTeamInfo.getName())
                 .productId(activityTeamInfo.getProductId())
@@ -98,4 +98,5 @@ public class ActivityTeamInfoProductSkuDetailModel {
                 .strategyType(activityTeamInfo.getStrategyType())
                 .build();
     }
+
 }

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoUpdModel.java

@@ -0,0 +1,83 @@
+package com.muyu.marketing.domain.model;
+
+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.util.Date;
+
+/**
+ *  2204a-cloud-server
+ *  团购活动商品信息规格修改模型
+ * MengFanKuo
+ * 2024-11-26 14:22
+ * *
+ */
+@Data
+@AllArgsConstructor
+@SuperBuilder
+@NoArgsConstructor
+public class ActivityTeamInfoUpdModel {
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    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 ActivityTeamSkuModel activityTeamSkuModel;
+
+
+}

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuEditModel.java

@@ -1,7 +1,6 @@
 package com.muyu.marketing.domain.model;
 
 
-import com.muyu.marketing.domain.req.ProjectSkuInfoAddReq;
 import com.muyu.marketing.domain.req.ProjectSkuInfoEditReq;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -15,7 +14,7 @@ import java.util.function.Supplier;
  * 团购spu库存添加模型
  *
  * @author DongZeLiang
- * @date 2024-11-26 09:36
+ *  2024-11-26 09:36
  */
 @Data
 @Builder

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdModel.java

@@ -0,0 +1,35 @@
+package com.muyu.marketing.domain.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.math.BigDecimal;
+
+/**
+ * 拼团规格sku模型
+ *   MengFanKuo
+ *   2024-11-27 15:28
+ * *
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@SuperBuilder
+public class ActivityTeamProductSkuUpdModel {
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 拼团价格
+     */
+    private BigDecimal teamPrice;
+
+    /**
+     * 拼团库存
+     */
+    private Long teamStock;
+}

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamSkuAddModel.java

@@ -0,0 +1,46 @@
+package com.muyu.marketing.domain.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.math.BigDecimal;
+
+/**
+ * 拼团规格sku添加模型
+ *   MengFanKuo
+ *   2024-11-27 15:30
+ * *
+ */
+@Data
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityTeamSkuAddModel {
+    /**
+     * 活动ID
+     */
+    private long teamId;
+    /**
+     * 商品ID
+     */
+    private Long productId;
+    /**
+     * 拼团sku
+     */
+    private String sku;
+    /**
+     * 商品价格
+     */
+    private BigDecimal productPrice;
+    /**
+     * 拼团价格
+     */
+    private BigDecimal teamPrice;
+
+    /**
+     * 拼团库存
+     */
+    private Long teamStock;
+}

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamSkuModel.java

@@ -0,0 +1,33 @@
+package com.muyu.marketing.domain.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.List;
+
+/**
+ * 拼团规格修改总模型
+ *  MengFanKuo
+ *  2024-11-27 15:32
+ * *
+ */
+@Data
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityTeamSkuModel {
+    /**
+     * 拼团规格修改模型集合
+     */
+    private List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModelList;
+    /**
+     * 删除规格id集合
+     */
+    private List<Long> skuIds;
+    /**
+     * 添加拼团规格模型
+     */
+    private List<ActivityTeamSkuAddModel> activityTeamSkuAddModelList;
+}

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamInfoSaveReq.java

@@ -75,14 +75,14 @@ public class ActivityTeamInfoSaveReq extends BaseEntity {
 
     /**
      * 请求入参转换为添加模型
-     * @return
+     *
      */
     public  ActivityTeamInfoAddModel activityTeamInfoReqBuild(){
         return ActivityTeamInfoAddModel.builder()
                 .unit(this.unit)
                 .activityTeamProductSkuAddModelList(
-                        this.projectSkuInfoAddReqList.stream().map(projectSkuInfoAddReq -> {
+                        this.teamProjectSkuInfoAddReqList.stream().map(projectSkuInfoAddReq -> {
-                            return ActivityTeamProductSkuAddModel.teamProductSkuAddBuild(projectSkuInfoAddReq,()->productId);
+                            return ActivityTeamProductSkuAddModel.addReqBuild(projectSkuInfoAddReq,()->productId);
                         }).toList())
                 .strategyType(this.strategyType)
                 .status(this.status)

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamInfoUpdReq.java

@@ -0,0 +1,79 @@
+package com.muyu.marketing.domain.req;
+
+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.util.Date;
+
+/**
+ * 团购活动商品信息规格修改
+ *  2024-11-26 14:22
+ * *
+ */
+@Data
+@AllArgsConstructor
+@SuperBuilder
+@NoArgsConstructor
+public class ActivityTeamInfoUpdReq {
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    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 ActivityTeamSkuReq activityTeamSkuReq;
+}

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamSkuAddReq.java

@@ -0,0 +1,47 @@
+package com.muyu.marketing.domain.req;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.math.BigDecimal;
+
+/**
+ * 拼团规格sku添加模型
+ *  MengFanKuo
+ *  2024-11-27 15:30
+ * *
+ */
+@Data
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityTeamSkuAddReq {
+    /**
+     * 活动ID
+     */
+    private long teamId;
+    /**
+     * 商品ID
+     */
+    private Long productId;
+    /**
+     * 拼团sku
+     */
+    private String sku;
+    /**
+     * 商品价格
+     */
+    private BigDecimal productPrice;
+    /**
+     * 拼团价格
+     */
+    private BigDecimal teamPrice;
+
+    /**
+     * 拼团库存
+     */
+    private Long teamStock;
+
+}

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamSkuReq.java

@@ -0,0 +1,36 @@
+package com.muyu.marketing.domain.req;
+
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuUpdModel;
+import com.muyu.marketing.domain.model.ActivityTeamSkuAddModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.List;
+
+/**
+ * 拼团规格修改总模型
+ *
+ *   MengFanKuo
+ *   2024-11-27 15:32
+ * *
+ */
+@Data
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityTeamSkuReq {
+    /**
+     * 拼团规格修改模型集合
+     */
+    private List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModelList;
+    /**
+     * 删除规格id集合
+     */
+    private List<Long> skuIds;
+    /**
+     * 添加拼团规格模型
+     */
+    private List<ActivityTeamSkuAddModel> activityTeamSkuAddModelList;
+}

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ProjectSkuInfoUpdReq.java

@@ -0,0 +1,32 @@
+package com.muyu.marketing.domain.req;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.math.BigDecimal;
+
+/**
+ * 添加的
+ */
+@Data
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ProjectSkuInfoUpdReq {
+    /**
+     * id
+     */
+    private Long productSkuId;
+    /**
+     * 拼团价格
+     */
+    private BigDecimal teamPrice;
+    /**
+     * 拼团库存
+     */
+    private Long teamStock;
+
+
+}

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamInfoProductSkuDetailResp.java

@@ -2,7 +2,7 @@ package com.muyu.marketing.domain.resp;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.muyu.marketing.domain.model.ActivityTeamInfoProductSkuDetailModel;
+import com.muyu.marketing.domain.model.ActivityTeamInfoDetailModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -14,8 +14,8 @@ import java.util.List;
 /**
  * @program: 2204a-cloud-server
  * @description: 团购活动商品信息规格表
- * @author: MengFanKuo
+ *   MengFanKuo
- * @create: 2024-11-26 14:22
+ *   2024-11-26 14:22
  * *
  */
 @Data
@@ -76,23 +76,23 @@ public class ActivityTeamInfoProductSkuDetailResp {
      * 规格
      */
     private List<ActivityTeamSkuInfoDetail> projectSkuInfoEachRespList;
-    public static ActivityTeamInfoProductSkuDetailResp productSkuDetailBuild(ActivityTeamInfoProductSkuDetailModel activityTeamInfoProductSkuDetailModel){
+    public static ActivityTeamInfoProductSkuDetailResp productSkuDetailBuild(ActivityTeamInfoDetailModel activityTeamInfoDetailModel){
        return ActivityTeamInfoProductSkuDetailResp.builder()
-                .id(activityTeamInfoProductSkuDetailModel.getId())
+                .id(activityTeamInfoDetailModel.getId())
-                .productImage(activityTeamInfoProductSkuDetailModel.getProductImage())
+                .productImage(activityTeamInfoDetailModel.getProductImage())
-                .productId(activityTeamInfoProductSkuDetailModel.getProductId())
+                .productId(activityTeamInfoDetailModel.getProductId())
-                .name(activityTeamInfoProductSkuDetailModel.getName())
+                .name(activityTeamInfoDetailModel.getName())
-                .endTime(activityTeamInfoProductSkuDetailModel.getEndTime())
+                .endTime(activityTeamInfoDetailModel.getEndTime())
-                .content(activityTeamInfoProductSkuDetailModel.getContent())
+                .content(activityTeamInfoDetailModel.getContent())
-                .imageList(activityTeamInfoProductSkuDetailModel.getImageList())
+                .imageList(activityTeamInfoDetailModel.getImageList())
-                .introduction(activityTeamInfoProductSkuDetailModel.getIntroduction())
+                .introduction(activityTeamInfoDetailModel.getIntroduction())
-                .projectSkuInfoEachRespList(activityTeamInfoProductSkuDetailModel.getProjectSkuInfoAddReqList().stream().map(activityTeamSkuInfoDetailModel -> {
+                .projectSkuInfoEachRespList(activityTeamInfoDetailModel.getProjectSkuInfoAddReqList().stream().map(activityTeamSkuInfoDetailModel -> {
                    return ActivityTeamSkuInfoDetail.infoDetailBuild(activityTeamSkuInfoDetailModel);
                 }).toList())
-                .sort(activityTeamInfoProductSkuDetailModel.getSort())
+                .sort(activityTeamInfoDetailModel.getSort())
-                .strategyId(activityTeamInfoProductSkuDetailModel.getStrategyId())
+                .strategyId(activityTeamInfoDetailModel.getStrategyId())
-                .strategyType(activityTeamInfoProductSkuDetailModel.getStrategyType())
+                .strategyType(activityTeamInfoDetailModel.getStrategyType())
-                .unit(activityTeamInfoProductSkuDetailModel.getUnit())
+                .unit(activityTeamInfoDetailModel.getUnit())
                 .build();
     }
 }

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamSkuInfoDetail.java

@@ -1,7 +1,5 @@
 package com.muyu.marketing.domain.resp;
 
-import com.muyu.marketing.domain.model.ActivityTeamInfoProductSkuDetailModel;
-import com.muyu.marketing.domain.model.ActivityTeamProductSkuEditModel;
 import com.muyu.marketing.domain.model.ActivityTeamSkuInfoDetailModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -13,8 +11,8 @@ import java.math.BigDecimal;
 /**
  * @program: 2204a-cloud-server
  * @description: 商品规格回显表
- * @author: MengFanKuo
+ *   MengFanKuo
- * @create: 2024-11-26 15:20
+ *   2024-11-26 15:20
  * *
  */
 @Data

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java

@@ -4,7 +4,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.ActivityTeamInfoListModel;
-import com.muyu.marketing.domain.model.ActivityTeamInfoProductSkuDetailModel;
+import com.muyu.marketing.domain.model.ActivityTeamInfoDetailModel;
 import com.muyu.marketing.domain.req.ActivityTeamInfoEditReq;
 import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq;
 import com.muyu.marketing.domain.req.TeamInfoListReq;
@@ -20,14 +20,14 @@ import java.util.List;
  * 营销团购活动控制层
  *
  * @author DongZeLiang
- * @date 2024-11-20 14:25
+ *  2024-11-20 14:25
  */
 @RestController
 @RequestMapping("/team")
 public class ActivityTeamController {
 
     @Autowired
-    private ActivityTeamInfoService activityTeamInfoService;;
+    private ActivityTeamInfoService activityTeamInfoService;
 
     /**
      * 查询营销团购活动列表
@@ -57,7 +57,7 @@ public class ActivityTeamController {
      */
     @GetMapping("/inquireActivityTeam/{id}")
     public Result<ActivityTeamInfoProductSkuDetailResp> inquireActivityTeam(@PathVariable("id") Long id){
-        ActivityTeamInfoProductSkuDetailModel detailModel = activityTeamInfoService.echo(id);
+        ActivityTeamInfoDetailModel detailModel = activityTeamInfoService.echo(id);
         ActivityTeamInfoProductSkuDetailResp productSkuDetailBuild = ActivityTeamInfoProductSkuDetailResp.productSkuDetailBuild(detailModel);
         return Result.success(productSkuDetailBuild);
     }

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java

@@ -4,9 +4,6 @@ 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.*;
-import com.muyu.marketing.domain.req.ActivityTeamInfoEditReq;
-
-import java.util.List;
 
 public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
 
@@ -26,12 +23,15 @@ public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
     /**
      * 同过活动id回显团购活动信息
      */
-    public ActivityTeamInfoProductSkuDetailModel echo(Long id);
+    public ActivityTeamInfoDetailModel echo(Long id);
 
     /**
      * 通过修改模型  去进行商品拼团活动的操作
      * @param activityTeamInfoEditModel
      */
     void edit(ActivityTeamInfoEditModel activityTeamInfoEditModel);
-
+    /**
+     * 通过修改模型  进行拼团活动的操作
+     */
+    public void upd(ActivityTeamInfoUpdModel activityTeamInfoUpdModel);
 }

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamProductSkuInfoService.java

@@ -4,6 +4,7 @@ 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.model.*;
+import com.muyu.marketing.domain.req.ActivityTeamSkuReq;
 
 import java.util.List;
 
@@ -41,5 +42,16 @@ public interface ActivityTeamProductSkuInfoService extends IService<ActivityTeam
      * @param activityTeamProductSkuEditModelList
      */
     void editSku(List<ActivityTeamProductSkuEditModel> activityTeamProductSkuEditModelList);
-
+    /**
+     * 团购商品sku修改
+     */
+    public void batchUpd(List<ActivityTeamProductSkuUpdModel>  activityTeamProductSkuUpdModelList);
+    /**
+     * 批量删除团购sku
+     */
+    public void batchDel(List<Long> ids);
+    /**
+     * 批量添加团购sku
+     */
+    public void batchAdd(List<ActivityTeamSkuAddModel> activityTeamSkuAddModelList);
 }

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java

@@ -3,16 +3,20 @@ package com.muyu.marketing.team.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.model.*;
+import com.muyu.marketing.domain.req.ActivityTeamInfoUpdReq;
+import com.muyu.marketing.domain.req.ProjectSkuInfoUpdReq;
 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.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 
 import java.util.List;
@@ -82,10 +86,10 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
      * 根据团购活动id查询详情
      */
     @Override
-    public  ActivityTeamInfoProductSkuDetailModel echo(Long id) {
+    public ActivityTeamInfoDetailModel echo(Long id) {
         ActivityTeamInfo activityTeamInfo = this.getById(id);
         List<ActivityTeamSkuInfoDetailModel> infoServiceByListSkuInfo = activityTeamProductSkuInfoService.findByListSkuInfo(id);
-        return ActivityTeamInfoProductSkuDetailModel.skuInfoDetailBuild(activityTeamInfo,infoServiceByListSkuInfo);
+        return ActivityTeamInfoDetailModel.skuInfoDetailBuild(activityTeamInfo,infoServiceByListSkuInfo);
     }
 
     /**
@@ -104,4 +108,22 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
         });
         activityTeamProductSkuInfoService.editSku(activityTeamProductSkuEditModelList);
     }
+    /**
+     * 通过修改模型 ，去进行商品拼团活动
+     * @param activityTeamInfoUpdModel 商品拼团模型
+     */
+    @Transactional
+    @Override
+    public void upd(ActivityTeamInfoUpdModel activityTeamInfoUpdModel) {
+        if ("N".equals(activityTeamInfoUpdModel.getStatus())){
+            this.updateById(ActivityTeamInfo.infoBuildModel(activityTeamInfoUpdModel));
+            ActivityTeamSkuModel activityTeamSkuModel = activityTeamInfoUpdModel.getActivityTeamSkuModel();
+            List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModelList = activityTeamSkuModel.getActivityTeamProductSkuUpdModelList();
+            activityTeamProductSkuInfoService.batchUpd(activityTeamProductSkuUpdModelList);
+            activityTeamProductSkuInfoService.batchDel(activityTeamSkuModel.getSkuIds());
+            activityTeamProductSkuInfoService.batchAdd(activityTeamSkuModel.getActivityTeamSkuAddModelList());
+        }else {
+            throw new ServiceException("拼团商品状态为活动中不可修改");
+        }
+    }
 }

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java

@@ -5,6 +5,8 @@ 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.*;
+import com.muyu.marketing.domain.req.ActivityTeamSkuAddReq;
+import com.muyu.marketing.domain.req.ActivityTeamSkuReq;
 import com.muyu.marketing.domain.resp.ActivityTeamSkuInfoDetail;
 import com.muyu.marketing.team.mapper.ActivityTeamProductSkuInfoMapper;
 import com.muyu.marketing.team.service.ActivityTeamProductSkuInfoService;
@@ -40,7 +42,6 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
                     ProjectSkuInfo projectSkuInfo = projectSkuCache.get(activityTeamProductSkuInfo.getProductId(), activityTeamProductSkuInfo.getProductSku());
                     return TeamProductDiscountPriceModel.of(projectSkuInfo.getPrice(), activityTeamProductSkuInfo.getTeamPrice());
                 }).min((o1, o2) -> Double.valueOf(o1.getDiscount() * 100 - o2.getDiscount() * 100).intValue());
-
         if (discountPriceModelOptional.isEmpty()){
             throw new ServiceException("团购活动下没有商品绑定");
         }
@@ -102,4 +103,35 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
         }).toList();
         this.updateBatchById(activityTeamProductSkuInfoList);
     }
+    /**
+     * 批量修改团购商品sku
+     * @param activityTeamProductSkuUpdModelList 团购商品sku模型
+     */
+    @Override
+    public void batchUpd(List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModelList) {
+        List<ActivityTeamProductSkuInfo> productSkuInfoList = activityTeamProductSkuUpdModelList.stream().map(activityTeamProductSkuUpdModel -> {
+            return ActivityTeamProductSkuInfo.skuBuild(activityTeamProductSkuUpdModel);
+        }).toList();
+        this.updateBatchById(productSkuInfoList);
+    }
+    /**
+     * 批量删除团购sku
+     * @param ids
+     */
+    @Override
+    public void batchDel(List<Long> ids) {
+        this.removeBatchByIds(ids);
+    }
+
+    /**
+     * 批量添加团购sku
+     * @param activityTeamSkuAddModelList
+     */
+    @Override
+    public void batchAdd(List<ActivityTeamSkuAddModel> activityTeamSkuAddModelList) {
+        List<ActivityTeamProductSkuInfo> activityTeamProductSkuInfoList = activityTeamSkuAddModelList.stream().map(activityTeamSkuAddModel -> {
+            return ActivityTeamProductSkuInfo.skuBuildModel(activityTeamSkuAddModel);
+        }).toList();
+        this.saveBatch(activityTeamProductSkuInfoList);
+    }
 }