2204A-cyj(回显)

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

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

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

@@ -1,24 +0,0 @@
-$.{
-    "活动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

@@ -1,32 +0,0 @@
-{
-    "活动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"
-}

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

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

muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/PageDomain.java

@@ -2,6 +2,7 @@ package com.muyu.common.core.web.page;
 
 import com.muyu.common.core.utils.StringUtils;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;

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

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

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

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

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

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

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

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

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

@@ -5,13 +5,17 @@ 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 lombok.AllArgsConstructor;
-import com.muyu.marketing.domain.model.ActivityTeamInfoUpdModel;
+import lombok.Data;
-import lombok.*;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
 import java.util.Date;
 
+/**
+ * 商品拼团信息
+ */
 @Data
 @SuperBuilder
 @NoArgsConstructor
@@ -32,7 +36,7 @@ public class ActivityTeamInfo extends BaseEntity {
   /**
    * 商品ID
    */
-  private long productId;
+  private Long productId;
   /**
    * 商品活动图
    */
@@ -95,38 +99,4 @@ public class ActivityTeamInfo extends BaseEntity {
             .strategyId(activityTeamInfoAddModel.getStrategyId())
             .build();
   }
-
-  public static ActivityTeamInfo teamSaveBuild(ActivityTeamInfoSaveModel activityTeamInfoSaveModel) {
-    return ActivityTeamInfo.builder()
-            .name(activityTeamInfoSaveModel.getName())
-            .productId(activityTeamInfoSaveModel.getProductId())
-            .productImage(activityTeamInfoSaveModel.getProductImage())
-            .introduction(activityTeamInfoSaveModel.getIntroduction())
-            .unit(activityTeamInfoSaveModel.getUnit())
-            .imageList(activityTeamInfoSaveModel.getImageList())
-            .endTime(activityTeamInfoSaveModel.getEndTime())
-            .sort(activityTeamInfoSaveModel.getSort())
-            .content(activityTeamInfoSaveModel.getContent())
-            .status(activityTeamInfoSaveModel.getStatus())
-            .strategyType(activityTeamInfoSaveModel.getStrategyType())
-            .strategyId(activityTeamInfoSaveModel.getStrategyId())
-            .build();
-  }
-  public static ActivityTeamInfo TeamUpdateBuild (ActivityTeamInfoUpdModel activityTeamInfoUpdModel){
-    return ActivityTeamInfo.builder()
-            .id(activityTeamInfoUpdModel.getId())
-            .name(activityTeamInfoUpdModel.getName())
-            .productId(activityTeamInfoUpdModel.getProductId())
-            .productImage(activityTeamInfoUpdModel.getProductImage())
-            .introduction(activityTeamInfoUpdModel.getIntroduction())
-            .unit(activityTeamInfoUpdModel.getUnit())
-            .imageList(activityTeamInfoUpdModel.getImageList())
-            .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/ActivityTeamOpenInfo.java

@@ -4,11 +4,16 @@ 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 lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
 import java.util.Date;
-
+/**
+ * 团购活动执行表
+ */
 @Data
 @SuperBuilder
 @NoArgsConstructor
@@ -45,7 +50,7 @@ public class ActivityTeamOpenInfo extends BaseEntity {
   /**
    * 商品ID
    */
-  private String productId;
+  private Long productId;
   /**
    * 商品名称
    */

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

@@ -5,14 +5,17 @@ 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 lombok.AllArgsConstructor;
-import com.muyu.marketing.domain.model.ActivityTeamProductSkuReqModel;
+import lombok.Data;
-import com.muyu.marketing.domain.model.ActivityTeamProductSkuUpdModel;
+import lombok.EqualsAndHashCode;
-import lombok.*;
+import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
 import java.math.BigDecimal;
 
+/**
+ * 商品拼团规格信息表
+ */
 @Data
 @SuperBuilder
 @NoArgsConstructor
@@ -51,6 +54,7 @@ public class ActivityTeamProductSkuInfo extends BaseEntity {
    */
   private BigDecimal teamPrice;
 
+
   /**
    * 通过模型钢构件对象
    * @param activityTeamProductSkuAddModel 模型
@@ -61,28 +65,8 @@ public class ActivityTeamProductSkuInfo extends BaseEntity {
             .productId(activityTeamProductSkuAddModel.getProductId())
             .teamId(activityTeamProductSkuAddModel.getTeamId())
             .teamStock(activityTeamProductSkuAddModel.getTeamStock())
-            .productSku(activityTeamProductSkuAddModel.getSku())
+//            .remainStock(activityTeamProductSkuAddModel.getTeamStock())
-            .remainStock(activityTeamProductSkuAddModel.getTeamStock())
             .teamPrice(activityTeamProductSkuAddModel.getTeamPrice())
             .build();
   }
-  public static ActivityTeamProductSkuInfo updateModelBuild(ActivityTeamProductSkuReqModel activityTeamProductSkuReqModel) {
-    return ActivityTeamProductSkuInfo.builder()
-            .id(activityTeamProductSkuReqModel.getId())
-            .productId(activityTeamProductSkuReqModel.getProductId())
-            .teamStock(activityTeamProductSkuReqModel.getTeamStock())
-            .productSku(activityTeamProductSkuReqModel.getProductSku())
-            .teamPrice(activityTeamProductSkuReqModel.getTeamPrice())
-            .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/TeamStrategyExemption.java

@@ -4,9 +4,14 @@ 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 lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
-
+/**
+ * 拼团免单策略
+ */
 @Data
 @SuperBuilder
 @NoArgsConstructor

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

@@ -0,0 +1,54 @@
+package com.muyu.marketing.domain;
+
+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 lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+
+/**
+ * 百人策略
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = "team_strategy_exemption_hundred", autoResultMap = true)
+public class TeamStrategyExemptionHundred extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private long id;
+    /**
+     * 持续时间
+     */
+    private long duration;
+    /**
+     * 最大购买量
+     */
+    private long maxBuy;
+    /**
+     * 单次购买量
+     */
+    private long oneBuy;
+    /**
+     * 虚拟人数
+     */
+    private long virtualNumber;
+    /**
+     * 策略状态
+     */
+    private String status;
+    /**
+     * 规则信息
+     */
+    private String ruleInfo;
+}

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

@@ -0,0 +1,53 @@
+package com.muyu.marketing.domain;
+
+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 lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * 普通策略
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@TableName(value = "team_strategy_exemption_ordinary", autoResultMap = true)
+public class TeamStrategyExemptionOrdinary extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private long id;
+    /**
+     * 持续时间
+     */
+    private long duration;
+    /**
+     * 成团人数
+     */
+    private long teamNumber;
+    /**
+     * 最大购买量
+     */
+    private long maxBuy;
+    /**
+     * 单次购买量
+     */
+    private long oneBuy;
+    /**
+     * 虚拟人数
+     */
+    private long virtualNumber;
+    /**
+     * 策略状态
+     */
+    private String status;
+}

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

@@ -1,47 +0,0 @@
-package com.muyu.marketing.domain;
-
-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 lombok.*;
-import lombok.experimental.SuperBuilder;
-
-@Data
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "team_strategy_exemption_hundred", autoResultMap = true)
-public class TeamStrategyHundred extends BaseEntity {
-
-  /**
-   * 主键
-   */
-  @TableId(value = "id", type = IdType.AUTO)
-  private long id;
-  /**
-   * 持续时间
-   */
-  private long duration;
-  /**
-   * 最大购买量
-   */
-  private long maxBuy;
-  /**
-   * 单次购买量
-   */
-  private long oneBuy;
-  /**
-   * 虚拟人数
-   */
-  private long virtualNumber;
-  /**
-   * 策略状态
-   */
-  private String status;
-  /**
-   * 规则信息
-   */
-  private String ruleInfo;
-}

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

@@ -1,47 +0,0 @@
-package com.muyu.marketing.domain;
-
-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 lombok.*;
-import lombok.experimental.SuperBuilder;
-
-@Data
-@SuperBuilder
-@NoArgsConstructor
-@AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "team_strategy_exemption_ordinary", autoResultMap = true)
-public class TeamStrategyOrdinary extends BaseEntity {
-
-  /**
-   * 主键
-   */
-  @TableId(value = "id", type = IdType.AUTO)
-  private long id;
-  /**
-   * 持续时间
-   */
-  private long duration;
-  /**
-   * 成团人数
-   */
-  private long teamNumber;
-  /**
-   * 最大购买量
-   */
-  private long maxBuy;
-  /**
-   * 单次购买量
-   */
-  private long oneBuy;
-  /**
-   * 虚拟人数
-   */
-  private long virtualNumber;
-  /**
-   * 策略状态
-   */
-  private String status;
-}

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

@@ -58,7 +58,7 @@ public class ActivityTeamInfoAddModel {
     /**
      * 活动排序
      */
-    private Long sort;
+    private Integer sort;
     /**
      * 商品SkU集合
      */
@@ -101,4 +101,6 @@ public class ActivityTeamInfoAddModel {
                                 .toList()
                 ).build();
     }
+
+
 }

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

@@ -1,92 +0,0 @@
-package com.muyu.marketing.domain.model;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @program: 2204a-cloud-server
- * @description: 添加活动模型
- * @author: AoCi Tian
- * @create: 2024-11-26 10:59
- **/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class ActivityTeamInfoSaveModel {
-
-    /**
-     * 拼团名称
-     */
-    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;
-    /**
-     * 活动详情
-     */
-    private String content;
-    /**
-     * 活动状态
-     */
-    private String status;
-    /**
-     * 策略类型
-     */
-    private String strategyType;
-    /**
-     * 策略ID
-     */
-    private Long strategyId;
-    public static ActivityTeamInfoSaveModel activityTeamInfoSaveModelBuild (ActivityTeamInfoAddModel activityTeamInfoAddModel){
-        return ActivityTeamInfoSaveModel.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();
-    }
-}

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

@@ -1,7 +1,10 @@
 package com.muyu.marketing.domain.model;
 
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.muyu.marketing.domain.ActivityTeamInfo;
+import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
+import com.muyu.marketing.domain.resp.TeamProjectSkuInfoResp;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -9,23 +12,22 @@ import lombok.NoArgsConstructor;
 
 import java.util.Date;
 import java.util.List;
-import java.util.function.Function;
 
 /**
- * @program: 2204a-cloud-server
+ * 团购活动查询模型
- * @description: 活动回显总模型
+ * @author DongZeLiang
- * @author: AoCi Tian
+ * @date 2024-11-26 09:38
- * @create: 2024-11-26 16:00
- **/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class ActivityTeamDetailModel {
-    /**
-     * 拼团id
  */
-    private Long id;
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActivityTeamInfoSelectModel {
+
+    /**
+     * 拼团活动id
+     */
+    private Long teamId;
     /**
      * 拼团名称
      */
@@ -34,6 +36,7 @@ public class ActivityTeamDetailModel {
      * 商品ID
      */
     private Long productId;
+
     /**
      * 商品活动图
      */
@@ -64,7 +67,7 @@ public class ActivityTeamDetailModel {
     /**
      * 商品SkU集合
      */
-    private List<ActivityTeamProductSkuModel> projectSkuInfoAddReqList;
+    private List<TeamProjectSkuInfoResp> teamProjectSkuInfoResp;
     /**
      * 活动详情
      */
@@ -81,10 +84,13 @@ public class ActivityTeamDetailModel {
      * 策略ID
      */
     private Long strategyId;
-    public static ActivityTeamDetailModel findSkuSumList  (ActivityTeamInfo activityTeamInfo,
+
-                                                           Function<ActivityTeamDetailModel.ActivityTeamDetailModelBuilder, ActivityTeamDetailModel> function){
+
-        return function.apply(ActivityTeamDetailModel.builder()
+    /** 回显 构造 ActivityTeamInfoSelectModel*/
-                .id(activityTeamInfo.getId())
+
+    public static ActivityTeamInfoSelectModel getTeamInfoSelectModel(ActivityTeamInfo activityTeamInfo, List<ActivityTeamProductSkuInfo> list) {
+        return ActivityTeamInfoSelectModel.builder()
+                .teamId(activityTeamInfo.getId())
                 .name(activityTeamInfo.getName())
                 .productId(activityTeamInfo.getProductId())
                 .productImage(activityTeamInfo.getProductImage())
@@ -93,10 +99,13 @@ public class ActivityTeamDetailModel {
                 .imageList(activityTeamInfo.getImageList())
                 .endTime(activityTeamInfo.getEndTime())
                 .sort(activityTeamInfo.getSort())
+                .teamProjectSkuInfoResp(        list.stream().map(skuInfo ->
+                        TeamProjectSkuInfoResp.getSkuInfoResp(skuInfo)
+                ).toList())
                 .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,65 +0,0 @@
-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;
-
-/**
- * @program: 2204a-cloud-server
- * @description: 活动商品规格修改模型
- * @author: AoCi Tian
- * @create: 2024-11-26 19:25
- **/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class ActivityTeamInfoUpdModel {
-    private Long id;
-    private String name;
-    private Long productId;
-    private String productImage;
-    private String introduction;
-    private String unit;
-    private String imageList;
-    private Date endTime;
-    private Long sort;
-    private String content;
-    private String status;
-    private String strategyType;
-    private Long strategyId;
-    private ActivityTeamProductSkuSettingModel activityTeamProductSkuSettingModel;
-
-    public static ActivityTeamInfoUpdModel activityTeamInfoUpdReqModelBuild (ActivityTeamInfoUpdReq activityTeamInfoUpdReq){
-        return ActivityTeamInfoUpdModel.builder()
-                .id(activityTeamInfoUpdReq.getId())
-                .name(activityTeamInfoUpdReq.getName())
-                .productId(activityTeamInfoUpdReq.getProductId())
-                .productImage(activityTeamInfoUpdReq.getProductImage())
-                .introduction(activityTeamInfoUpdReq.getIntroduction())
-                .unit(activityTeamInfoUpdReq.getUnit())
-                .imageList(activityTeamInfoUpdReq.getImageList())
-                .endTime(activityTeamInfoUpdReq.getEndTime())
-                .sort(activityTeamInfoUpdReq.getSort())
-                .content(activityTeamInfoUpdReq.getContent())
-                .status(activityTeamInfoUpdReq.getStatus())
-                .strategyType(activityTeamInfoUpdReq.getStrategyType())
-                .strategyId(activityTeamInfoUpdReq.getStrategyId())
-                .activityTeamProductSkuSettingModel(
-                        ActivityTeamProductSkuSettingModel.settingReqModel(
-                                activityTeamInfoUpdReq.getActivityTeamProductSkuSettingReq(),
-                                activityTeamInfoUpdReq::getProductId
-                        )
-                )
-                .build();
-    }
-}

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

@@ -1,28 +1,28 @@
-package com.muyu.marketing.domain.resp;
+package com.muyu.marketing.domain.model;
+
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.muyu.common.core.web.domain.BaseEntity;
+import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq;
-import com.muyu.marketing.domain.req.TeamProjectSkuInfoAddReq;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
 
 import java.util.Date;
 import java.util.List;
 
+/**
+ * 团购活动修改模型
+ *
+ * @author DongZeLiang
+ * @date 2024-11-26 09:38
+ */
 @Data
-@SuperBuilder
+@Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode(callSuper = true)
+public class ActivityTeamInfoUpdateModel {
-public class ActivityTeamDetailResp extends BaseEntity {
 
-    /**
-     * 团购ID
-     */
-    private Long teamId;
     /**
      * 拼团名称
      */
@@ -58,10 +58,6 @@ public class ActivityTeamDetailResp extends BaseEntity {
      * 活动排序
      */
     private Integer sort;
-    /**
-     * 商品SkU集合
-     */
-    private List<ActivityTeamProjectSkuResp> activityTeamProjectSkuList;
     /**
      * 活动详情
      */
@@ -78,4 +74,7 @@ public class ActivityTeamDetailResp extends BaseEntity {
      * 策略ID
      */
     private Long strategyId;
+
+    /** 删除商品规格idList*/
+    private List<Long> ids;
 }

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

@@ -52,7 +52,7 @@ public class ActivityTeamProductSkuAddModel {
         return ActivityTeamProductSkuAddModel.builder()
                 .productId(productId.get())
                 .sku(teamProjectSkuInfoAddReq.getSku())
-                .teamStock(teamProjectSkuInfoAddReq.getTeamStock())
+//                .teamStock(teamProjectSkuInfoAddReq.getTeamStock())
                 .teamPrice(teamProjectSkuInfoAddReq.getTeamPrice())
                 .build();
     }

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

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

@@ -1,50 +0,0 @@
-package com.muyu.marketing.domain.model;
-
-import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
-import com.muyu.marketing.domain.resp.ProjectFindSkuInfoResp;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-
-/**
- * @program: 2204a-cloud-server
- * @description: 回显sku模型
- * @author: AoCi Tian
- * @create: 2024-11-26 16:03
- **/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class ActivityTeamProductSkuModel {
-    /**
-     * 规格id
-     */
-    private Long id;
-    /**
-     * 规格SKU
-     */
-    private String sku;
-
-    /**
-     * 拼团价格
-     */
-    private BigDecimal teamPrice;
-
-    /**
-     * 拼团库存
-     */
-    private Long teamStock;
-
-    public static ActivityTeamProductSkuModel FindBuild(ActivityTeamProductSkuInfo activityTeamProductSkuInfo) {
-        return ActivityTeamProductSkuModel.builder()
-                .id(activityTeamProductSkuInfo.getId())
-                .sku(activityTeamProductSkuInfo.getProductSku())
-                .teamStock(activityTeamProductSkuInfo.getTeamStock())
-                .teamPrice(activityTeamProductSkuInfo.getTeamPrice())
-                .build();
-    }
-}

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

@@ -1,40 +0,0 @@
-package com.muyu.marketing.domain.model;
-
-import com.muyu.marketing.domain.req.ActivityTeamProductSkuReq;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-
-/**
- * @program: 2204a-cloud-server
- * @description: sku修改模型
- * @author: AoCi Tian
- * @create: 2024-11-26 19:45
- **/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class ActivityTeamProductSkuReqModel {
-    private Long id;
-    private Long teamId;
-    private Long productId;
-    private String productSku;
-    private Long teamStock;
-    private Long remainStock;
-    private BigDecimal teamPrice;
-    public static ActivityTeamProductSkuReqModel activityTeamProductSkuReqModelBuild(ActivityTeamProductSkuReq activityTeamProductSkuReq){
-        return ActivityTeamProductSkuReqModel.builder()
-                .id(activityTeamProductSkuReq.getId())
-                .productId(activityTeamProductSkuReq.getProductId())
-                .teamId(activityTeamProductSkuReq.getTeamId())
-                .productSku(activityTeamProductSkuReq.getProductSku())
-                .remainStock(activityTeamProductSkuReq.getRemainStock())
-                .teamStock(activityTeamProductSkuReq.getTeamStock())
-                .teamPrice(activityTeamProductSkuReq.getTeamPrice())
-                .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,46 +0,0 @@
-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

@@ -1,8 +1,11 @@
 package com.muyu.marketing.domain.req;
 
+/**
+ * 添加拼团活动
+ */
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.muyu.common.core.web.domain.BaseEntity;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -11,6 +14,10 @@ import lombok.experimental.SuperBuilder;
 
 import java.util.Date;
 import java.util.List;
+
+/**
+ * 添加ActivityTeamInfo的Req
+ */
 @Data
 @SuperBuilder
 @NoArgsConstructor
@@ -51,7 +58,7 @@ public class ActivityTeamInfoSaveReq extends BaseEntity {
     /**
      * 活动排序
      */
-    private Long sort;
+    private Integer sort;
     /**
      * 商品SkU集合
      */

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

@@ -1,36 +0,0 @@
-package com.muyu.marketing.domain.req;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @program: 2204a-cloud-server
- * @description: 活动商品规格修改入参
- * @author: AoCi Tian
- * @create: 2024-11-26 19:25
- **/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class ActivityTeamInfoUpdReq {
-    private Long id;
-    private String name;
-    private Long productId;
-    private String productImage;
-    private String introduction;
-    private String unit;
-    private String imageList;
-    private Date endTime;
-    private Long sort;
-    private String content;
-    private String status;
-    private String strategyType;
-    private Long strategyId;
-    private ActivityTeamProductSkuSettingReq activityTeamProductSkuSettingReq;
-}

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

@@ -1,28 +0,0 @@
-package com.muyu.marketing.domain.req;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-
-/**
- * @program: 2204a-cloud-server
- * @description: sku修改入参
- * @author: AoCi Tian
- * @create: 2024-11-26 19:45
- **/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class ActivityTeamProductSkuReq {
-    private Long id;
-    private Long teamId;
-    private Long productId;
-    private String productSku;
-    private Long teamStock;
-    private Long remainStock;
-    private BigDecimal teamPrice;
-}

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/TeamInfoListReq.java

@@ -2,7 +2,10 @@ package com.muyu.marketing.domain.req;
 
 import com.muyu.common.core.web.page.PageDomain;
 import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
 @Data
@@ -25,6 +28,7 @@ public class TeamInfoListReq extends PageDomain {
 
     /**
      * 通过当前对象构建业务查询模型
+     *
      * @return 业务查询模型
      */
     public ActivityTeamInfoListQueryModel buildQueryModel() {

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

@@ -8,7 +8,7 @@ import lombok.experimental.SuperBuilder;
 import java.math.BigDecimal;
 
 /**
- * 添加的
+ * 添加的Sku
  */
 @Data
 @SuperBuilder
@@ -16,6 +16,11 @@ import java.math.BigDecimal;
 @NoArgsConstructor
 public class TeamProjectSkuInfoAddReq {
 
+    /**
+     * 规格id
+     */
+    private Long ruleId;
+
     /**
      * 规格SKU
      */

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

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

@@ -0,0 +1,110 @@
+package com.muyu.marketing.domain.resp;
+
+/**
+ * 添加拼团活动
+ */
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.common.core.web.domain.BaseEntity;
+import com.muyu.marketing.domain.model.ActivityTeamInfoSelectModel;
+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 ActivityTeamInfoResp 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 Long sort;
+    /**
+     * 商品SkU集合
+     */
+    private List<TeamProjectSkuInfoResp> teamProjectSkuInfoResp;
+    /**
+     * 活动详情
+     */
+    private String content;
+    /**
+     * 活动状态
+     */
+    private String status;
+    /**
+     * 策略类型
+     */
+    private String strategyType;
+    /**
+     * 策略ID
+     */
+    private Long strategyId;
+
+    /** 构造ActivityTeamInfoResp  */
+    public static ActivityTeamInfoResp select(ActivityTeamInfoSelectModel teamSelectModel) {
+
+        return ActivityTeamInfoResp.builder()
+                .teamId(teamSelectModel.getTeamId())
+                .name(teamSelectModel.getName())
+                .productId(teamSelectModel.getProductId())
+                .productImage(teamSelectModel.getProductImage())
+                .introduction(teamSelectModel.getIntroduction())
+                .unit(teamSelectModel.getUnit())
+                .imageList(teamSelectModel.getImageList())
+                .endTime(teamSelectModel.getEndTime())
+                .sort(teamSelectModel.getSort())
+                .teamProjectSkuInfoResp(teamSelectModel.getTeamProjectSkuInfoResp())
+                .content(teamSelectModel.getContent())
+                .status(teamSelectModel.getStatus())
+                .strategyType(teamSelectModel.getStrategyType())
+                .strategyId(teamSelectModel.getStrategyId())
+                .build();
+    }
+}

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

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

@@ -1,48 +0,0 @@
-package com.muyu.marketing.domain.resp;
-
-import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
-import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel;
-import com.muyu.marketing.domain.model.ActivityTeamProductSkuModel;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
-
-import java.math.BigDecimal;
-
-/**
- * 回显resp
- */
-@Data
-@SuperBuilder
-@AllArgsConstructor
-@NoArgsConstructor
-public class ProjectFindSkuInfoResp {
-    /**
-     * 规格id
-     */
-    private Long id;
-    /**
-     * 规格SKU
-     */
-    private String sku;
-
-    /**
-     * 拼团价格
-     */
-    private BigDecimal teamPrice;
-
-    /**
-     * 拼团库存
-     */
-    private Long teamStock;
-
-    public static ProjectFindSkuInfoResp projectFindSkuInfoBuild (ActivityTeamProductSkuModel activityTeamProductSkuModel)  {
-        return ProjectFindSkuInfoResp.builder()
-                .teamStock(activityTeamProductSkuModel.getTeamStock())
-                .teamPrice(activityTeamProductSkuModel.getTeamPrice())
-                .id(activityTeamProductSkuModel.getId())
-                .sku(activityTeamProductSkuModel.getSku())
-                .build();
-    }
-}

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

@@ -1,107 +0,0 @@
-package com.muyu.marketing.domain.resp;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.muyu.marketing.domain.model.ActivityTeamDetailModel;
-import com.muyu.marketing.domain.req.ProjectSkuInfoAddReq;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @program: 2204a-cloud-server
- * @description: 团购活动回显响应
- * @author: AoCi Tian
- * @create: 2024-11-26 15:19
- **/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class TeamInfoFindByIdResp {
-   /**
-    * 拼团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<ProjectFindSkuInfoResp> projectSkuInfoAddList;
-    /**
-     * 活动详情
-     */
-    private String content;
-    /**
-     * 活动状态
-     */
-    private String status;
-    /**
-     * 策略类型
-     */
-    private String strategyType;
-    /**
-     * 策略ID
-     */
-    private Long strategyId;
-
-    public static TeamInfoFindByIdResp teamInfoFindByIdBuild (ActivityTeamDetailModel activityTeamDetailModel){
-     return TeamInfoFindByIdResp.builder()
-              .id(activityTeamDetailModel.getId())
-              .name(activityTeamDetailModel.getName())
-              .productId(activityTeamDetailModel.getProductId())
-              .productImage(activityTeamDetailModel.getProductImage())
-              .introduction(activityTeamDetailModel.getIntroduction())
-              .unit(activityTeamDetailModel.getUnit())
-              .imageList(activityTeamDetailModel.getImageList())
-              .endTime(activityTeamDetailModel.getEndTime())
-              .sort(activityTeamDetailModel.getSort())
-              .projectSkuInfoAddList(activityTeamDetailModel.getProjectSkuInfoAddReqList().stream().map(ProjectFindSkuInfoResp::projectFindSkuInfoBuild).toList())
-//              .projectSkuInfoAddList(
-//                      teamInfoFindByIdRespModel.getProjectSkuInfoAddReqList().stream().map(activityTeamProductSkuModel ->
-//                              ProjectFindSkuInfoResp.projectFindSkuInfoBuild(activityTeamProductSkuModel)).toList()
-//              )
-              .content(activityTeamDetailModel.getContent())
-              .status(activityTeamDetailModel.getStatus())
-              .strategyType(activityTeamDetailModel.getStrategyType())
-              .strategyId(activityTeamDetailModel.getStrategyId())
-              .build();
- }
-}

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

@@ -1,7 +1,6 @@
 package com.muyu.marketing.domain.resp;
 
 import com.muyu.marketing.domain.model.ActivityTeamInfoListModel;
-import com.muyu.marketing.domain.req.TeamInfoListReq;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

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

@@ -0,0 +1,50 @@
+package com.muyu.marketing.domain.resp;
+
+import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.math.BigDecimal;
+
+/**
+ * 查询 拼团活动的商品规格
+ */
+@Data
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+public class TeamProjectSkuInfoResp {
+
+    /**
+     *规格id
+     */
+    private Long ruleId;
+
+    /**
+     * 规格SKU
+     */
+    private String sku;
+
+    /**
+     * 拼团价格
+     */
+    private BigDecimal teamPrice;
+
+    /**
+     * 拼团库存
+     */
+    private Long teamStock;
+
+    /** 构造  回显拼团活动SKU*/
+    public static TeamProjectSkuInfoResp getSkuInfoResp(ActivityTeamProductSkuInfo skuInfo) {
+      return   TeamProjectSkuInfoResp.builder()
+                .ruleId(skuInfo.getId())
+                .sku(skuInfo.getProductSku())
+                .teamPrice(skuInfo.getTeamPrice())
+//                .teamStock(skuInfo.getTeamStock())
+                .build();
+    }
+
+}

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

@@ -5,11 +5,10 @@ import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel;
 import com.muyu.marketing.domain.model.ActivityTeamInfoListModel;
-import com.muyu.marketing.domain.model.ActivityTeamInfoUpdModel;
+import com.muyu.marketing.domain.model.ActivityTeamInfoSelectModel;
 import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq;
-import com.muyu.marketing.domain.req.ActivityTeamInfoUpdReq;
 import com.muyu.marketing.domain.req.TeamInfoListReq;
-import com.muyu.marketing.domain.resp.TeamInfoFindByIdResp;
+import com.muyu.marketing.domain.resp.ActivityTeamInfoResp;
 import com.muyu.marketing.domain.resp.TeamInfoListResp;
 import com.muyu.marketing.team.service.ActivityTeamInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,13 +58,17 @@ public class ActivityTeamController {
         return Result.success();
     }
 
-    @PostMapping("/findById/{id}")
+
-    public Result<TeamInfoFindByIdResp> findTeamById(@PathVariable Long id){
+    /**
-        return Result.success(TeamInfoFindByIdResp.teamInfoFindByIdBuild(activityTeamInfoService.findDetailById(id)));
+     * 回显拼团活动
-    }
+     * @teamId 拼团活动id
-    @PutMapping("/updateByTeamId")
+     */
-    public Result updateByTeamId(@RequestBody ActivityTeamInfoUpdReq activityTeamInfoUpdReq){
+    @GetMapping("/{teamId}")
-        activityTeamInfoService.update(ActivityTeamInfoUpdModel.activityTeamInfoUpdReqModelBuild(activityTeamInfoUpdReq));
+    public Result<ActivityTeamInfoResp> getTeamInfo(@PathVariable Long teamId){
-        return Result.success();
+        //调用Service方法 获取回显Model
+        ActivityTeamInfoSelectModel activityTeamInfoSelectModel = activityTeamInfoService.selectTeamInfo(teamId);
+        // 将 回显的Model 构造 成 Resp
+        ActivityTeamInfoResp activityTeamInfoResp = ActivityTeamInfoResp.select(activityTeamInfoSelectModel);
+        return Result.success(activityTeamInfoResp);
     }
 }

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/ActivityTeamInfoService.java

@@ -3,7 +3,10 @@ package com.muyu.marketing.team.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.marketing.domain.ActivityTeamInfo;
-import com.muyu.marketing.domain.model.*;
+import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel;
+import com.muyu.marketing.domain.model.ActivityTeamInfoListModel;
+import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel;
+import com.muyu.marketing.domain.model.ActivityTeamInfoSelectModel;
 
 public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
 
@@ -22,18 +25,7 @@ public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
     public void save(ActivityTeamInfoAddModel activityTeamInfoAddModel);
 
     /**
-     * 根据ID查询商品的详情
+     * 查询拼团活动（回显）
-     * @param id 团购活动ID
-     * @return 团购详情
      */
-    ActivityTeamDetailModel findDetailById(Long id);
+    public ActivityTeamInfoSelectModel selectTeamInfo(Long teamId);
-
+ }
-    /**
-     * 修改团购活动信息
-     * @param activityTeamInfoUpdModel 团购活动信息
-     * @return 是否成功
-     */
-    boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel);
-
-
-}

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

@@ -3,7 +3,10 @@ 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.model.*;
+import com.muyu.marketing.domain.TeamStrategyExemptionHundred;
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel;
+import com.muyu.marketing.domain.model.TeamProductDiscountPriceModel;
+import com.muyu.marketing.domain.model.TeamProductStockModel;
 
 import java.util.List;
 
@@ -38,36 +41,4 @@ public interface ActivityTeamProductSkuInfoService extends IService<ActivityTeam
      */
     public void batchSave(List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList);
 
-    /**
-     * 通过拼团活动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

@@ -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 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

@@ -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

@@ -1,21 +1,28 @@
 package com.muyu.marketing.team.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.muyu.common.core.exception.ServiceException;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.marketing.domain.ActivityTeamInfo;
+import com.muyu.marketing.domain.ActivityTeamOpenInfo;
+import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
 import com.muyu.marketing.domain.model.*;
 import com.muyu.marketing.team.mapper.ActivityTeamInfoMapper;
 import com.muyu.marketing.team.service.ActivityTeamInfoService;
 import com.muyu.marketing.team.service.ActivityTeamOpenInfoService;
 import com.muyu.marketing.team.service.ActivityTeamProductSkuInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Consumer;
 
 
 @Service
@@ -28,6 +35,8 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
     @Autowired
     private ActivityTeamProductSkuInfoService activityTeamProductSkuInfoService;
 
+
+
     @Override
     public TableDataInfo<ActivityTeamInfoListModel> query(ActivityTeamInfoListQueryModel activityTeamInfoListQueryModel) {
 
@@ -80,29 +89,20 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
     }
 
     /**
-     * 根据ID查询商品的详情
+     * 查询拼团活动（回显）
-     * @param id 团购活动ID
+     * @param teamId
-     * @return 团购详情
+     * @return
      */
     @Override
-    public ActivityTeamDetailModel findDetailById(Long id) {
+    public ActivityTeamInfoSelectModel selectTeamInfo(Long teamId) {
-        ActivityTeamInfo activityTeamInfo = this.getById(id);
+        //根据拼团活动id 查询拼团活动
-        List<ActivityTeamProductSkuModel> activityTeamProductSkuModelList = activityTeamProductSkuInfoService.findListByTeamId(id);
+        ActivityTeamInfo activityTeamInfo = this.getById(teamId);
-        return ActivityTeamDetailModel.findSkuSumList(activityTeamInfo,
+        //查询活动中的 商品sku集合
-                (teamInfoFindByIdRespModelBuilder) -> teamInfoFindByIdRespModelBuilder.projectSkuInfoAddReqList(activityTeamProductSkuModelList).build()
+        List<ActivityTeamProductSkuInfo> activityTeamProductSkuInfoList = activityTeamProductSkuInfoService.getActivityTeamProductSkuInfoByTeamId(teamId);
-        );
-    }
 
-    /**
+        //构造成 ActivityTeamInfoSelectModel
-     * 修改团购活动信息
+        ActivityTeamInfoSelectModel teamInfoSelectModel = ActivityTeamInfoSelectModel.getTeamInfoSelectModel(activityTeamInfo, activityTeamProductSkuInfoList);
-     * @param activityTeamInfoUpdModel 团购活动信息
+
-     * @return 是否成功
+        return teamInfoSelectModel;
-     */
-    @Override
-    public boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel) {
-        boolean update = this.updateById(ActivityTeamInfo.TeamUpdateBuild(activityTeamInfoUpdModel));
-        Assert.isTrue(update,"修改失败");
-        activityTeamProductSkuInfoService.setting(activityTeamInfoUpdModel.getActivityTeamProductSkuSettingModel());
-        return update;
     }
 }

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

@@ -1,18 +1,18 @@
 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.model.ActivityTeamProductSkuAddModel;
+import com.muyu.marketing.domain.model.TeamProductDiscountPriceModel;
+import com.muyu.marketing.domain.model.TeamProductStockModel;
 import com.muyu.marketing.team.mapper.ActivityTeamProductSkuInfoMapper;
 import com.muyu.marketing.team.service.ActivityTeamProductSkuInfoService;
 import com.muyu.product.cache.ProjectSkuCache;
 import com.muyu.product.domain.ProjectSkuInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -80,59 +80,4 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
                 activityTeamProductSkuAddModelList.stream().map(ActivityTeamProductSkuInfo::modelBuild).toList()
         );
     }
-
-    /**
-     * 通过拼团活动ID获取拼团下商品SKU集合
-     *
-     * @param teamId 活动ID
-     * @return 拼团商品SKU集合
-     */
-    @Override
-    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

@@ -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
-@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

@@ -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

@@ -4,9 +4,24 @@ server:
 
 # Spring
 spring:
+  datasource:
+    dynamic:
+      primary: master
+      datasource:
+        # 主库数据源
+        master:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://60.204.150.30:3306/activity_team?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          username: root
+          password: xx-12345
+        slave:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://60.204.150.30:3306/product?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          username: root
+          password: xx-12345
   application:
     # 应用名称
-    name: muyu-buy
+    name: muyu-marketing
   profiles:
     # 环境配置
     active: dev
@@ -14,10 +29,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 60.204.150.30:8848
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 60.204.150.30: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,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 60.204.150.30:8848
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 60.204.150.30: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: 127.0.0.1:8848
+        server-addr: 60.204.150.30:8848
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 60.204.150.30:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置

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

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

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

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 9100
+  port: 9101
 
 # Spring
 spring:
@@ -14,10 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 60.204.150.30:8848
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 60.204.150.30:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置