Merge remote-tracking branch 'origin/master' into 1127/wanwenjing

# 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/团购查询单条数据结构.java

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

doc/团购活动修改.java

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

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.muyu.common.core.web.domain.BaseEntity;
 import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel;
+import com.muyu.marketing.domain.model.ActivityTeamInfoSaveModel;
+import com.muyu.marketing.domain.model.ActivityTeamInfoUpdModel;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
@@ -88,4 +90,38 @@ 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/ActivityTeamProductSkuInfo.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.muyu.common.core.web.domain.BaseEntity;
 import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel;
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuReqModel;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
@@ -58,8 +59,19 @@ public class ActivityTeamProductSkuInfo extends BaseEntity {
             .productId(activityTeamProductSkuAddModel.getProductId())
             .teamId(activityTeamProductSkuAddModel.getTeamId())
             .teamStock(activityTeamProductSkuAddModel.getTeamStock())
+            .productSku(activityTeamProductSkuAddModel.getSku())
             .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();
+  }
+
 }

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

@@ -0,0 +1,102 @@
+package com.muyu.marketing.domain.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.marketing.domain.ActivityTeamInfo;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+import java.util.function.Function;
+
+/**
+ * @program: 2204a-cloud-server
+ * @description: 活动回显总模型
+ * @author: AoCi Tian
+ * @create: 2024-11-26 16:00
+ **/
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ActivityTeamDetailModel {
+    /**
+     * 拼团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<ActivityTeamProductSkuModel> projectSkuInfoAddReqList;
+    /**
+     * 活动详情
+     */
+    private String content;
+    /**
+     * 活动状态
+     */
+    private String status;
+    /**
+     * 策略类型
+     */
+    private String strategyType;
+    /**
+     * 策略ID
+     */
+    private Long strategyId;
+    public static ActivityTeamDetailModel findSkuSumList  (ActivityTeamInfo activityTeamInfo,
+                                                           Function<ActivityTeamDetailModel.ActivityTeamDetailModelBuilder, ActivityTeamDetailModel> function){
+        return function.apply(ActivityTeamDetailModel.builder()
+                .id(activityTeamInfo.getId())
+                .name(activityTeamInfo.getName())
+                .productId(activityTeamInfo.getProductId())
+                .productImage(activityTeamInfo.getProductImage())
+                .introduction(activityTeamInfo.getIntroduction())
+                .unit(activityTeamInfo.getUnit())
+                .imageList(activityTeamInfo.getImageList())
+                .endTime(activityTeamInfo.getEndTime())
+                .sort(activityTeamInfo.getSort())
+                .content(activityTeamInfo.getContent())
+                .status(activityTeamInfo.getStatus())
+                .strategyType(activityTeamInfo.getStrategyType())
+                .strategyId(activityTeamInfo.getStrategyId())
+        );
+    }
+}

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

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

@@ -1,6 +1,6 @@
 package com.muyu.marketing.domain.model;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.marketing.domain.req.ActivityTeamInfoUpdReq;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -10,71 +10,47 @@ 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;
-    /**
-     * 商品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 Integer sort;
-    /**
-     * 商品SkU集合
-     */
-    private List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList;
-    /**
-     * 活动详情
-     */
     private String content;
-    /**
-     * 活动状态
-     */
     private String status;
-    /**
-     * 策略类型
-     */
     private String strategyType;
-    /**
-     * 策略ID
-     */
     private Long strategyId;
+    private List<ActivityTeamProductSkuReqModel> activityTeamProductSkuModelList;
+
+    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())
+                .activityTeamProductSkuModelList(activityTeamInfoUpdReq.getActivityTeamProductSkuList().stream().map(ActivityTeamProductSkuReqModel::activityTeamProductSkuReqModelBuild).toList())
+                .build();
+    }
 }

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

@@ -1,7 +1,6 @@
 package com.muyu.marketing.domain.model;
 
-import com.muyu.common.core.web.domain.BaseEntity;
+
-import jdk.jfr.Name;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -9,23 +8,29 @@ import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 
+/**
+ * 商品活动SKU信息模型
+ *
+ * @author DongZeLiang
+ * @date 2024-11-26 15:35
+ */
 @Data
-@AllArgsConstructor
-@NoArgsConstructor
 @Builder
-public class ActivityTeamProductSkuInfoModel extends BaseEntity {
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActivityTeamProductSkuInfoModel {
     /**
-     * 编号
+     * 团购商品SKU的ID
      */
-    private Integer id;
+    private Long id;
 
     /**
-     * 活动id
+     * 团ID
      */
     private Long teamId;
 
     /**
-     * 商品id
+     * 商品ID
      */
     private Long productId;
 

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

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

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

@@ -0,0 +1,37 @@
+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-27 14:18
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActivityTeamProductSkuUpdModel {
+
+    /**
+     * 商品规格ID
+     */
+    private Long id;
+
+    /**
+     * 团购价格
+     */
+    private BigDecimal teamPrice;
+
+    /**
+     * 团购库存
+     */
+    private Long teamStock;
+}

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

@@ -44,7 +44,7 @@ public class TeamProductDiscountPriceModel {
      * @return 优惠力度
      */
     public static TeamProductDiscountPriceModel of(BigDecimal productPrice, BigDecimal teamPrice) {
-      return   TeamProductDiscountPriceModel.builder()
+        return TeamProductDiscountPriceModel.builder()
                 .productPrice(productPrice)
                 .teamPrice(teamPrice)
                 .discount(

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

@@ -0,0 +1,36 @@
+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 List<ActivityTeamProductSkuReq> activityTeamProductSkuList;
+}

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

@@ -0,0 +1,28 @@
+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/resp/ActivityTeamDetailResp.java

@@ -0,0 +1,81 @@
+package com.muyu.marketing.domain.resp;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.common.core.web.domain.BaseEntity;
+import com.muyu.marketing.domain.req.TeamProjectSkuInfoAddReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class ActivityTeamDetailResp extends BaseEntity {
+
+    /**
+     * 团购ID
+     */
+    private Long teamId;
+    /**
+     * 拼团名称
+     */
+    private String name;
+    /**
+     * 商品ID
+     */
+    private Long productId;
+    /**
+     * 商品活动图
+     */
+    private String productImage;
+    /**
+     * 活动简介
+     */
+    private String introduction;
+    /**
+     * 单位
+     */
+
+    private String unit;
+    /**
+     * 轮播图
+     */
+
+    private String imageList;
+    /**
+     * 活动结束时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    private Date endTime;
+    /**
+     * 活动排序
+     */
+    private Integer sort;
+    /**
+     * 商品SkU集合
+     */
+    private List<ActivityTeamProjectSkuResp> activityTeamProjectSkuList;
+    /**
+     * 活动详情
+     */
+    private String content;
+    /**
+     * 活动状态
+     */
+    private String status;
+    /**
+     * 策略类型
+     */
+    private String strategyType;
+    /**
+     * 策略ID
+     */
+    private Long strategyId;
+}

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

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

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

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

@@ -0,0 +1,107 @@
+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-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java

@@ -5,16 +5,16 @@ 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.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.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.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -54,4 +54,14 @@ public class ActivityTeamController {
             activityTeamInfoService.save(ActivityTeamInfoAddModel.saveTeamInfoBuild(activityTeamInfoSaveReq));
             return Result.success();
     }
+
+    @PostMapping("/findById/{id}")
+    public Result<TeamInfoFindByIdResp> findTeamById(@PathVariable Long id){
+        return Result.success(TeamInfoFindByIdResp.teamInfoFindByIdBuild(activityTeamInfoService.findDetailById(id)));
+    }
+    @PutMapping("/updateByTeamId")
+    public Result updateByTeamId(@RequestBody ActivityTeamInfoUpdReq activityTeamInfoUpdReq){
+        activityTeamInfoService.update(ActivityTeamInfoUpdModel.activityTeamInfoUpdReqModelBuild(activityTeamInfoUpdReq));
+        return Result.success();
+    }
 }

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

@@ -3,11 +3,7 @@ package com.muyu.marketing.team.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.marketing.domain.ActivityTeamInfo;
-import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel;
+import com.muyu.marketing.domain.model.*;
-import com.muyu.marketing.domain.model.ActivityTeamInfoListModel;
-import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel;
-
-import java.util.List;
 
 public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
 
@@ -24,4 +20,20 @@ public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
      * @param activityTeamInfoAddModel 团购添加模型
      */
     public void save(ActivityTeamInfoAddModel activityTeamInfoAddModel);
+
+    /**
+     * 根据ID查询商品的详情
+     * @param id 团购活动ID
+     * @return 团购详情
+     */
+    ActivityTeamDetailModel findDetailById(Long id);
+
+    /**
+     * 修改团购活动信息
+     * @param activityTeamInfoUpdModel 团购活动信息
+     * @return 是否成功
+     */
+    boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel);
+
+
 }

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

@@ -3,10 +3,8 @@ 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.ActivityTeamProductSkuAddModel;
+import com.muyu.marketing.domain.TeamStrategyExemptionHundred;
-import com.muyu.marketing.domain.model.ActivityTeamProductSkuInfoModel;
+import com.muyu.marketing.domain.model.*;
-import com.muyu.marketing.domain.model.TeamProductDiscountPriceModel;
-import com.muyu.marketing.domain.model.TeamProductStockModel;
 
 import java.util.List;
 
@@ -41,10 +39,13 @@ public interface ActivityTeamProductSkuInfoService extends IService<ActivityTeam
      */
     public void batchSave(List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList);
 
-//    /**
+    /**
-//     * 添加规格
+     * 通过拼团活动ID获取拼团下商品SKU集合
-//     * @param teamId
+     * @param teamId 活动ID
-//     * @return
+     * @return 拼团商品SKU集合
-//     */
+     */
-//    public List<ActivityTeamProductSkuInfoModel> findByIdSku(Long teamId);
+    public List<ActivityTeamProductSkuModel> findListByTeamId(Long teamId);
+
+    public boolean updateBath(List<ActivityTeamProductSkuReqModel> activityTeamProductSkuReqModelList);
+
 }

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.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.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.common.core.utils.StringUtils;
@@ -16,9 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Consumer;
 
 
 @Service
@@ -82,4 +79,31 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
         teamProductSkuAddModelList.forEach(activityTeamProductSkuAddModel -> activityTeamProductSkuAddModel.setTeamId(activityTeamInfo.getId()));
         this.activityTeamProductSkuInfoService.batchSave(teamProductSkuAddModelList);
     }
+
+    /**
+     * 根据ID查询商品的详情
+     * @param id 团购活动ID
+     * @return 团购详情
+     */
+    @Override
+    public ActivityTeamDetailModel findDetailById(Long id) {
+        ActivityTeamInfo activityTeamInfo = this.getById(id);
+        List<ActivityTeamProductSkuModel> activityTeamProductSkuModelList = activityTeamProductSkuInfoService.findListByTeamId(id);
+        return ActivityTeamDetailModel.findSkuSumList(activityTeamInfo,
+                (teamInfoFindByIdRespModelBuilder) -> teamInfoFindByIdRespModelBuilder.projectSkuInfoAddReqList(activityTeamProductSkuModelList).build()
+        );
+    }
+
+    /**
+     * 修改团购活动信息
+     * @param activityTeamInfoUpdModel 团购活动信息
+     * @return 是否成功
+     */
+    @Override
+    public boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel) {
+        boolean update = this.updateById(ActivityTeamInfo.TeamUpdateBuild(activityTeamInfoUpdModel));
+        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

@@ -4,16 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.common.core.exception.ServiceException;
 import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
-import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel;
+import com.muyu.marketing.domain.model.*;
-import com.muyu.marketing.domain.model.ActivityTeamProductSkuInfoModel;
-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;
@@ -82,14 +80,24 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
         );
     }
 
-//    @Override
+    /**
-//    public List<ActivityTeamProductSkuInfoModel> findByIdSku(Long teamId) {
+     * 通过拼团活动ID获取拼团下商品SKU集合
-//        LambdaQueryWrapper<ActivityTeamProductSkuInfo> queryWrapper = new LambdaQueryWrapper<>();
+     *
-//        queryWrapper.eq(ActivityTeamProductSkuInfo::getTeamId,teamId);
+     * @param teamId 活动ID
-//        List<ActivityTeamProductSkuInfo> list = this.list();
+     * @return 拼团商品SKU集合
-//        list.stream().map(ActivityTeamProductSkuInfo->{
+     */
-//            ActivityTeamProductSkuAddModel builder = ActivityTeamProductSkuAddModel.builder(ActivityTeamProductSkuInfo);
+    @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());
+    }
 }

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

@@ -6,7 +6,7 @@ server:
 spring:
   application:
     # 应用名称
-    name: muyu-marketing
+    name: muyu-buy
   profiles:
     # 环境配置
     active: dev
@@ -14,12 +14,10 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 113.44.45.42:8848
+        server-addr: 120.46.147.226:8848
-        namespace: www-mall
       config:
         # 配置中心地址
-        server-addr: 113.44.45.42:8848
+        server-addr: 120.46.147.226:8848
-        namespace: www-mall
         # 配置文件格式
         file-extension: yml
         # 共享配置