feat()：团购活动修改方法实现

doc/团购回显数据结构

@@ -0,0 +1,23 @@
+{
+  "ID":"Long
+  "商品ID": "Long",
+  "商品图片": "String",
+  "活动名称": "String",
+  "活动简介": "String",
+  "商品单位": "String",
+  "商品的轮播图": [
+    "String", "String"
+  ],
+  "活动时间": "date",
+  "策略类型": "String",
+  "策略ID": "Long",
+  "商品规格List": [
+    {
+      "规格SKU": "String",
+      "拼团价格": "BigDecimal",
+      "拼团库存": "Long"
+    }
+  ],
+  "排序": "Integer",
+  "详情": "String"
+}

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.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.ActivityTeamInfoAddModel;
+import com.muyu.marketing.domain.model.ActivityTeamUpdModel;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
@@ -93,4 +94,28 @@ public class ActivityTeamInfo extends BaseEntity {
             .strategyId(activityTeamInfoAddModel.getStrategyId())
             .build();
   }
+
+  /**
+   * 修改对象
+   * @param activityTeamUpdModel
+   * @return
+   */
+
+  public static ActivityTeamInfo updModelBuild(ActivityTeamUpdModel activityTeamUpdModel){
+    return ActivityTeamInfo.builder()
+            .id(activityTeamUpdModel.getId())
+            .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();
+  }
 }

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.ActivityTeamProjectSkuInfoUpdModel;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
@@ -18,48 +19,65 @@ import java.math.BigDecimal;
 @TableName(value = "activity_team_product_sku_info", autoResultMap = true)
 public class ActivityTeamProductSkuInfo extends BaseEntity {
 
-  /**
-   * 主键
-   */
-  @TableId(value = "id", type = IdType.AUTO)
-  private long id;
-  /**
-   * 活动ID
-   */
-  private long teamId;
-  /**
-   * 商品ID
-   */
-  private Long productId;
-  /**
-   * 商品SKU
-   */
-  private String productSku;
-  /**
-   * 拼团库存
-   */
-  private Long teamStock;
-  /**
-   * 剩余库存
-   */
-  private Long remainStock;
-  /**
-   * 拼团价格
-   */
-  private BigDecimal teamPrice;
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    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 activityTeamProductSkuAddModel 模型
-   * @return 对象
-   */
-  public static ActivityTeamProductSkuInfo modelBuild(ActivityTeamProductSkuAddModel activityTeamProductSkuAddModel) {
-    return ActivityTeamProductSkuInfo.builder()
-            .productId(activityTeamProductSkuAddModel.getProductId())
-            .teamId(activityTeamProductSkuAddModel.getTeamId())
-            .teamStock(activityTeamProductSkuAddModel.getTeamStock())
-            .remainStock(activityTeamProductSkuAddModel.getTeamStock())
-            .teamPrice(activityTeamProductSkuAddModel.getTeamPrice())
-            .build()
-  }
+    /**
+     * 通过模型钢构件对象
+     *
+     * @param activityTeamProductSkuAddModel 模型
+     * @return 对象
+     */
+    public static ActivityTeamProductSkuInfo modelBuild(ActivityTeamProductSkuAddModel activityTeamProductSkuAddModel) {
+        return ActivityTeamProductSkuInfo.builder()
+                .productId(activityTeamProductSkuAddModel.getProductId())
+                .teamId(activityTeamProductSkuAddModel.getTeamId())
+                .teamStock(activityTeamProductSkuAddModel.getTeamStock())
+                .remainStock(activityTeamProductSkuAddModel.getTeamStock())
+                .teamPrice(activityTeamProductSkuAddModel.getTeamPrice())
+                .build();
+    }
+
+    /**
+     * 修改对象
+     */
+
+    public static ActivityTeamProductSkuInfo updModel(ActivityTeamProjectSkuInfoUpdModel activityTeamProjectSkuInfoUpdModel) {
+        return ActivityTeamProductSkuInfo.builder()
+                .id(activityTeamProjectSkuInfoUpdModel.getId())
+                .teamId(activityTeamProjectSkuInfoUpdModel.getTeamId())
+                .productId(activityTeamProjectSkuInfoUpdModel.getProductId())
+                .productSku(activityTeamProjectSkuInfoUpdModel.getProductSku())
+                .teamStock(activityTeamProjectSkuInfoUpdModel.getTeamStock())
+                .remainStock(activityTeamProjectSkuInfoUpdModel.getTeamStock())
+                .teamPrice(activityTeamProjectSkuInfoUpdModel.getTeamPrice())
+                .build();
+    }
 }

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

@@ -0,0 +1,105 @@
+package com.muyu.marketing.domain.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.common.core.web.domain.BaseEntity;
+import com.muyu.marketing.domain.ActivityTeamInfo;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 活动suk回显模型
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class ActivityTeamDetailModel extends BaseEntity {
+
+    /**
+     * 活动ID
+     */
+    public 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 Long sort;
+    /**
+     * 商品SkU集合
+     */
+    private List<ActivityTeamProductSkuDetailModel> productSkuDetailModelList;
+    /**
+     * 活动详情
+     */
+    private String content;
+    /**
+     * 活动状态
+     */
+    private String status;
+    /**
+     * 策略类型
+     */
+    private String strategyType;
+    /**
+     * 策略ID
+     */
+    private Long strategyId;
+
+
+    public static ActivityTeamDetailModel findActivity(ActivityTeamInfo activityTeamInfo) {
+        return ActivityTeamDetailModel.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())
+                .build();
+    }
+
+
+}

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

@@ -2,7 +2,7 @@ package com.muyu.marketing.domain.model;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.muyu.marketing.domain.req.ProjectSkuInfoAddReq;
+import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -78,4 +78,26 @@ public class ActivityTeamInfoAddModel {
      * 策略ID
      */
     private Long strategyId;
+
+    public static ActivityTeamInfoAddModel addReqBuild (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.getTeamProjectSkuInfoAddReqList()
+                                .stream()
+                                .map(addReq -> ActivityTeamProductSkuAddModel.addReqBuild(addReq, activityTeamInfoSaveReq::getProductId))
+                                .toList()
+                ).build();
+    }
 }

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.TeamProjectSkuInfoAddReq;
 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,15 @@ public class ActivityTeamProductSkuAddModel {
      * 拼团库存
      */
     private Long teamStock;
+
+
+
+    public static ActivityTeamProductSkuAddModel addReqBuild(TeamProjectSkuInfoAddReq teamProjectSkuInfoAddReq, Supplier<Long> productId){
+        return ActivityTeamProductSkuAddModel.builder()
+                .productId(productId.get())
+                .sku(teamProjectSkuInfoAddReq.getSku())
+                .teamStock(teamProjectSkuInfoAddReq.getTeamStock())
+                .teamPrice(teamProjectSkuInfoAddReq.getTeamPrice())
+                .build();
+    }
 }

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

@@ -0,0 +1,74 @@
+package com.muyu.marketing.domain.model;
+
+
+import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
+import com.muyu.marketing.domain.req.TeamProjectSkuInfoAddReq;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.function.Supplier;
+
+/**
+ * spu回显模型
+ *
+ * @author DongZeLiang
+ * @date 2024-11-26 09:36
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActivityTeamProductSkuDetailModel {
+
+    /**
+     * 规格id
+     */
+    public Long id;
+    /**
+     * 团购活动ID
+     */
+    private Long teamId;
+
+    /**
+     * 商品ID
+     */
+    private Long productId;
+
+    /**
+     * 规格SKU
+     */
+    private String productSku;
+
+    /**
+     * 拼团价格
+     */
+    private BigDecimal teamPrice;
+
+    /**
+     * 拼团库存
+     */
+    private Long teamStock;
+
+
+
+    /**
+     * sku回显构造器
+     * @param activityTeamProductSkuInfo
+     * @return
+     */
+    public static ActivityTeamProductSkuDetailModel getInstance(ActivityTeamProductSkuInfo activityTeamProductSkuInfo) {
+        return ActivityTeamProductSkuDetailModel.builder()
+                .id(activityTeamProductSkuInfo.getId())
+                .teamId(activityTeamProductSkuInfo.getTeamId())
+                .productId(activityTeamProductSkuInfo.getProductId())
+                .productSku(activityTeamProductSkuInfo.getProductSku())
+                .teamPrice(activityTeamProductSkuInfo.getTeamPrice())
+                .teamStock(activityTeamProductSkuInfo.getTeamStock())
+                .build();
+    }
+
+
+}

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

@@ -0,0 +1,61 @@
+package com.muyu.marketing.domain.model;
+
+import com.muyu.marketing.domain.req.ActivityTeamProjectSkuInfoUpdReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.math.BigDecimal;
+
+/**
+ * sku修改模型
+ */
+@Data
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityTeamProjectSkuInfoUpdModel {
+
+    /**
+     * 规格id
+     */
+    public Long id;
+    /**
+     * 团购活动ID
+     */
+    private Long teamId;
+
+    /**
+     * 商品ID
+     */
+    private Long productId;
+
+    /**
+     * 规格SKU
+     */
+    private String productSku;
+
+    /**
+     * 拼团价格
+     */
+    private BigDecimal teamPrice;
+
+    /**
+     * 拼团库存
+     */
+    private Long teamStock;
+
+    public static ActivityTeamProjectSkuInfoUpdModel updSkuModel(ActivityTeamProjectSkuInfoUpdReq activityTeamProjectSkuInfoUpdReq) {
+        return ActivityTeamProjectSkuInfoUpdModel.builder()
+                .id(activityTeamProjectSkuInfoUpdReq.getId())
+                .teamId(activityTeamProjectSkuInfoUpdReq.getTeamId())
+                .productId(activityTeamProjectSkuInfoUpdReq.getProductId())
+                .productSku(activityTeamProjectSkuInfoUpdReq.getProductSku())
+                .teamPrice(activityTeamProjectSkuInfoUpdReq.getTeamPrice())
+                .teamStock(activityTeamProjectSkuInfoUpdReq.getTeamStock())
+                .build();
+    }
+
+
+}

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

@@ -0,0 +1,106 @@
+package com.muyu.marketing.domain.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.common.core.web.domain.BaseEntity;
+import com.muyu.marketing.domain.req.ActivityTeamProjectSkuInfoUpdReq;
+import com.muyu.marketing.domain.req.ActivityTeamUpdReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 活动修改模型
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class ActivityTeamUpdModel extends BaseEntity {
+
+    /**
+     * 活动ID
+     */
+    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 Long sort;
+    /**
+     * 商品SkU集合
+     */
+    private List<ActivityTeamProjectSkuInfoUpdModel> teamProjectSkuInfoUpdModelList;
+    /**
+     * 活动详情
+     */
+    private String content;
+    /**
+     * 活动状态
+     */
+    private String status;
+    /**
+     * 策略类型
+     */
+    private String strategyType;
+    /**
+     * 策略ID
+     */
+    private Long strategyId;
+
+    public static ActivityTeamUpdModel updActivityTeamModel(ActivityTeamUpdReq activityTeamUpdReq) {
+        return ActivityTeamUpdModel.builder()
+                .id(activityTeamUpdReq.getId())
+                .name(activityTeamUpdReq.getName())
+                .productId(activityTeamUpdReq.getProductId())
+                .productImage(activityTeamUpdReq.getProductImage())
+                .introduction(activityTeamUpdReq.getIntroduction())
+                .unit(activityTeamUpdReq.getUnit())
+                .imageList(activityTeamUpdReq.getImageList())
+                .endTime(activityTeamUpdReq.getEndTime())
+                .sort(activityTeamUpdReq.getSort())
+                .content(activityTeamUpdReq.getContent())
+                .status(activityTeamUpdReq.getStatus())
+                .strategyType(activityTeamUpdReq.getStrategyType())
+                .strategyId(activityTeamUpdReq.getStrategyId())
+                .teamProjectSkuInfoUpdModelList(activityTeamUpdReq.getTeamProjectSkuInfoUpdReqList().stream().map(ActivityTeamProjectSkuInfoUpdModel::updSkuModel).toList())
+                .build();
+    }
+
+
+}

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(

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

@@ -55,7 +55,7 @@ public class ActivityTeamInfoSaveReq extends BaseEntity {
     /**
      * 商品SkU集合
      */
-    private List<ProjectSkuInfoAddReq> projectSkuInfoAddReqList;
+    private List<TeamProjectSkuInfoAddReq> teamProjectSkuInfoAddReqList;
     /**
      * 活动详情
      */

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

@@ -0,0 +1,49 @@
+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
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityTeamProjectSkuInfoUpdReq {
+
+    /**
+     * 规格id
+     */
+    public Long id;
+    /**
+     * 团购活动ID
+     */
+    private Long teamId;
+
+    /**
+     * 商品ID
+     */
+    private Long productId;
+
+    /**
+     * 规格SKU
+     */
+    private String productSku;
+
+    /**
+     * 拼团价格
+     */
+    private BigDecimal teamPrice;
+
+    /**
+     * 拼团库存
+     */
+    private Long teamStock;
+
+
+}

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

@@ -0,0 +1,87 @@
+package com.muyu.marketing.domain.req;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.common.core.web.domain.BaseEntity;
+import com.muyu.marketing.domain.resp.ActivityTeamProjectSkuInfoResp;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 活动修改
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class ActivityTeamUpdReq extends BaseEntity {
+
+    /**
+     * 活动ID
+     */
+    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 Long sort;
+    /**
+     * 商品SkU集合
+     */
+    private List<ActivityTeamProjectSkuInfoUpdReq> teamProjectSkuInfoUpdReqList;
+    /**
+     * 活动详情
+     */
+    private String content;
+    /**
+     * 活动状态
+     */
+    private String status;
+    /**
+     * 策略类型
+     */
+    private String strategyType;
+    /**
+     * 策略ID
+     */
+    private Long strategyId;
+
+
+
+}

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)

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

@@ -1,7 +1,6 @@
 package com.muyu.marketing.domain.req;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
@@ -9,13 +8,15 @@ import lombok.experimental.SuperBuilder;
 import java.math.BigDecimal;
 
 /**
- * 添加的
+ * sku添加
  */
 @Data
 @SuperBuilder
 @AllArgsConstructor
 @NoArgsConstructor
-public class ProjectSkuInfoAddReq {
+public class TeamProjectSkuInfoAddReq {
+
+    private String teamId;
 
     /**
      * 规格SKU

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

@@ -0,0 +1,106 @@
+package com.muyu.marketing.domain.resp;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.common.core.web.domain.BaseEntity;
+import com.muyu.marketing.domain.model.ActivityTeamDetailModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+import java.util.List;
+import java.util.function.Function;
+
+/**
+ * 活动回显
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class ActivityTeamDetailResp extends BaseEntity {
+
+    /**
+     * 活动ID
+     */
+    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 Long sort;
+    /**
+     * 商品SkU集合
+     */
+    private List<ActivityTeamProjectSkuInfoResp> skuInfoRespList;
+    /**
+     * 活动详情
+     */
+    private String content;
+    /**
+     * 活动状态
+     */
+    private String status;
+    /**
+     * 策略类型
+     */
+    private String strategyType;
+    /**
+     * 策略ID
+     */
+    private Long strategyId;
+
+
+    public static ActivityTeamDetailResp findByid(ActivityTeamDetailModel ActivityTeamDetailModel, Function<Long,List<ActivityTeamProjectSkuInfoResp>> skuInfoRespList) {
+        return ActivityTeamDetailResp.builder()
+                .id(ActivityTeamDetailModel.getId())
+                .name(ActivityTeamDetailModel.getName())
+                .productId(ActivityTeamDetailModel.getProductId())
+                .productImage(ActivityTeamDetailModel.getProductImage())
+                .introduction(ActivityTeamDetailModel.getIntroduction())
+                .unit(ActivityTeamDetailModel.getUnit())
+                .imageList(ActivityTeamDetailModel.getImageList())
+                .endTime(ActivityTeamDetailModel.getEndTime())
+                .sort(ActivityTeamDetailModel.getSort())
+                .content(ActivityTeamDetailModel.getContent())
+                .status(ActivityTeamDetailModel.getStatus())
+                .strategyType(ActivityTeamDetailModel.getStrategyType())
+                .strategyId(ActivityTeamDetailModel.getStrategyId())
+                .skuInfoRespList(skuInfoRespList.apply(ActivityTeamDetailModel.getId()))
+                .build();
+    }
+
+}

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

@@ -0,0 +1,62 @@
+package com.muyu.marketing.domain.resp;
+
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuDetailModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * sku回显对象
+ */
+@Data
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityTeamProjectSkuInfoResp {
+
+    /**
+     * 规格id
+     */
+    public Long id;
+    /**
+     * 团购活动ID
+     */
+    private Long teamId;
+
+    /**
+     * 商品ID
+     */
+    private Long productId;
+
+    /**
+     * 规格SKU
+     */
+    private String productSku;
+
+    /**
+     * 拼团价格
+     */
+    private BigDecimal teamPrice;
+
+    /**
+     * 拼团库存
+     */
+    private Long teamStock;
+
+
+    public static List<ActivityTeamProjectSkuInfoResp> findSkuId(List<ActivityTeamProductSkuDetailModel> activityTeamProductSkuDetailModel) {
+        return activityTeamProductSkuDetailModel.stream().map(activityTeamProductSkuDetailModel1 -> {
+            ActivityTeamProjectSkuInfoResp teamProjectSkuInfoResp = ActivityTeamProjectSkuInfoResp.builder()
+                    .teamId(activityTeamProductSkuDetailModel1.getTeamId())
+                    .productSku(activityTeamProductSkuDetailModel1.getProductSku())
+                    .productSku(activityTeamProductSkuDetailModel1.getProductSku())
+                    .teamPrice(activityTeamProductSkuDetailModel1.getTeamPrice())
+                    .build();
+            return teamProjectSkuInfoResp;
+        }).toList();
+    }
+}

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

@@ -3,15 +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.ActivityTeamDetailModel;
+import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel;
 import com.muyu.marketing.domain.model.ActivityTeamInfoListModel;
+import com.muyu.marketing.domain.model.ActivityTeamUpdModel;
+import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq;
+import com.muyu.marketing.domain.req.ActivityTeamUpdReq;
 import com.muyu.marketing.domain.req.TeamInfoListReq;
+import com.muyu.marketing.domain.resp.ActivityTeamDetailResp;
+import com.muyu.marketing.domain.resp.ActivityTeamProjectSkuInfoResp;
 import com.muyu.marketing.domain.resp.TeamInfoListResp;
 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 java.util.List;
 
@@ -26,10 +31,15 @@ import java.util.List;
 public class ActivityTeamController {
 
     @Autowired
-    private ActivityTeamInfoService activityTeamInfoService;;
+    private ActivityTeamInfoService activityTeamInfoService;
+
+    @Autowired
+    private ActivityTeamProductSkuInfoService activityTeamDetailResp;
+
 
     /**
      * 查询营销团购活动列表
+     *
      * @param teamInfoListReq 活动查询入参
      * @return 活动响应结果
      */
@@ -38,10 +48,45 @@ public class ActivityTeamController {
         TableDataInfo<ActivityTeamInfoListModel> tableDataInfo = activityTeamInfoService.query(teamInfoListReq.buildQueryModel());
         List<TeamInfoListResp> respList = tableDataInfo.getRows().stream().map(TeamInfoListResp::listModelBuild).toList();
         return Result.success(
-                new TableDataInfo<>(){{
+                new TableDataInfo<>() {{
                     setRows(respList);
                     setTotal(tableDataInfo.getTotal());
                 }}
         );
+
     }
+
+    /**
+     * 添加团购活动
+     *
+     * @param activityTeamInfoSaveReq 添加请求对象
+     * @return 结果集
+     */
+    @PostMapping
+    public Result<String> save(@RequestBody ActivityTeamInfoSaveReq activityTeamInfoSaveReq) {
+        activityTeamInfoService.save(ActivityTeamInfoAddModel.addReqBuild(activityTeamInfoSaveReq));
+        return Result.success();
+    }
+
+    /**
+     * 活动回显
+     * @param id 活动id
+     * @return
+     */
+    @PostMapping("/findById/{id}")
+    public Result<ActivityTeamDetailResp> findById(@PathVariable("id") Long id) {
+        ActivityTeamDetailModel detailModel  = activityTeamInfoService.findById(id);
+        ActivityTeamDetailResp detailResp = ActivityTeamDetailResp.findByid(detailModel,
+                teamId -> ActivityTeamProjectSkuInfoResp.findSkuId(activityTeamDetailResp.activityTeamProductSkuFindId(teamId))
+        );
+        return Result.success(detailResp);
+    }
+
+    @PutMapping("/upd")
+    public Result Upd(@RequestBody ActivityTeamUpdReq activityTeamUpdReq) {
+        activityTeamInfoService.UpdActivityTeam(ActivityTeamUpdModel.updActivityTeamModel(activityTeamUpdReq));
+        return Result.success();
+    }
+
+
 }

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

@@ -3,9 +3,8 @@ 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.ActivityTeamInfoListModel;
-import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel;
+import com.muyu.marketing.domain.model.*;
+import com.muyu.marketing.domain.resp.ActivityTeamDetailResp;
 
 import java.util.List;
 
@@ -24,4 +23,13 @@ public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
      * @param activityTeamInfoAddModel 团购添加模型
      */
     public void save(ActivityTeamInfoAddModel activityTeamInfoAddModel);
+    /**
+     * 活动回显
+     * @param id 活动id
+     * @return
+     */
+    ActivityTeamDetailModel findById(Long id);
+
+    void UpdActivityTeam(ActivityTeamUpdModel activityTeamUpdModel);
+
 }

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;
 
@@ -41,4 +38,13 @@ public interface ActivityTeamProductSkuInfoService extends IService<ActivityTeam
      */
     public void batchSave(List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList);
 
+    /**
+     * 回显sku
+     * @param teamId
+     * @return
+     */
+    public List<ActivityTeamProductSkuDetailModel> activityTeamProductSkuFindId(Long teamId);
+
+    public boolean updBachSkuInfo(List<ActivityTeamProjectSkuInfoUpdModel> activityTeamProjectSkuInfoUpdModelList);
+
 }

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

@@ -2,6 +2,7 @@ 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.exception.ServiceException;
@@ -9,10 +10,12 @@ 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.ActivityTeamDetailResp;
 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;
 
@@ -23,7 +26,7 @@ import java.util.function.Consumer;
 
 @Service
 public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMapper, ActivityTeamInfo>
-    implements ActivityTeamInfoService {
+        implements ActivityTeamInfoService {
 
     @Autowired
     private ActivityTeamOpenInfoService activityTeamOpenInfoService;
@@ -75,14 +78,30 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
      */
     @Override
     public void save(ActivityTeamInfoAddModel activityTeamInfoAddModel) {
-        boolean save = this.save(ActivityTeamInfo.addModelBuild(activityTeamInfoAddModel));
-        if (!save) {
-            throw new ServiceException(
-                    StringUtils.format("团购活动添加失败：[{}]", activityTeamInfoAddModel)
-            );
-        }
-        this.activityTeamProductSkuInfoService.batchSave(
-                activityTeamInfoAddModel.getActivityTeamProductSkuAddModelList()
-        );
+        ActivityTeamInfo activityTeamInfo = ActivityTeamInfo.addModelBuild(activityTeamInfoAddModel);
+        Assert.isTrue(this.save(activityTeamInfo), StringUtils.format("团购活动添加失败：[{}]", activityTeamInfoAddModel));
+        List<ActivityTeamProductSkuAddModel> teamProductSkuAddModelList = activityTeamInfoAddModel.getActivityTeamProductSkuAddModelList();
+        teamProductSkuAddModelList.forEach(activityTeamProductSkuAddModel -> activityTeamProductSkuAddModel.setTeamId(activityTeamInfo.getId()));
+        this.activityTeamProductSkuInfoService.batchSave(teamProductSkuAddModelList);
     }
+
+    /**
+     * 活动回显
+     *
+     * @param id 活动id
+     * @return
+     */
+    @Override
+    public ActivityTeamDetailModel findById(Long id) {
+        return ActivityTeamDetailModel.findActivity(this.getById(id));
+    }
+
+    @Override
+    public void UpdActivityTeam(ActivityTeamUpdModel activityTeamUpdModel) {
+        boolean updateById = this.updateById(ActivityTeamInfo.updModelBuild(activityTeamUpdModel));
+        Assert.isTrue(updateById,"修改失败");
+        activityTeamProductSkuInfoService.updBachSkuInfo(activityTeamUpdModel.getTeamProjectSkuInfoUpdModelList());
+    }
+
+
 }

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

@@ -4,9 +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.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;
@@ -14,16 +12,12 @@ 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;
 
 @Service
 public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityTeamProductSkuInfoMapper, ActivityTeamProductSkuInfo>
-    implements ActivityTeamProductSkuInfoService {
+        implements ActivityTeamProductSkuInfoService {
 
     @Autowired
     private ProjectSkuCache projectSkuCache;
@@ -45,7 +39,7 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
                     return TeamProductDiscountPriceModel.of(projectSkuInfo.getPrice(), activityTeamProductSkuInfo.getTeamPrice());
                 }).min((o1, o2) -> Double.valueOf(o1.getDiscount() * 100 - o2.getDiscount() * 100).intValue());
 
-        if (discountPriceModelOptional.isEmpty()){
+        if (discountPriceModelOptional.isEmpty()) {
             throw new ServiceException("团购活动下没有商品绑定");
         }
         return discountPriceModelOptional.get();
@@ -80,4 +74,17 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
                 activityTeamProductSkuAddModelList.stream().map(ActivityTeamProductSkuInfo::modelBuild).toList()
         );
     }
+
+    @Override
+    public List<ActivityTeamProductSkuDetailModel> activityTeamProductSkuFindId(Long teamId) {
+        LambdaQueryWrapper<ActivityTeamProductSkuInfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ActivityTeamProductSkuInfo::getTeamId, teamId);
+        List<ActivityTeamProductSkuInfo> list = this.list(queryWrapper);
+        return list.stream().map(ActivityTeamProductSkuDetailModel::getInstance).toList();
+    }
+
+    @Override
+    public boolean updBachSkuInfo(List<ActivityTeamProjectSkuInfoUpdModel> activityTeamProjectSkuInfoUpdModels) {
+        return this.updateBatchById(activityTeamProjectSkuInfoUpdModels.stream().map(ActivityTeamProductSkuInfo::updModel).toList());
+    }
 }

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: 1.94.33.190:8848
+        namespace: 167892b6-25cf-4932-b65a-12fd1ca16363
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 1.94.33.190:8848
+        namespace: 167892b6-25cf-4932-b65a-12fd1ca16363
         # 配置文件格式
         file-extension: yml
         # 共享配置