From ec384efbaf18fdfeee49edce421216a6dce82c06 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 14:29:26 +0800
Subject: [PATCH] =?UTF-8?q?fix():=E8=90=A5=E9=94=80=E5=9B=A2=E8=B4=AD?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/团购修改的数据结构.java                   | 25 ------
 .../domain/model/ActivityProductUpdModel.java | 76 +++++++++++++++++++
 .../domain/resp/ActivityProductUpdResp.java   | 29 +++++++
 .../impl/ActivityTeamInfoServiceImpl.java     |  2 -
 4 files changed, 105 insertions(+), 27 deletions(-)
 delete mode 100644 doc/团购修改的数据结构.java
 create mode 100644 muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityProductUpdModel.java
 create mode 100644 muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityProductUpdResp.java

diff --git a/doc/团购修改的数据结构.java b/doc/团购修改的数据结构.java
deleted file mode 100644
index 5ac22ec..0000000
--- a/doc/团购修改的数据结构.java
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-        "团购活动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/model/ActivityProductUpdModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityProductUpdModel.java
new file mode 100644
index 0000000..7c69d8e
--- /dev/null
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityProductUpdModel.java
@@ -0,0 +1,76 @@
+package com.muyu.marketing.domain.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.marketing.domain.resp.ActivityProductUpdResp;
+import com.muyu.marketing.domain.resp.ActivityTeamProductSkuResp;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ActivityProductUpdModel {
+    /**
+     * 活动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 Integer sort;
+    /**
+     * 商品SkU
+     */
+    private ActivityProductUpdResp activityProductUpdResp;
+    /**
+     * 活动详情
+     */
+    private String content;
+    /**
+     * 活动状态
+     */
+    private String status;
+    /**
+     * 策略类型
+     */
+    private String strategyType;
+    /**
+     * 策略ID
+     */
+    private Long strategyId;
+}
diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityProductUpdResp.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityProductUpdResp.java
new file mode 100644
index 0000000..001d355
--- /dev/null
+++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityProductUpdResp.java
@@ -0,0 +1,29 @@
+package com.muyu.marketing.domain.resp;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityProductUpdResp {
+    /**
+     * 商品SkU集合
+     */
+    private List<ActivityTeamProductSkuResp> ActivityTeamProductSkuList;
+
+    /**
+     * 删除商品规格idList
+     */
+    private List<Long> deleteSkuIdList;
+    /**
+     * 添加商品规格的List
+     */
+
+
+
+}
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 5b4df78..e8fce4e 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
@@ -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.exception.ServiceException;
@@ -18,7 +17,6 @@ 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 java.util.ArrayList;