fix()：团购策略

doc/团购查询单条数据结构.java

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

doc/团购活动修改.java

@@ -0,0 +1,32 @@
+{
+    "活动ID": "Long",
+    "商品ID": "Long",
+    "活动名称": "String",
+    "商品名称": "String",
+    "商品图片": "String",
+    "活动简介": "String",
+    "商品单位": "String",
+    "商品的轮播图": [
+            "String", "String"
+        ],
+    "活动时间": "date",
+    "策略类型": "String",
+    "商品规格": {
+        "修改商品规格List": [ // 修改
+                {
+                    "团购规格ID": "Long",
+                    "拼团价格": "BigDecimal",
+                    "拼团库存": "Long"
+                }
+            ],
+        "删除商品规格IdList" : ["Long", "Long"],
+        "添加商品规格List": [
+                "商品SKU": "String",
+                "商品价格": "BigDecimal",
+                "拼团价格": "BigDecimal",
+                "拼团库存": "Long"
+            ]
+    },
+
+"详情": "String"
+}

doc/团购添加数据结构.java

@@ -0,0 +1,47 @@
+$.{
+  "商品ID": "Long", //activity_team_info.product_id
+  "商品图片": "String",
+  "活动名称": "String",
+  "活动简介": "String",
+  "商品单位": "String",
+  "商品的轮播图": [
+    "String", "String"
+  ],
+  "活动时间": "date",
+  "策略类型": "String",
+  "策略ID": "Long",
+  "商品规格List": [ // activity_team_product_sku_info
+    {
+      "规格SKU": "String", // activity_team_product_sku_info.product_sku
+      "拼团价格": "BigDecimal",
+      "拼团库存": "Long"
+    }
+  ],
+  "排序": "Integer",
+  "详情": "String"
+}
+
+activity_team_info 团购活动表 -> ActivityTeamInfo(实体类)
+activity_team_info.id(主键) -> 自增 -> 回填 -> ActivityTeamInfo.id
+activity_team_info.name(拼团名称) <- ActivityTeamInfo.name <- $.活动名称
+activity_team_info.product_id(商品ID) <- ActivityTeamInfo.productId <- $.商品ID
+activity_team_info.product_image(商品活动图) <- ActivityTeamInfo.productImage <- $.商品图片
+activity_team_info.introduction(活动简介) <- ActivityTeamInfo.introduction <- $.活动简介
+activity_team_info.unit(单位) <- ActivityTeamInfo.unit <- $.商品单位
+activity_team_info.image_list(轮播图) <- ActivityTeamInfo.imageList <- 商品的轮播图.toString(","拼接) <- $.商品的轮播图
+activity_team_info.end_time(活动结束时间)  <- ActivityTeamInfo.endTime <- $.活动时间
+activity_team_info.sort(活动排序) <- ActivityTeamInfo.sort <- $.排序
+activity_team_info.content(活动详情) <- ActivityTeamInfo.content <- $.详情
+activity_team_info.status(活动状态) <- _sys_normal_disable.1(停用)
+activity_team_info.strategy_type(策略类型) <- ActivityTeamInfo.strategy_type <- $.策略类型
+activity_team_info.strategy_id(策略ID) <- ActivityTeamInfo.strategy_id <- $.策略ID
+
+for(@商品规格 in 商品规格List)
+activity_team_product_sku_info 商品拼团规格信息表 -> ActivityTeamProductSkuInfo(实体类)
+activity_team_product_sku_info.id(主键) -> 自增 -> 回填 -> ActivityTeamProductSkuInfo.id
+activity_team_product_sku_info.team_id(活动ID) <- ActivityTeamProductSkuInfo.teamId <- ActivityTeamInfo.id
+activity_team_product_sku_info.product_id(商品ID) <- ActivityTeamProductSkuInfo.productId < $.商品ID
+activity_team_product_sku_info.product_sku(商品SKU) <- ActivityTeamProductSkuInfo.productSku <- @商品规格.规格SKU
+activity_team_product_sku_info.team_stock(拼团库存) <- ActivityTeamProductSkuInfo.teamStock <- @商品规格.拼团库存
+activity_team_product_sku_info.remain_stock(剩余库存) <- ActivityTeamProductSkuInfo.remainStock <- @商品规格.拼团库存
+activity_team_product_sku_info.team_price(拼团价格) <- ActivityTeamProductSkuInfo.teamPrice <- @商品规格.拼团价格

doc/活动回显数据结构.java

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

muyu-auth/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 127.0.0.1:8848
       config:
         # 配置中心地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-gateway/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 127.0.0.1:8848
       config:
         # 配置中心地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -33,7 +33,7 @@ spring:
       datasource:
         ds1:
           nacos:
-            server-addr: 120.46.147.226:8848
+            server-addr: 127.0.0.1:8848
             dataId: sentinel-muyu-gateway
             groupId: DEFAULT_GROUP
             data-type: json

muyu-modules/muyu-file/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 127.0.0.1:8848
       config:
         # 配置中心地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-modules/muyu-gen/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 127.0.0.1:8848
       config:
         # 配置中心地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-modules/muyu-job/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 127.0.0.1:8848
       config:
         # 配置中心地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

@@ -4,8 +4,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
 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.ActivityTeamInfoSaveModel;
-import com.muyu.marketing.domain.model.ActivityTeamInfoUpdReqModel;
+import com.muyu.marketing.domain.model.ActivityTeamInfoUpdModel;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
@@ -55,7 +56,7 @@ public class ActivityTeamInfo extends BaseEntity {
   /**
    * 活动排序
    */
-  private Long sort;
+  private long sort;
   /**
    * 活动详情
    */
@@ -72,7 +73,30 @@ public class ActivityTeamInfo extends BaseEntity {
    * 策略ID
    */
   private long strategyId;
-  public static ActivityTeamInfo TeamSaveBuild (ActivityTeamInfoSaveModel activityTeamInfoSaveModel) {
+
+  /**
+   * 公共添加模型，转换成添加对象
+   * @param activityTeamInfoAddModel 添加模型
+   * @return 添加对象
+   */
+  public static ActivityTeamInfo addModelBuild(ActivityTeamInfoAddModel activityTeamInfoAddModel){
+    return ActivityTeamInfo.builder()
+            .name(activityTeamInfoAddModel.getName())
+            .productId(activityTeamInfoAddModel.getProductId())
+            .productImage(activityTeamInfoAddModel.getProductImage())
+            .introduction(activityTeamInfoAddModel.getIntroduction())
+            .unit(activityTeamInfoAddModel.getUnit())
+            .imageList(activityTeamInfoAddModel.getImageList())
+            .endTime(activityTeamInfoAddModel.getEndTime())
+            .sort(activityTeamInfoAddModel.getSort())
+            .content(activityTeamInfoAddModel.getContent())
+            .status(activityTeamInfoAddModel.getStatus())
+            .strategyType(activityTeamInfoAddModel.getStrategyType())
+            .strategyId(activityTeamInfoAddModel.getStrategyId())
+            .build();
+  }
+
+  public static ActivityTeamInfo teamSaveBuild(ActivityTeamInfoSaveModel activityTeamInfoSaveModel) {
     return ActivityTeamInfo.builder()
             .name(activityTeamInfoSaveModel.getName())
             .productId(activityTeamInfoSaveModel.getProductId())
@@ -88,21 +112,21 @@ public class ActivityTeamInfo extends BaseEntity {
             .strategyId(activityTeamInfoSaveModel.getStrategyId())
             .build();
   }
-  public static ActivityTeamInfo TeamUpdateBuild (ActivityTeamInfoUpdReqModel activityTeamInfoUpdReqModel){
+  public static ActivityTeamInfo TeamUpdateBuild (ActivityTeamInfoUpdModel activityTeamInfoUpdModel){
     return ActivityTeamInfo.builder()
-            .id(activityTeamInfoUpdReqModel.getId())
-            .name(activityTeamInfoUpdReqModel.getName())
-            .productId(activityTeamInfoUpdReqModel.getProductId())
-            .productImage(activityTeamInfoUpdReqModel.getProductImage())
-            .introduction(activityTeamInfoUpdReqModel.getIntroduction())
-            .unit(activityTeamInfoUpdReqModel.getUnit())
-            .imageList(activityTeamInfoUpdReqModel.getImageList())
-            .endTime(activityTeamInfoUpdReqModel.getEndTime())
-            .sort(activityTeamInfoUpdReqModel.getSort())
-            .content(activityTeamInfoUpdReqModel.getContent())
-            .status(activityTeamInfoUpdReqModel.getStatus())
-            .strategyType(activityTeamInfoUpdReqModel.getStrategyType())
-            .strategyId(activityTeamInfoUpdReqModel.getStrategyId())
+            .id(activityTeamInfoUpdModel.getId())
+            .name(activityTeamInfoUpdModel.getName())
+            .productId(activityTeamInfoUpdModel.getProductId())
+            .productImage(activityTeamInfoUpdModel.getProductImage())
+            .introduction(activityTeamInfoUpdModel.getIntroduction())
+            .unit(activityTeamInfoUpdModel.getUnit())
+            .imageList(activityTeamInfoUpdModel.getImageList())
+            .endTime(activityTeamInfoUpdModel.getEndTime())
+            .sort(activityTeamInfoUpdModel.getSort())
+            .content(activityTeamInfoUpdModel.getContent())
+            .status(activityTeamInfoUpdModel.getStatus())
+            .strategyType(activityTeamInfoUpdModel.getStrategyType())
+            .strategyId(activityTeamInfoUpdModel.getStrategyId())
             .build();
   }
 }

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

@@ -5,7 +5,9 @@ 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.ActivityTeamProductSkuModel;
 import com.muyu.marketing.domain.model.ActivityTeamProductSkuReqModel;
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuUpdModel;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
@@ -74,4 +76,13 @@ public class ActivityTeamProductSkuInfo extends BaseEntity {
             .build();
   }
 
+  public static ActivityTeamProductSkuInfo updModelBuild(ActivityTeamProductSkuUpdModel teamProductSkuUpdModel){
+    return ActivityTeamProductSkuInfo.builder()
+            .id(teamProductSkuUpdModel.getId())
+            .teamPrice(teamProductSkuUpdModel.getTeamPrice())
+            .teamStock(teamProductSkuUpdModel.getTeamStock())
+            .remainStock(teamProductSkuUpdModel.getTeamStock())
+            .build();
+  }
+
 }

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

@@ -13,7 +13,7 @@ import lombok.experimental.SuperBuilder;
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @TableName(value = "team_strategy_exemption_hundred", autoResultMap = true)
-public class TeamStrategyExemptionHundred extends BaseEntity {
+public class TeamStrategyHundred extends BaseEntity {
 
   /**
    * 主键

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

@@ -13,7 +13,7 @@ import lombok.experimental.SuperBuilder;
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @TableName(value = "team_strategy_exemption_ordinary", autoResultMap = true)
-public class TeamStrategyExemptionOrdinary extends BaseEntity {
+public class TeamStrategyOrdinary extends BaseEntity {
 
   /**
    * 主键

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

@@ -2,7 +2,6 @@ package com.muyu.marketing.domain.model;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.muyu.marketing.domain.ActivityTeamInfo;
-import com.muyu.marketing.domain.req.ProjectSkuInfoAddReq;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -22,7 +21,7 @@ import java.util.function.Function;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-public class TeamInfoFindByIdRespModel {
+public class ActivityTeamDetailModel {
     /**
      * 拼团id
      */
@@ -82,9 +81,9 @@ public class TeamInfoFindByIdRespModel {
      * 策略ID
      */
     private Long strategyId;
-    public static TeamInfoFindByIdRespModel findSkuSumList  (ActivityTeamInfo activityTeamInfo,
-                                                             Function<TeamInfoFindByIdRespModel.TeamInfoFindByIdRespModelBuilder,TeamInfoFindByIdRespModel> function){
-        return function.apply(TeamInfoFindByIdRespModel.builder()
+    public static ActivityTeamDetailModel findSkuSumList  (ActivityTeamInfo activityTeamInfo,
+                                                           Function<ActivityTeamDetailModel.ActivityTeamDetailModelBuilder, ActivityTeamDetailModel> function){
+        return function.apply(ActivityTeamDetailModel.builder()
                 .id(activityTeamInfo.getId())
                 .name(activityTeamInfo.getName())
                 .productId(activityTeamInfo.getProductId())

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

@@ -3,7 +3,6 @@ package com.muyu.marketing.domain.model;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq;
-import com.muyu.marketing.domain.req.ProjectSkuInfoAddReq;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -11,7 +10,7 @@ import lombok.NoArgsConstructor;
 
 import java.util.Date;
 import java.util.List;
-import java.util.function.Function;
+import java.util.function.Supplier;
 
 /**
  * 团购活动添加模型
@@ -81,9 +80,8 @@ public class ActivityTeamInfoAddModel {
      */
     private Long strategyId;
 
-    public static ActivityTeamInfoAddModel activityTeamInfoAddModelBuild (ActivityTeamInfoSaveReq activityTeamInfoSaveReq,
-                                                                          Function<ActivityTeamInfoAddModel.ActivityTeamInfoAddModelBuilder,ActivityTeamInfoAddModel> function){
-        return function.apply(ActivityTeamInfoAddModel.builder()
+    public static ActivityTeamInfoAddModel addReqBuild (ActivityTeamInfoSaveReq activityTeamInfoSaveReq){
+        return ActivityTeamInfoAddModel.builder()
                 .name(activityTeamInfoSaveReq.getName())
                 .productId(activityTeamInfoSaveReq.getProductId())
                 .productImage(activityTeamInfoSaveReq.getProductImage())
@@ -95,6 +93,12 @@ public class ActivityTeamInfoAddModel {
                 .content(activityTeamInfoSaveReq.getContent())
                 .status(activityTeamInfoSaveReq.getStatus())
                 .strategyType(activityTeamInfoSaveReq.getStrategyType())
-                .strategyId(activityTeamInfoSaveReq.getStrategyId()));
+                .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/ActivityTeamInfoUpdModel.java

@@ -1,12 +1,15 @@
 package com.muyu.marketing.domain.model;
 
 import com.muyu.marketing.domain.req.ActivityTeamInfoUpdReq;
-import com.muyu.marketing.domain.req.ActivityTeamProductSkuReq;
+import com.muyu.marketing.domain.req.ActivityTeamProductSkuSettingReq;
+import com.muyu.marketing.domain.req.TeamProjectSkuInfoAddReq;
+import com.muyu.marketing.domain.req.TeamProjectSkuInfoUpdReq;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -20,7 +23,7 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-public class ActivityTeamInfoUpdReqModel {
+public class ActivityTeamInfoUpdModel {
     private Long id;
     private String name;
     private Long productId;
@@ -34,10 +37,10 @@ public class ActivityTeamInfoUpdReqModel {
     private String status;
     private String strategyType;
     private Long strategyId;
-    private List<ActivityTeamProductSkuReqModel> activityTeamProductSkuModelList;
+    private ActivityTeamProductSkuSettingModel activityTeamProductSkuSettingModel;
 
-    public static ActivityTeamInfoUpdReqModel activityTeamInfoUpdReqModelBuild (ActivityTeamInfoUpdReq activityTeamInfoUpdReq){
-        return ActivityTeamInfoUpdReqModel.builder()
+    public static ActivityTeamInfoUpdModel activityTeamInfoUpdReqModelBuild (ActivityTeamInfoUpdReq activityTeamInfoUpdReq){
+        return ActivityTeamInfoUpdModel.builder()
                 .id(activityTeamInfoUpdReq.getId())
                 .name(activityTeamInfoUpdReq.getName())
                 .productId(activityTeamInfoUpdReq.getProductId())
@@ -51,7 +54,12 @@ public class ActivityTeamInfoUpdReqModel {
                 .status(activityTeamInfoUpdReq.getStatus())
                 .strategyType(activityTeamInfoUpdReq.getStrategyType())
                 .strategyId(activityTeamInfoUpdReq.getStrategyId())
-                .activityTeamProductSkuModelList(activityTeamInfoUpdReq.getActivityTeamProductSkuList().stream().map(ActivityTeamProductSkuReqModel::activityTeamProductSkuReqModelBuild).toList())
+                .activityTeamProductSkuSettingModel(
+                        ActivityTeamProductSkuSettingModel.settingReqModel(
+                                activityTeamInfoUpdReq.getActivityTeamProductSkuSettingReq(),
+                                activityTeamInfoUpdReq::getProductId
+                        )
+                )
                 .build();
     }
 }

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

@@ -1,12 +1,15 @@
 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.Function;
+import java.util.function.Supplier;
 
 /**
  * 团购spu库存添加模型
@@ -44,4 +47,13 @@ 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/ActivityTeamProductSkuInfoModel.java

@@ -0,0 +1,51 @@
+package com.muyu.marketing.domain.model;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * 商品活动SKU信息模型
+ *
+ * @author DongZeLiang
+ * @date 2024-11-26 15:35
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActivityTeamProductSkuInfoModel {
+    /**
+     * 团购商品SKU的ID
+     */
+    private Long id;
+
+    /**
+     * 团ID
+     */
+    private Long teamId;
+
+    /**
+     * 商品ID
+     */
+    private Long productId;
+
+    /**
+     * 规格SKU
+     */
+    private String sku;
+
+    /**
+     * 拼团价格
+     */
+    private BigDecimal teamPrice;
+
+    /**
+     * 拼团库存
+     */
+    private Long teamStock;
+}

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

@@ -0,0 +1,59 @@
+package com.muyu.marketing.domain.model;
+
+
+import com.muyu.marketing.domain.req.ActivityTeamProductSkuSettingReq;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+import java.util.function.Supplier;
+
+/**
+ * 团购商品规格一键设置
+ *
+ * @author DongZeLiang
+ * @date 2024-11-28 11:15
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActivityTeamProductSkuSettingModel {
+
+    /**
+     * 活动ID
+     */
+    private Long teamId;
+
+    /**
+     * 删除的ID集合
+     */
+    private List<Long> removeIds;
+
+    /**
+     * 添加的规格集合
+     */
+    private List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList;
+
+    /**
+     * 修改的规格集合
+     */
+    private List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModelList;
+
+    public static ActivityTeamProductSkuSettingModel settingReqModel(ActivityTeamProductSkuSettingReq activityTeamProductSkuSettingReq, Supplier<Long> productId) {
+        return ActivityTeamProductSkuSettingModel.builder()
+                .removeIds(activityTeamProductSkuSettingReq.getRemoveIds())
+                .activityTeamProductSkuAddModelList(
+                        activityTeamProductSkuSettingReq.getTeamProjectSkuInfoAddReqList().stream()
+                                .map(teamProjectSkuInfoAddReq -> ActivityTeamProductSkuAddModel.addReqBuild(teamProjectSkuInfoAddReq, productId))
+                                .toList()
+                )
+                .activityTeamProductSkuUpdModelList(
+                        activityTeamProductSkuSettingReq.getTeamProjectSkuInfoUpdReqList().stream()
+                                .map(ActivityTeamProductSkuUpdModel::updReqBuild)
+                                .toList()
+                ).build();
+    }
+}

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

@@ -0,0 +1,46 @@
+package com.muyu.marketing.domain.model;
+
+
+import com.muyu.marketing.domain.req.TeamProjectSkuInfoUpdReq;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * 拼团活动商品SKU
+ *
+ * @author DongZeLiang
+ * @date 2024-11-27 14:18
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActivityTeamProductSkuUpdModel {
+
+    /**
+     * 商品规格ID
+     */
+    private Long id;
+
+    /**
+     * 团购价格
+     */
+    private BigDecimal teamPrice;
+
+    /**
+     * 团购库存
+     */
+    private Long teamStock;
+
+    public static ActivityTeamProductSkuUpdModel updReqBuild(TeamProjectSkuInfoUpdReq teamProjectSkuInfoUpdReq){
+        return ActivityTeamProductSkuUpdModel.builder()
+                .id(teamProjectSkuInfoUpdReq.getId())
+                .teamStock(teamProjectSkuInfoUpdReq.getTeamStock())
+                .teamPrice(teamProjectSkuInfoUpdReq.getTeamPrice())
+                .build();
+    }
+}

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

@@ -3,7 +3,6 @@ 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.model.ActivityTeamProductSkuAddModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -56,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/ActivityTeamInfoUpdReq.java

@@ -32,5 +32,5 @@ public class ActivityTeamInfoUpdReq {
     private String status;
     private String strategyType;
     private Long strategyId;
-    private List<ActivityTeamProductSkuReq> activityTeamProductSkuList;
+    private ActivityTeamProductSkuSettingReq activityTeamProductSkuSettingReq;
 }

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

@@ -0,0 +1,37 @@
+package com.muyu.marketing.domain.req;
+
+
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * 团购商品规格设置
+ *
+ * @author DongZeLiang
+ * @date 2024-11-28 11:27
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActivityTeamProductSkuSettingReq {
+    /**
+     * 删除的ID集合
+     */
+    private List<Long> removeIds;
+
+    /**
+     * 添加的规格集合
+     */
+    private List<TeamProjectSkuInfoAddReq> teamProjectSkuInfoAddReqList;
+
+    /**
+     * 添加的规格集合
+     */
+    private List<TeamProjectSkuInfoUpdReq> teamProjectSkuInfoUpdReqList;
+}

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;
@@ -15,7 +14,8 @@ import java.math.BigDecimal;
 @SuperBuilder
 @AllArgsConstructor
 @NoArgsConstructor
-public class ProjectSkuInfoAddReq {
+public class TeamProjectSkuInfoAddReq {
+
     /**
      * 规格SKU
      */

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

@@ -0,0 +1,33 @@
+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 TeamProjectSkuInfoUpdReq {
+
+    /**
+     * 规格SKU
+     */
+    private Long id;
+
+    /**
+     * 拼团价格
+     */
+    private BigDecimal teamPrice;
+
+    /**
+     * 拼团库存
+     */
+    private Long teamStock;
+}

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

@@ -0,0 +1,81 @@
+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.req.TeamProjectSkuInfoAddReq;
+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 ActivityTeamDetailResp extends BaseEntity {
+
+    /**
+     * 团购ID
+     */
+    private Long teamId;
+    /**
+     * 拼团名称
+     */
+    private String name;
+    /**
+     * 商品ID
+     */
+    private Long productId;
+    /**
+     * 商品活动图
+     */
+    private String productImage;
+    /**
+     * 活动简介
+     */
+    private String introduction;
+    /**
+     * 单位
+     */
+
+    private String unit;
+    /**
+     * 轮播图
+     */
+
+    private String imageList;
+    /**
+     * 活动结束时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    private Date endTime;
+    /**
+     * 活动排序
+     */
+    private Integer sort;
+    /**
+     * 商品SkU集合
+     */
+    private List<ActivityTeamProjectSkuResp> activityTeamProjectSkuList;
+    /**
+     * 活动详情
+     */
+    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/resp/ActivityTeamProjectSkuResp.java

@@ -0,0 +1,38 @@
+package com.muyu.marketing.domain.resp;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.math.BigDecimal;
+
+/**
+ * 添加的
+ */
+@Data
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityTeamProjectSkuResp {
+
+    /**
+     * 团购商品SKU的ID
+     */
+    private Long productSkuId;
+
+    /**
+     * 规格SKU
+     */
+    private String sku;
+
+    /**
+     * 拼团价格
+     */
+    private BigDecimal teamPrice;
+
+    /**
+     * 拼团库存
+     */
+    private Long teamStock;
+}

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

@@ -1,7 +1,7 @@
 package com.muyu.marketing.domain.resp;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.muyu.marketing.domain.model.TeamInfoFindByIdRespModel;
+import com.muyu.marketing.domain.model.ActivityTeamDetailModel;
 import com.muyu.marketing.domain.req.ProjectSkuInfoAddReq;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -82,26 +82,26 @@ public class TeamInfoFindByIdResp {
      */
     private Long strategyId;
 
-    public static TeamInfoFindByIdResp teamInfoFindByIdBuild (TeamInfoFindByIdRespModel teamInfoFindByIdRespModel){
+    public static TeamInfoFindByIdResp teamInfoFindByIdBuild (ActivityTeamDetailModel activityTeamDetailModel){
      return TeamInfoFindByIdResp.builder()
-              .id(teamInfoFindByIdRespModel.getId())
-              .name(teamInfoFindByIdRespModel.getName())
-              .productId(teamInfoFindByIdRespModel.getProductId())
-              .productImage(teamInfoFindByIdRespModel.getProductImage())
-              .introduction(teamInfoFindByIdRespModel.getIntroduction())
-              .unit(teamInfoFindByIdRespModel.getUnit())
-              .imageList(teamInfoFindByIdRespModel.getImageList())
-              .endTime(teamInfoFindByIdRespModel.getEndTime())
-              .sort(teamInfoFindByIdRespModel.getSort())
-              .projectSkuInfoAddList(teamInfoFindByIdRespModel.getProjectSkuInfoAddReqList().stream().map(ProjectFindSkuInfoResp::projectFindSkuInfoBuild).toList())
+              .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())
+              .projectSkuInfoAddList(activityTeamDetailModel.getProjectSkuInfoAddReqList().stream().map(ProjectFindSkuInfoResp::projectFindSkuInfoBuild).toList())
 //              .projectSkuInfoAddList(
 //                      teamInfoFindByIdRespModel.getProjectSkuInfoAddReqList().stream().map(activityTeamProductSkuModel ->
 //                              ProjectFindSkuInfoResp.projectFindSkuInfoBuild(activityTeamProductSkuModel)).toList()
 //              )
-              .content(teamInfoFindByIdRespModel.getContent())
-              .status(teamInfoFindByIdRespModel.getStatus())
-              .strategyType(teamInfoFindByIdRespModel.getStrategyType())
-              .strategyId(teamInfoFindByIdRespModel.getStrategyId())
+              .content(activityTeamDetailModel.getContent())
+              .status(activityTeamDetailModel.getStatus())
+              .strategyType(activityTeamDetailModel.getStrategyType())
+              .strategyId(activityTeamDetailModel.getStrategyId())
               .build();
  }
 }

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

@@ -1,25 +1,21 @@
 package com.muyu.marketing.team.controller;
 
 
-import com.dtflys.forest.annotation.Put;
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
-import com.muyu.marketing.domain.model.*;
+import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel;
+import com.muyu.marketing.domain.model.ActivityTeamInfoListModel;
+import com.muyu.marketing.domain.model.ActivityTeamInfoUpdModel;
 import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq;
 import com.muyu.marketing.domain.req.ActivityTeamInfoUpdReq;
-import com.muyu.marketing.domain.req.ProjectSkuInfoAddReq;
 import com.muyu.marketing.domain.req.TeamInfoListReq;
-import com.muyu.marketing.domain.resp.ProjectFindSkuInfoResp;
 import com.muyu.marketing.domain.resp.TeamInfoFindByIdResp;
 import com.muyu.marketing.domain.resp.TeamInfoListResp;
 import com.muyu.marketing.team.service.ActivityTeamInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.math.BigDecimal;
 import java.util.List;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 /**
  * 营销团购活动控制层
@@ -50,33 +46,26 @@ public class ActivityTeamController {
                 }}
         );
     }
-    @PostMapping("/saveTeam")
-    public boolean saveTeam (@RequestBody ActivityTeamInfoSaveReq activityTeamInfoSaveReq){
-        List<ProjectSkuInfoAddReq> projectSkuInfoAddReqList = activityTeamInfoSaveReq.getProjectSkuInfoAddReqList();
 
-        return activityTeamInfoService.saveActivityTeamInfo(
-                ActivityTeamInfoAddModel.activityTeamInfoAddModelBuild(activityTeamInfoSaveReq, (activityTeamInfoAddModelBuilder) -> {
-                        List<ActivityTeamProductSkuAddModel> collect = projectSkuInfoAddReqList.stream().map(projectSkuInfoAddReq -> {
-                            return ActivityTeamProductSkuAddModel.builder()
-                                    .teamStock(projectSkuInfoAddReq.getTeamStock())
-                                    .teamPrice(projectSkuInfoAddReq.getTeamPrice())
-                                    .sku(projectSkuInfoAddReq.getSku())
-                                    .productId(activityTeamInfoSaveReq.getProductId())
-                                    .build();
-                        }).collect(Collectors.toList());
-                        return activityTeamInfoAddModelBuilder
-                                .activityTeamProductSkuAddModelList(collect)
-                                .build();
-                })
-        );
+
+    /**
+     * 添加团购活动
+     * @param activityTeamInfoSaveReq 添加请求对象
+     * @return 结果集
+     */
+    @PostMapping
+    public Result<String> save(@RequestBody ActivityTeamInfoSaveReq activityTeamInfoSaveReq) {
+        activityTeamInfoService.save(ActivityTeamInfoAddModel.addReqBuild(activityTeamInfoSaveReq));
+        return Result.success();
     }
+
     @PostMapping("/findById/{id}")
     public Result<TeamInfoFindByIdResp> findTeamById(@PathVariable Long id){
-        return Result.success(TeamInfoFindByIdResp.teamInfoFindByIdBuild(activityTeamInfoService.findTeamById(id)));
+        return Result.success(TeamInfoFindByIdResp.teamInfoFindByIdBuild(activityTeamInfoService.findDetailById(id)));
     }
     @PutMapping("/updateByTeamId")
     public Result updateByTeamId(@RequestBody ActivityTeamInfoUpdReq activityTeamInfoUpdReq){
-        activityTeamInfoService.updateByTeamId(ActivityTeamInfoUpdReqModel.activityTeamInfoUpdReqModelBuild(activityTeamInfoUpdReq));
+        activityTeamInfoService.update(ActivityTeamInfoUpdModel.activityTeamInfoUpdReqModelBuild(activityTeamInfoUpdReq));
         return Result.success();
     }
 }

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/ActivityTeamInfoMapper.java

@@ -2,8 +2,6 @@ package com.muyu.marketing.team.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.muyu.marketing.domain.ActivityTeamInfo;
-import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
-import com.muyu.marketing.domain.TeamStrategyExemptionHundred;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyExemptionHundredMapper.java

@@ -1,11 +0,0 @@
-package com.muyu.marketing.team.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.muyu.marketing.domain.TeamStrategyExemption;
-import com.muyu.marketing.domain.TeamStrategyExemptionHundred;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface TeamStrategyExemptionHundredMapper extends BaseMapper<TeamStrategyExemptionHundred> {
-    
-}

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyExemptionOrdinaryMapper.java

@@ -1,11 +0,0 @@
-package com.muyu.marketing.team.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.muyu.marketing.domain.TeamStrategyExemptionHundred;
-import com.muyu.marketing.domain.TeamStrategyExemptionOrdinary;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface TeamStrategyExemptionOrdinaryMapper extends BaseMapper<TeamStrategyExemptionOrdinary> {
-    
-}

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyHundredMapper.java

@@ -0,0 +1,10 @@
+package com.muyu.marketing.team.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muyu.marketing.domain.TeamStrategyHundred;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TeamStrategyHundredMapper extends BaseMapper<TeamStrategyHundred> {
+    
+}

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/mapper/TeamStrategyOrdinaryMapper.java

@@ -0,0 +1,10 @@
+package com.muyu.marketing.team.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muyu.marketing.domain.TeamStrategyOrdinary;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TeamStrategyOrdinaryMapper extends BaseMapper<TeamStrategyOrdinary> {
+    
+}

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

@@ -15,9 +15,25 @@ public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
      */
     public TableDataInfo<ActivityTeamInfoListModel> query(ActivityTeamInfoListQueryModel activityTeamInfoListQueryModel);
 
-    public boolean saveActivityTeamInfo(ActivityTeamInfoAddModel activityTeamInfoAddModel);
+    /**
+     * 通过添加模型，去进行商品拼团活动的操作
+     * @param activityTeamInfoAddModel 团购添加模型
+     */
+    public void save(ActivityTeamInfoAddModel activityTeamInfoAddModel);
+
+    /**
+     * 根据ID查询商品的详情
+     * @param id 团购活动ID
+     * @return 团购详情
+     */
+    ActivityTeamDetailModel findDetailById(Long id);
+
+    /**
+     * 修改团购活动信息
+     * @param activityTeamInfoUpdModel 团购活动信息
+     * @return 是否成功
+     */
+    boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel);
 
-    TeamInfoFindByIdRespModel findTeamById(Long id);
 
-    boolean updateByTeamId(ActivityTeamInfoUpdReqModel activityTeamInfoUpdReqModel);
 }

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

@@ -3,9 +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.*;
-import com.muyu.marketing.domain.resp.ProjectFindSkuInfoResp;
 
 import java.util.List;
 
@@ -39,8 +37,37 @@ public interface ActivityTeamProductSkuInfoService extends IService<ActivityTeam
      * @param activityTeamProductSkuAddModelList 团购商品SKU添加模型集合
      */
     public void batchSave(List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList);
-    public List<ActivityTeamProductSkuModel> findSkuByTeamId(Long teamId);
+
+    /**
+     * 通过拼团活动ID获取拼团下商品SKU集合
+     * @param teamId 活动ID
+     * @return 拼团商品SKU集合
+     */
+    public List<ActivityTeamProductSkuModel> findListByTeamId(Long teamId);
 
     public boolean updateBath(List<ActivityTeamProductSkuReqModel> activityTeamProductSkuReqModelList);
 
+    /**
+     * 根据 业务模型 进行 团购商品修改
+     * @param activityTeamProductSkuUpdModel 修改业务模型
+     * @return 修改结果
+     */
+    public boolean update(ActivityTeamProductSkuUpdModel activityTeamProductSkuUpdModel);
+
+    /**
+     * 根据 业务模型 进行 团购商品批量修改
+     * @param activityTeamProductSkuUpdModelList 修改业务模型
+     * @return 修改结果
+     */
+    public boolean batchUpdate(List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModelList);
+
+    /**
+     * 一键设置
+     * @param activityTeamProductSkuSettingModel 整体修改模型
+     */
+    public default void setting(ActivityTeamProductSkuSettingModel activityTeamProductSkuSettingModel){
+        this.batchSave(activityTeamProductSkuSettingModel.getActivityTeamProductSkuAddModelList());
+        this.batchUpdate(activityTeamProductSkuSettingModel.getActivityTeamProductSkuUpdModelList());
+        this.removeByIds(activityTeamProductSkuSettingModel.getRemoveIds());
+    }
 }

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

@@ -1,8 +0,0 @@
-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<TeamStrategyExemptionHundred> {
-}

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

@@ -1,7 +0,0 @@
-package com.muyu.marketing.team.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.muyu.marketing.domain.TeamStrategyExemptionOrdinary;
-
-public interface TeamStrategyExemptionOrdinaryService extends IService<TeamStrategyExemptionOrdinary> {
-}

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

@@ -2,7 +2,10 @@ package com.muyu.marketing.team.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.marketing.domain.TeamStrategyExemption;
-import com.muyu.marketing.domain.TeamStrategyExemptionHundred;
+import com.muyu.marketing.team.strategy.ActivityTeamStrategy;
 
-public interface TeamStrategyExemptionService extends IService<TeamStrategyExemption> {
+/**
+ * 免单
+ */
+public interface TeamStrategyExemptionService extends ActivityTeamStrategy, IService<TeamStrategyExemption> {
 }

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

@@ -0,0 +1,11 @@
+package com.muyu.marketing.team.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.marketing.domain.TeamStrategyHundred;
+import com.muyu.marketing.team.strategy.ActivityTeamStrategy;
+
+/**
+ * 百人
+ */
+public interface TeamStrategyHundredService extends ActivityTeamStrategy, IService<TeamStrategyHundred> {
+}

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

@@ -0,0 +1,11 @@
+package com.muyu.marketing.team.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.marketing.domain.TeamStrategyOrdinary;
+import com.muyu.marketing.team.strategy.ActivityTeamStrategy;
+
+/**
+ * 普通
+ */
+public interface TeamStrategyOrdinaryService extends ActivityTeamStrategy, IService<TeamStrategyOrdinary> {
+}

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

@@ -11,15 +11,16 @@ 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 io.jsonwebtoken.lang.Assert;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
 
 import java.util.List;
 
 
 @Service
-public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMapper, ActivityTeamInfo> implements ActivityTeamInfoService {
+public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMapper, ActivityTeamInfo>
+    implements ActivityTeamInfoService {
 
     @Autowired
     private ActivityTeamOpenInfoService activityTeamOpenInfoService;
@@ -64,31 +65,44 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
         return tableDataInfo;
     }
 
+    /**
+     * 通过添加模型，去进行商品拼团活动的操作
+     *
+     * @param activityTeamInfoAddModel 团购添加模型
+     */
     @Override
-    public boolean saveActivityTeamInfo(ActivityTeamInfoAddModel activityTeamInfoAddModel) {
-        ActivityTeamInfo activityTeamInfo = ActivityTeamInfo.TeamSaveBuild(ActivityTeamInfoSaveModel.activityTeamInfoSaveModelBuild(activityTeamInfoAddModel));
-        boolean save = this.save(activityTeamInfo);
-        Assert.isTrue(save,"添加失败");
-        activityTeamInfoAddModel.getActivityTeamProductSkuAddModelList().forEach(activityTeamProductSkuAddModel -> activityTeamProductSkuAddModel.setTeamId(activityTeamInfo.getId()));
-        activityTeamProductSkuInfoService.batchSave(activityTeamInfoAddModel.getActivityTeamProductSkuAddModelList());
-        return save;
+    public void save(ActivityTeamInfoAddModel activityTeamInfoAddModel) {
+        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);
     }
 
+    /**
+     * 根据ID查询商品的详情
+     * @param id 团购活动ID
+     * @return 团购详情
+     */
     @Override
-    public TeamInfoFindByIdRespModel findTeamById(Long id) {
-        ActivityTeamInfo byId = this.getById(id);
-        List<ActivityTeamProductSkuModel> skuByTeamId = activityTeamProductSkuInfoService.findSkuByTeamId(id);
-        return TeamInfoFindByIdRespModel.findSkuSumList(byId, (teamInfoFindByIdRespModelBuilder) -> {
-                return teamInfoFindByIdRespModelBuilder.projectSkuInfoAddReqList(skuByTeamId)
-                        .build();
-        });
+    public ActivityTeamDetailModel findDetailById(Long id) {
+        ActivityTeamInfo activityTeamInfo = this.getById(id);
+        List<ActivityTeamProductSkuModel> activityTeamProductSkuModelList = activityTeamProductSkuInfoService.findListByTeamId(id);
+        return ActivityTeamDetailModel.findSkuSumList(activityTeamInfo,
+                (teamInfoFindByIdRespModelBuilder) -> teamInfoFindByIdRespModelBuilder.projectSkuInfoAddReqList(activityTeamProductSkuModelList).build()
+        );
     }
 
+    /**
+     * 修改团购活动信息
+     * @param activityTeamInfoUpdModel 团购活动信息
+     * @return 是否成功
+     */
     @Override
-    public boolean updateByTeamId(ActivityTeamInfoUpdReqModel activityTeamInfoUpdReqModel) {
-        boolean update = this.updateById(ActivityTeamInfo.TeamUpdateBuild(activityTeamInfoUpdReqModel));
+    public boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel) {
+        boolean update = this.updateById(ActivityTeamInfo.TeamUpdateBuild(activityTeamInfoUpdModel));
         Assert.isTrue(update,"修改失败");
-        activityTeamProductSkuInfoService.updateBath(activityTeamInfoUpdReqModel.getActivityTeamProductSkuModelList());
+        activityTeamProductSkuInfoService.setting(activityTeamInfoUpdModel.getActivityTeamProductSkuSettingModel());
         return update;
     }
 }

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

@@ -26,4 +26,6 @@ public class ActivityTeamOpenInfoServiceImpl extends ServiceImpl<ActivityTeamOpe
         queryWrapper.eq(ActivityTeamOpenInfo::getTeamType, teamOpenType.code());
         return this.count(queryWrapper);
     }
+
+
 }

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

@@ -1,11 +1,11 @@
 package com.muyu.marketing.team.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 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.resp.ProjectFindSkuInfoResp;
 import com.muyu.marketing.team.mapper.ActivityTeamProductSkuInfoMapper;
 import com.muyu.marketing.team.service.ActivityTeamProductSkuInfoService;
 import com.muyu.product.cache.ProjectSkuCache;
@@ -81,17 +81,58 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
         );
     }
 
+    /**
+     * 通过拼团活动ID获取拼团下商品SKU集合
+     *
+     * @param teamId 活动ID
+     * @return 拼团商品SKU集合
+     */
     @Override
-    public List<ActivityTeamProductSkuModel> findSkuByTeamId(Long teamId) {
+    public List<ActivityTeamProductSkuModel> findListByTeamId(Long teamId) {
         LambdaQueryWrapper<ActivityTeamProductSkuInfo> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ActivityTeamProductSkuInfo::getTeamId,teamId);
         List<ActivityTeamProductSkuInfo> list = this.list(queryWrapper);
         return list.stream().map(ActivityTeamProductSkuModel::FindBuild).toList();
 //        return list.stream().map(activityTeamProductSkuInfo -> ActivityTeamProductSkuModel.FindBuild(activityTeamProductSkuInfo)).toList();
     }
+
     @Transactional
     @Override
     public boolean updateBath(List<ActivityTeamProductSkuReqModel> activityTeamProductSkuReqModelList) {
         return this.updateBatchById(activityTeamProductSkuReqModelList.stream().map(ActivityTeamProductSkuInfo::updateModelBuild).toList());
     }
+
+    /**
+     * 根据 业务模型 进行 团购商品修改
+     *
+     * @param activityTeamProductSkuUpdModel 修改业务模型
+     * @return 修改结果
+     */
+    @Override
+    public boolean update(ActivityTeamProductSkuUpdModel activityTeamProductSkuUpdModel) {
+        // update set  where
+        LambdaUpdateWrapper<ActivityTeamProductSkuInfo> updateWrapper = new LambdaUpdateWrapper<>();
+        // 字段=值
+        updateWrapper.set(ActivityTeamProductSkuInfo::getTeamStock,activityTeamProductSkuUpdModel.getTeamStock());
+        updateWrapper.set(ActivityTeamProductSkuInfo::getRemainStock,activityTeamProductSkuUpdModel.getTeamStock());
+        updateWrapper.set(ActivityTeamProductSkuInfo::getTeamPrice,activityTeamProductSkuUpdModel.getTeamPrice());
+        // id=？
+        updateWrapper.eq(ActivityTeamProductSkuInfo::getId,activityTeamProductSkuUpdModel.getId());
+        return this.update(updateWrapper);
+    }
+
+    /**
+     * 根据 业务模型 进行 团购商品批量修改
+     *
+     * @param activityTeamProductSkuUpdModelList 修改业务模型
+     * @return 修改结果
+     */
+    @Override
+    public boolean batchUpdate(List<ActivityTeamProductSkuUpdModel> activityTeamProductSkuUpdModelList) {
+        return this.updateBatchById(
+                activityTeamProductSkuUpdModelList.stream()
+                        .map(ActivityTeamProductSkuInfo::updModelBuild)
+                        .toList()
+        );
+    }
 }

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

@@ -1,16 +0,0 @@
-package com.muyu.marketing.team.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.muyu.marketing.domain.TeamStrategyExemption;
-import com.muyu.marketing.domain.TeamStrategyExemptionHundred;
-import com.muyu.marketing.team.mapper.TeamStrategyExemptionHundredMapper;
-import com.muyu.marketing.team.mapper.TeamStrategyExemptionMapper;
-import com.muyu.marketing.team.service.TeamStrategyExemptionHundredService;
-import com.muyu.marketing.team.service.TeamStrategyExemptionService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class TeamStrategyExemptionHundredServiceImpl extends ServiceImpl<TeamStrategyExemptionHundredMapper, TeamStrategyExemptionHundred>
-    implements TeamStrategyExemptionHundredService {
-    
-}

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

@@ -1,13 +0,0 @@
-package com.muyu.marketing.team.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.muyu.marketing.domain.TeamStrategyExemptionOrdinary;
-import com.muyu.marketing.team.mapper.TeamStrategyExemptionOrdinaryMapper;
-import com.muyu.marketing.team.service.TeamStrategyExemptionOrdinaryService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class TeamStrategyExemptionOrdinaryServiceImpl extends ServiceImpl<TeamStrategyExemptionOrdinaryMapper, TeamStrategyExemptionOrdinary>
-    implements TeamStrategyExemptionOrdinaryService {
-    
-}

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

@@ -4,10 +4,62 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.marketing.domain.TeamStrategyExemption;
 import com.muyu.marketing.team.mapper.TeamStrategyExemptionMapper;
 import com.muyu.marketing.team.service.TeamStrategyExemptionService;
+import lombok.extern.log4j.Log4j2;
 import org.springframework.stereotype.Service;
 
-@Service
+@Log4j2
+@Service("team-strategy-exemption")
 public class TeamStrategyExemptionServiceImpl extends ServiceImpl<TeamStrategyExemptionMapper, TeamStrategyExemption>
     implements TeamStrategyExemptionService {
-    
+
+    /**
+     * 开团
+     *
+     * @param activityTeamId 团购活动ID
+     */
+    @Override
+    public void openTeam(Long activityTeamId) {
+        log.info("参加 - 免单团 - [{}]", activityTeamId);
+    }
+
+    /**
+     * 申请加团
+     *
+     * @param teamId 团ID
+     */
+    @Override
+    public void applyTeam(Long teamId) {
+
+    }
+
+    /**
+     * 参团
+     *
+     * @param teamId      加团ID
+     * @param orderNumber 订单编号
+     */
+    @Override
+    public void addTeam(Long teamId, String orderNumber) {
+
+    }
+
+    /**
+     * 退团
+     *
+     * @param teamId 团购ID
+     */
+    @Override
+    public void backTeam(Long teamId) {
+
+    }
+
+    /**
+     * 结算团
+     *
+     * @param teamId 团购ID
+     */
+    @Override
+    public void settle(Long teamId) {
+
+    }
 }

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

@@ -0,0 +1,66 @@
+package com.muyu.marketing.team.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.muyu.marketing.domain.TeamStrategyHundred;
+import com.muyu.marketing.team.mapper.TeamStrategyHundredMapper;
+import com.muyu.marketing.team.service.TeamStrategyHundredService;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Service;
+
+@Log4j2
+@Service("team-strategy-hundred")
+public class TeamStrategyHundredServiceImpl extends ServiceImpl<TeamStrategyHundredMapper, TeamStrategyHundred>
+    implements TeamStrategyHundredService {
+
+    /**
+     * 开团
+     *
+     * @param activityTeamId 团购活动ID
+     */
+    @Override
+    public void openTeam(Long activityTeamId) {
+
+        log.info("参加 - 百人团 - [{}]", activityTeamId);
+    }
+
+    /**
+     * 申请加团
+     *
+     * @param teamId 团ID
+     */
+    @Override
+    public void applyTeam(Long teamId) {
+
+    }
+
+    /**
+     * 参团
+     *
+     * @param teamId      加团ID
+     * @param orderNumber 订单编号
+     */
+    @Override
+    public void addTeam(Long teamId, String orderNumber) {
+
+    }
+
+    /**
+     * 退团
+     *
+     * @param teamId 团购ID
+     */
+    @Override
+    public void backTeam(Long teamId) {
+
+    }
+
+    /**
+     * 结算团
+     *
+     * @param teamId 团购ID
+     */
+    @Override
+    public void settle(Long teamId) {
+
+    }
+}

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

@@ -0,0 +1,66 @@
+package com.muyu.marketing.team.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.muyu.marketing.domain.TeamStrategyOrdinary;
+import com.muyu.marketing.team.mapper.TeamStrategyOrdinaryMapper;
+import com.muyu.marketing.team.service.TeamStrategyOrdinaryService;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Service;
+
+@Log4j2
+@Service("team-strategy-ordinary")
+public class TeamStrategyOrdinaryServiceImpl extends ServiceImpl<TeamStrategyOrdinaryMapper, TeamStrategyOrdinary>
+    implements TeamStrategyOrdinaryService {
+
+    /**
+     * 开团
+     *
+     * @param activityTeamId 团购活动ID
+     */
+    @Override
+    public void openTeam(Long activityTeamId) {
+
+        log.info("参加 - 普通团 - [{}]", activityTeamId);
+    }
+
+    /**
+     * 申请加团
+     *
+     * @param teamId 团ID
+     */
+    @Override
+    public void applyTeam(Long teamId) {
+
+    }
+
+    /**
+     * 参团
+     *
+     * @param teamId      加团ID
+     * @param orderNumber 订单编号
+     */
+    @Override
+    public void addTeam(Long teamId, String orderNumber) {
+
+    }
+
+    /**
+     * 退团
+     *
+     * @param teamId 团购ID
+     */
+    @Override
+    public void backTeam(Long teamId) {
+
+    }
+
+    /**
+     * 结算团
+     *
+     * @param teamId 团购ID
+     */
+    @Override
+    public void settle(Long teamId) {
+
+    }
+}

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/strategy/ActivityTeamStrategy.java

@@ -0,0 +1,44 @@
+package com.muyu.marketing.team.strategy;
+
+
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 团活动策略
+ *
+ * @author DongZeLiang
+ * @date 2024-11-29 15:03
+ */
+public interface ActivityTeamStrategy {
+
+    /**
+     * 开团
+     * @param activityTeamId 团购活动ID
+     */
+    public void openTeam(Long activityTeamId);
+
+    /**
+     * 申请加团
+     * @param teamId 团ID
+     */
+    public void applyTeam(Long teamId);
+
+    /**
+     * 参团
+     * @param teamId 加团ID
+     * @param orderNumber 订单编号
+     */
+    public void addTeam(Long teamId, String orderNumber);
+
+    /**
+     * 退团
+     * @param teamId 团购ID
+     */
+    public void backTeam(Long teamId);
+
+    /**
+     * 结算团
+     * @param teamId 团购ID
+     */
+    public void settle(Long teamId);
+}

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/strategy/impl/ActivityTeamStrategyImpl.java

@@ -0,0 +1,85 @@
+package com.muyu.marketing.team.strategy.impl;
+
+
+import com.muyu.common.core.exception.ServiceException;
+import com.muyu.common.core.utils.SpringUtils;
+import com.muyu.marketing.team.strategy.ActivityTeamStrategy;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Service;
+
+/**
+ * 团购执行器
+ *
+ * @author DongZeLiang
+ * @date 2024-11-29 15:28
+ */
+@Service
+@Primary
+public class ActivityTeamStrategyImpl implements ActivityTeamStrategy {
+    /**
+     * 开团
+     *
+     * @param activityTeamId 团购活动ID
+     */
+    @Override
+    public void openTeam(Long activityTeamId) {
+        // 假设这里是通过方法获取的type，activityTeamId.toString()
+        // "team-strategy-exemption"
+        // "team-strategy-hundred"
+        // "team-strategy-ordinary"
+
+        String activityTeamType = null;
+        if (activityTeamId == null) {
+            throw new ServiceException("activityTeamId is null");
+        }else if (activityTeamId == 0) {
+            activityTeamType = "team-strategy-exemption";
+        }else if (activityTeamId == 1) {
+            activityTeamType = "team-strategy-hundred";
+        }else if (activityTeamId == 2) {
+            activityTeamType = "team-strategy-ordinary";
+        }
+        ActivityTeamStrategy activityTeamStrategy = SpringUtils.getBean(activityTeamType);
+        activityTeamStrategy.openTeam(activityTeamId);
+    }
+
+    /**
+     * 申请加团
+     *
+     * @param teamId 团ID
+     */
+    @Override
+    public void applyTeam(Long teamId) {
+
+    }
+
+    /**
+     * 参团
+     *
+     * @param teamId      加团ID
+     * @param orderNumber 订单编号
+     */
+    @Override
+    public void addTeam(Long teamId, String orderNumber) {
+
+    }
+
+    /**
+     * 退团
+     *
+     * @param teamId 团购ID
+     */
+    @Override
+    public void backTeam(Long teamId) {
+
+    }
+
+    /**
+     * 结算团
+     *
+     * @param teamId 团购ID
+     */
+    @Override
+    public void settle(Long teamId) {
+
+    }
+}

muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 127.0.0.1:8848
       config:
         # 配置中心地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-modules/muyu-marketing/marketing-server/src/test/java/com/muyu/test/TeamStrategyTest.java

@@ -0,0 +1,28 @@
+package com.muyu.test;
+
+
+import com.muyu.marketing.MuYuMarketIngApplication;
+import com.muyu.marketing.team.strategy.ActivityTeamStrategy;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+/**
+ * 测试
+ *
+ * @author DongZeLiang
+ * @date 2024-11-29 15:40
+ */
+@SpringBootTest(classes = MuYuMarketIngApplication.class)
+public class TeamStrategyTest {
+
+    @Autowired
+    private ActivityTeamStrategy activityTeamStrategy;
+
+    @Test
+    public void testStrategy() {
+        activityTeamStrategy.openTeam(0L);
+        activityTeamStrategy.openTeam(1L);
+        activityTeamStrategy.openTeam(2L);
+    }
+}

muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 127.0.0.1:8848
       config:
         # 配置中心地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml

@@ -16,10 +16,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 127.0.0.1:8848
       config:
         # 配置中心地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-modules/muyu-system/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 127.0.0.1:8848
       config:
         # 配置中心地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml

@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 127.0.0.1:8848
       config:
         # 配置中心地址
-        server-addr: 120.46.147.226:8848
+        server-addr: 127.0.0.1:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置