From cc82c9988098895ef68bf55076996cbcb88facfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B4=94=E7=A6=8F=E6=B3=A2?=
 <14587188+cui-fubo@user.noreply.gitee.com>
Date: Wed, 27 Nov 2024 14:24:53 +0800
Subject: [PATCH] =?UTF-8?q?fax():=E5=9B=9E=E6=98=BE=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E8=A1=A5=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...�修改数据结构.java => 团购修改数据结构.json} | 23 +++++++++++--------
 .../controller/ActivityTeamController.java    |  2 +-
 .../impl/ActivityTeamInfoServiceImpl.java     |  6 +++--
 3 files changed, 19 insertions(+), 12 deletions(-)
 rename doc/{团购修改数据结构.java => 团购修改数据结构.json} (56%)

diff --git a/doc/团购修改数据结构.java b/doc/团购修改数据结构.json
similarity index 56%
rename from doc/团购修改数据结构.java
rename to doc/团购修改数据结构.json
index c439ba5..3113554 100644
--- a/doc/团购修改数据结构.java
+++ b/doc/团购修改数据结构.json
@@ -1,6 +1,6 @@
 {
   "拼团活动Id": "Long",
-  "商品ID": "Long", //activity_team_info.product_id
+  "商品ID": "Long",
   "商品图片": "String",
   "活动名称": "String",
   "活动简介": "String",
@@ -11,14 +11,19 @@
   "活动时间": "date",
   "策略类型": "String",
   "策略ID": "Long",
-  "商品规格List": [ // activity_team_product_sku_info
-    {
-      "规格SKUId": "Long",
-      "规格SKU": "String", // activity_team_product_sku_info.product_sku
+  "商品规格List": [{
+    "规格SKUid": "Long",
+    "拼团价格": "BigDecimal",
+    "拼团库存": "Long"
+  }],
+  "商品规格List": [{
+    "规格SKUid": "Long"
+  }],
+  "商品规格List": [{
       "拼团价格": "BigDecimal",
       "拼团库存": "Long"
-    }
-  ],
+    }],
   "排序": "Integer",
-  "详情": "String"
-}
\ No newline at end of file
+  "详情": "String",
+  "活动状态":"Long"
+}
diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java
index fc079e0..9955f20 100644
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java
@@ -53,7 +53,7 @@ public class ActivityTeamController {
      * @param activityTeamInfoSaveReq 添加请求对象
      * @return 结果集
      */
-    @PostMapping
+    @PostMapping("/addTeam")
     public Result<String> save(@RequestBody ActivityTeamInfoSaveReq activityTeamInfoSaveReq) {
         activityTeamInfoService.save(ActivityTeamInfoAddModel.addReqBuild(activityTeamInfoSaveReq));
         return Result.success();
diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java
index fc4f871..a65de9e 100644
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java
@@ -98,8 +98,10 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
 
 
         return ActivityTeamFindByIdModel.findByIdModel(activityTeamInfo,
-                activityTeamProductSkuInfoModels.stream().map(
-                        activityTeamProductSkuIdModel -> TeamInfoProductSkuIdByIdResp.buildModel(activityTeamProductSkuIdModel)
+                activityTeamProductSkuInfoModels
+                        .stream()
+                        .map(activityTeamProductSkuIdModel ->
+                                TeamInfoProductSkuIdByIdResp.buildModel(activityTeamProductSkuIdModel)
                 ).collect(Collectors.toList())
         );