From 10368d9a9ddeac74532ebf39f0b903c031ee544b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B2=B3=E5=B9=B3?=
 <14767849+liuehping@user.noreply.gitee.com>
Date: Wed, 27 Nov 2024 11:40:53 +0800
Subject: [PATCH] =?UTF-8?q?feat():=E8=90=A5=E9=94=80=E5=9B=A2=E8=B4=AD?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=9A=84=E6=B7=BB=E5=8A=A0=E5=92=8C=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=9A=84=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/团购修改的数据结构.java                   | 25 +++++++++++++++++++
 .../resp/ActivityTeamProductSkuResp.java      |  2 +-
 .../ActivityTeamProductSkuController.java     |  8 +-----
 .../impl/ActivityTeamInfoServiceImpl.java     |  3 +--
 4 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 doc/团购修改的数据结构.java

diff --git a/doc/团购修改的数据结构.java b/doc/团购修改的数据结构.java
new file mode 100644
index 0000000..5ac22ec
--- /dev/null
+++ b/doc/团购修改的数据结构.java
@@ -0,0 +1,25 @@
+{
+        "团购活动id":"Long"
+        "商品ID":"Long",
+        "活动名称":"String",
+        "活动简介":"String",
+        "商品图片":"String",
+        "商品单位":"String",
+        "商品的轮播图":[
+        "String","String"
+        ],
+        "活动时间":"date",
+        "策略类型":"String",
+        "策略ID":"Long",
+        "商品规格List":[
+        {
+        "规格id":"Long",
+        "规格SKU":"String",
+        "拼团价格":"BigDecimal",
+        "拼团库存":"Long"
+        }
+        ],
+        "状态":"String",
+        "排序":"Integer",
+        "详情":"String"
+}
\ No newline at end of file
diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamProductSkuResp.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamProductSkuResp.java
index 83892fd..1681f18 100644
--- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamProductSkuResp.java
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamProductSkuResp.java
@@ -14,7 +14,7 @@ public class ActivityTeamProductSkuResp {
     /**
      * 规格id
      */
-    private Long id;
+    private Long ProductId;
 
     /**
      * 规格SKU
diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamProductSkuController.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamProductSkuController.java
index ebc917e..ef87840 100644
--- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamProductSkuController.java
+++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamProductSkuController.java
@@ -18,11 +18,5 @@ public class ActivityTeamProductSkuController {
     @Autowired
     private ActivityTeamProductSkuInfoService activityTeamProductSkuInfoService;
 
-    /**
-     * 回显
-     */
-    @GetMapping("getById/{teamId}")
-    public Result<List<ActivityProductSkuListModel>> getById(@PathVariable Long teamId){
-        return Result.success(activityTeamProductSkuInfoService.getTeamProductSkuInfoListByTeamId(teamId));
-    }
+
 }
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 383c874..5b4df78 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
@@ -106,7 +106,6 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
         ActivityTeamInfo activityTeamInfo = getById(teamId);
         //封装活动详情
         ActivityTeamInfoDetailResp activityTeamInfoDetailResp = new ActivityTeamInfoDetailResp();
-        List<ActivityTeamProductSkuResp> activityTeamProductSkuList = activityTeamInfoDetailResp.getActivityTeamProductSkuList();
         //根据活动id查询活动商品SKU集合
         List<ActivityProductSkuListModel> teamProductSkuInfoList = activityTeamProductSkuInfoService.getTeamProductSkuInfoListByTeamId(teamId);
         if (teamProductSkuInfoList != null) {
@@ -119,7 +118,7 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
                 //添加到集合中
                 activityProductSkuList.add(
                         ActivityTeamProductSkuResp.builder()
-                                .id(activityTeamProductSkuInfo.getId())
+                                .ProductId(activityTeamProductSkuInfo.getProductId())
                                 .sku(activityTeamProductSkuInfo.getProductSku())
                                 .teamPrice(activityTeamProductSkuInfo.getTeamPrice())
                                 .teamStock(activityTeamProductSkuInfo.getTeamStock())