feat()：团购商品-团购添加完成了

# Conflicts:
#	doc/团购查询单条数据结构.java
#	muyu-auth/src/main/resources/bootstrap.yml
#	muyu-gateway/src/main/resources/bootstrap.yml
#	muyu-modules/muyu-file/src/main/resources/bootstrap.yml
#	muyu-modules/muyu-gen/src/main/resources/bootstrap.yml
#	muyu-modules/muyu-job/src/main/resources/bootstrap.yml
#	muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoUpdModel.java
#	muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuInfoModel.java
#	muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamProductDiscountPriceModel.java
#	muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamProductSkuInfoService.java
#	muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java
#	muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml
#	muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml
#	muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml
#	muyu-modules/muyu-system/src/main/resources/bootstrap.yml
#	muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml

doc/团购修改数据结构.json

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

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

@@ -45,3 +45,30 @@ activity_team_product_sku_info.product_sku(商品SKU) <- ActivityTeamProductSkuI
 activity_team_product_sku_info.team_stock(拼团库存) <- ActivityTeamProductSkuInfo.teamStock <- @商品规格.拼团库存
 activity_team_product_sku_info.remain_stock(剩余库存) <- ActivityTeamProductSkuInfo.remainStock <- @商品规格.拼团库存
 activity_team_product_sku_info.team_price(拼团价格) <- ActivityTeamProductSkuInfo.teamPrice <- @商品规格.拼团价格
+
+
+
+
+
+{
+        "code": 0,
+        "msg": "string",
+        "data": {
+        "rows": [
+        {
+        "id": 0,
+        "name": "string",
+        "productImage": "string",
+        "productPrice": "string",
+        "teamPrice": "string",
+        "attendNumber": "string",
+        "openTeamNumber": "string",
+        "teamStock": "string",
+        "remainStock": "string",
+        "endTime": "string",
+        "status": "string"
+        }
+        ],
+        "total": "string"
+        }
+ }

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

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

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

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 8080
+  port: 18080
 
 # Spring
 spring:
@@ -14,10 +14,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.45.42:8848
+        namespace: www-mall
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.45.42:8848
+        namespace: www-mall
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -28,12 +30,13 @@ spring:
       eager: true
       transport:
         # 控制台地址
-        dashboard: 127.0.0.1:8718
+        dashboard: 113.44.45.42:8718
       # nacos配置持久化
       datasource:
         ds1:
           nacos:
-            server-addr: 127.0.0.1:8848
+            server-addr: 113.44.45.42:8848
+            namespace: www-mall
             dataId: sentinel-muyu-gateway
             groupId: DEFAULT_GROUP
             data-type: json

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

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

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

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

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

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

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

@@ -74,11 +74,6 @@ public class ActivityTeamInfo extends BaseEntity {
    */
   private long strategyId;
 
-  /**
-   * 公共添加模型，转换成添加对象
-   * @param activityTeamInfoAddModel 添加模型
-   * @return 添加对象
-   */
   public static ActivityTeamInfo addModelBuild(ActivityTeamInfoAddModel activityTeamInfoAddModel){
     return ActivityTeamInfo.builder()
             .name(activityTeamInfoAddModel.getName())

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

@@ -5,9 +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.ActivityTeamProductSkuModel;
 import com.muyu.marketing.domain.model.ActivityTeamProductSkuReqModel;
-import com.muyu.marketing.domain.model.ActivityTeamProductSkuUpdModel;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
@@ -52,7 +50,7 @@ public class ActivityTeamProductSkuInfo extends BaseEntity {
   private BigDecimal teamPrice;
 
   /**
-   * 通过模型钢构件对象
+   * 通过模型钢构件对象taskkill /t /f /im
    * @param activityTeamProductSkuAddModel 模型
    * @return 对象
    */
@@ -76,13 +74,4 @@ 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/TeamStrategyExemptionHundred.java

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

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

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

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

@@ -10,7 +10,6 @@ import lombok.NoArgsConstructor;
 
 import java.util.Date;
 import java.util.List;
-import java.util.function.Supplier;
 
 /**
  * 团购活动添加模型
@@ -58,7 +57,7 @@ public class ActivityTeamInfoAddModel {
     /**
      * 活动排序
      */
-    private Long sort;
+    private Integer sort;
     /**
      * 商品SkU集合
      */
@@ -80,25 +79,29 @@ public class ActivityTeamInfoAddModel {
      */
     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();
-    }
+  public static  ActivityTeamInfoAddModel saveTeamInfoBuild(ActivityTeamInfoSaveReq activityTeamInfoSaveReq){
+            return ActivityTeamInfoAddModel.builder()
+                   .name(activityTeamInfoSaveReq.getName())
+                   .productId(activityTeamInfoSaveReq.getProductId())
+                   .productImage(activityTeamInfoSaveReq.getProductImage())
+                   .introduction(activityTeamInfoSaveReq.getIntroduction())
+                   .unit(activityTeamInfoSaveReq.getUnit())
+                   .imageList(activityTeamInfoSaveReq.getImageList())
+                   .endTime(activityTeamInfoSaveReq.getEndTime())
+                   .sort(activityTeamInfoSaveReq.getSort())
+                   .content(activityTeamInfoSaveReq.getContent())
+                   .status(activityTeamInfoSaveReq.getStatus())
+                   .strategyType(activityTeamInfoSaveReq.getStrategyType())
+                   .strategyId(activityTeamInfoSaveReq.getStrategyId())
+                   .activityTeamProductSkuAddModelList(
+                           activityTeamInfoSaveReq.getProjectSkuInfoAddReqList()
+                                   .stream()
+                                   .map(projectSkuInfoAddReq ->ActivityTeamProductSkuAddModel.addReqBulid(projectSkuInfoAddReq, activityTeamInfoSaveReq::getProductId)).toList()
+                   ).build();
+  }
+
+
+
+
+
 }

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

@@ -0,0 +1,101 @@
+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 com.muyu.marketing.domain.req.TeamProjectSkuInfoAddReq;
+import com.muyu.marketing.domain.resp.ActivityTeamInfoDaitlResp;
+import com.muyu.marketing.domain.resp.TeamProjectSkuInfoResp;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ActivityTeamInfoDaitlRespModel 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<TeamProjectSkuInfoResp> projectSkuInfoAddReqList;
+    /**
+     * 活动详情
+     */
+    private String content;
+    /**
+     * 活动状态
+     */
+    private String status;
+    /**
+     * 策略类型
+     */
+    private String strategyType;
+    /**
+     * 策略ID
+     */
+    private Long strategyId;
+//
+//    public static ActivityTeamInfoDaitlRespModel  findById(ActivityTeamInfo activityTeamInfo, List<ActivityTeamProductSkuInfoModel> teamProductSkuInfoModelList){
+//        return ActivityTeamInfoDaitlRespModel.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())
+//                .projectSkuInfoAddReqList(teamProductSkuInfoModelList)
+//                .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/ActivityTeamInfoUpdModel.java

@@ -1,15 +1,11 @@
 package com.muyu.marketing.domain.model;
 
 import com.muyu.marketing.domain.req.ActivityTeamInfoUpdReq;
-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;
 
@@ -37,7 +33,7 @@ public class ActivityTeamInfoUpdModel {
     private String status;
     private String strategyType;
     private Long strategyId;
-    private ActivityTeamProductSkuSettingModel activityTeamProductSkuSettingModel;
+    private List<ActivityTeamProductSkuReqModel> activityTeamProductSkuModelList;
 
     public static ActivityTeamInfoUpdModel activityTeamInfoUpdReqModelBuild (ActivityTeamInfoUpdReq activityTeamInfoUpdReq){
         return ActivityTeamInfoUpdModel.builder()
@@ -54,12 +50,7 @@ public class ActivityTeamInfoUpdModel {
                 .status(activityTeamInfoUpdReq.getStatus())
                 .strategyType(activityTeamInfoUpdReq.getStrategyType())
                 .strategyId(activityTeamInfoUpdReq.getStrategyId())
-                .activityTeamProductSkuSettingModel(
-                        ActivityTeamProductSkuSettingModel.settingReqModel(
-                                activityTeamInfoUpdReq.getActivityTeamProductSkuSettingReq(),
-                                activityTeamInfoUpdReq::getProductId
-                        )
-                )
+                .activityTeamProductSkuModelList(activityTeamInfoUpdReq.getActivityTeamProductSkuList().stream().map(ActivityTeamProductSkuReqModel::activityTeamProductSkuReqModelBuild).toList())
                 .build();
     }
 }

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

@@ -8,7 +8,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
-import java.util.function.Function;
 import java.util.function.Supplier;
 
 /**
@@ -48,12 +47,12 @@ public class ActivityTeamProductSkuAddModel {
      */
     private Long teamStock;
 
-    public static ActivityTeamProductSkuAddModel addReqBuild(TeamProjectSkuInfoAddReq teamProjectSkuInfoAddReq, Supplier<Long> productId){
-        return ActivityTeamProductSkuAddModel.builder()
+    public static ActivityTeamProductSkuAddModel addReqBulid(TeamProjectSkuInfoAddReq teamProjectSkuInfoAddReq, Supplier<Long> productId){
+        return  ActivityTeamProductSkuAddModel.builder()
                 .productId(productId.get())
                 .sku(teamProjectSkuInfoAddReq.getSku())
-                .teamStock(teamProjectSkuInfoAddReq.getTeamStock())
                 .teamPrice(teamProjectSkuInfoAddReq.getTeamPrice())
+                .teamStock(teamProjectSkuInfoAddReq.getTeamStock())
                 .build();
     }
 }

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

@@ -1,59 +0,0 @@
-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

@@ -1,7 +1,6 @@
 package com.muyu.marketing.domain.model;
 
 
-import com.muyu.marketing.domain.req.TeamProjectSkuInfoUpdReq;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -35,12 +34,4 @@ public class ActivityTeamProductSkuUpdModel {
      * 团购库存
      */
     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

@@ -51,11 +51,11 @@ public class ActivityTeamInfoSaveReq extends BaseEntity {
     /**
      * 活动排序
      */
-    private Long sort;
+    private Integer sort;
     /**
      * 商品SkU集合
      */
-    private List<TeamProjectSkuInfoAddReq> teamProjectSkuInfoAddReqList;
+    private List<TeamProjectSkuInfoAddReq> projectSkuInfoAddReqList;
     /**
      * 活动详情
      */
@@ -72,4 +72,11 @@ public class ActivityTeamInfoSaveReq extends BaseEntity {
      * 策略ID
      */
     private Long strategyId;
+
+    public static ActivityTeamInfoSaveReq saveSkuInfosBuild(ActivityTeamInfoSaveReq activityTeamInfoSaveReq){
+       return ActivityTeamInfoSaveReq.builder()
+                .projectSkuInfoAddReqList(activityTeamInfoSaveReq.getProjectSkuInfoAddReqList())
+                .build();
+    }
+
 }

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 ActivityTeamProductSkuSettingReq activityTeamProductSkuSettingReq;
+    private List<ActivityTeamProductSkuReq> activityTeamProductSkuList;
 }

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

@@ -1,37 +0,0 @@
-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

@@ -3,15 +3,10 @@ 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 TeamProjectSkuInfoAddReq {
@@ -21,6 +16,7 @@ public class TeamProjectSkuInfoAddReq {
      */
     private String sku;
 
+
     /**
      * 拼团价格
      */

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

@@ -0,0 +1,89 @@
+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 ActivityTeamInfoDaitlResp 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<TeamProjectSkuInfoAddReq> projectSkuInfoAddReqList;
+    /**
+     * 活动详情
+     */
+    private String content;
+    /**
+     * 活动状态
+     */
+    private String status;
+    /**
+     * 策略类型
+     */
+    private String strategyType;
+    /**
+     * 策略ID
+     */
+    private Long strategyId;
+
+    public static ActivityTeamInfoDaitlResp saveSkuInfosBuild(ActivityTeamInfoDaitlResp activityTeamInfoSaveReq){
+       return ActivityTeamInfoDaitlResp.builder()
+                .projectSkuInfoAddReqList(activityTeamInfoSaveReq.getProjectSkuInfoAddReqList())
+                .build();
+    }
+
+}

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

@@ -1,25 +1,36 @@
-package com.muyu.marketing.domain.req;
+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 TeamProjectSkuInfoUpdReq {
+public class TeamProjectSkuInfoResp {
+
+    /**
+     * 编号
+     */
+    private Integer id;
+
+    /**
+     * 活动id
+     */
+    private Long teamId;
+
+    /**
+     * 商品id
+      */
+    private Long productId;
 
     /**
      * 规格SKU
      */
-    private Long id;
+    private String sku;
+
 
     /**
      * 拼团价格

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

@@ -12,6 +12,7 @@ import com.muyu.marketing.domain.req.TeamInfoListReq;
 import com.muyu.marketing.domain.resp.TeamInfoFindByIdResp;
 import com.muyu.marketing.domain.resp.TeamInfoListResp;
 import com.muyu.marketing.team.service.ActivityTeamInfoService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -23,6 +24,7 @@ import java.util.List;
  * @author DongZeLiang
  * @date 2024-11-20 14:25
  */
+@Slf4j
 @RestController
 @RequestMapping("/team")
 public class ActivityTeamController {
@@ -47,16 +49,10 @@ public class ActivityTeamController {
         );
     }
 
-
-    /**
-     * 添加团购活动
-     * @param activityTeamInfoSaveReq 添加请求对象
-     * @return 结果集
-     */
-    @PostMapping
-    public Result<String> save(@RequestBody ActivityTeamInfoSaveReq activityTeamInfoSaveReq) {
-        activityTeamInfoService.save(ActivityTeamInfoAddModel.addReqBuild(activityTeamInfoSaveReq));
-        return Result.success();
+    @PostMapping("/save")
+    public Result save(@RequestBody ActivityTeamInfoSaveReq activityTeamInfoSaveReq){
+            activityTeamInfoService.save(ActivityTeamInfoAddModel.saveTeamInfoBuild(activityTeamInfoSaveReq));
+            return Result.success();
     }
 
     @PostMapping("/findById/{id}")

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

@@ -2,6 +2,8 @@ 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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,11 @@
+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

@@ -1,10 +0,0 @@
-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

@@ -1,10 +0,0 @@
-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/ActivityTeamProductSkuInfoService.java

@@ -3,6 +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 java.util.List;
@@ -47,27 +48,4 @@ public interface ActivityTeamProductSkuInfoService extends IService<ActivityTeam
 
     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

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

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

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

@@ -1,11 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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

@@ -65,6 +65,7 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
         return tableDataInfo;
     }
 
+
     /**
      * 通过添加模型，去进行商品拼团活动的操作
      *
@@ -101,8 +102,8 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
     @Override
     public boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel) {
         boolean update = this.updateById(ActivityTeamInfo.TeamUpdateBuild(activityTeamInfoUpdModel));
-        Assert.isTrue(update,"修改失败");
-        activityTeamProductSkuInfoService.setting(activityTeamInfoUpdModel.getActivityTeamProductSkuSettingModel());
+        io.jsonwebtoken.lang.Assert.isTrue(update,"修改失败");
+        activityTeamProductSkuInfoService.updateBath(activityTeamInfoUpdModel.getActivityTeamProductSkuModelList());
         return update;
     }
 }

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

@@ -1,7 +1,6 @@
 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;
@@ -101,38 +100,4 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
     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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,13 @@
+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,62 +4,10 @@ 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;
 
-@Log4j2
-@Service("team-strategy-exemption")
+@Service
 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

@@ -1,66 +0,0 @@
-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

@@ -1,66 +0,0 @@
-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

@@ -1,44 +0,0 @@
-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

@@ -1,85 +0,0 @@
-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: 127.0.0.1:8848
+        server-addr: 120.46.147.226:8848
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 120.46.147.226:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

@@ -1,28 +0,0 @@
-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,12 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.45.42:8848
+        namespace: www-mall
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 113.44.45.42:8848
+        namespace: www-mall
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

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

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

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

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

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