From 344f380c91820227cdd2394060e00bd4217dddbc Mon Sep 17 00:00:00 2001
From: cui-fubo <14587188+cui-fubo@user.noreply.gitee.com>
Date: Thu, 5 Dec 2024 09:26:59 +0800
Subject: [PATCH] =?UTF-8?q?fax():=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=B9=B6=E8=A1=A5=E5=85=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../team/controller/ActivityTeamInfoController.java    | 10 +++++-----
 .../system/team/service/ActivityTeamInfoService.java   |  8 ++++----
 .../team/service/impl/ActivityTeamInfoServiceImpl.java | 10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/controller/ActivityTeamInfoController.java b/muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/controller/ActivityTeamInfoController.java
index 56a9d30..465af16 100644
--- a/muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/controller/ActivityTeamInfoController.java
+++ b/muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/controller/ActivityTeamInfoController.java
@@ -79,13 +79,13 @@ public class ActivityTeamInfoController {
     }
 
     /**
-     * 根据ID查询详情
-     * @param id 活动I D
-     * @return 活动详情
+     * 根据活动ID查询商品拼团信息
+     * @param id 活动ID
+     * @return 商品拼团信息
      */
-    @GetMapping("/teamList/{id}")
+    @GetMapping("/ActivityTeamList/{id}")
     public Result<List<ActivityTeamInfo>> teamList(@PathVariable("id") Long id){
-        List<ActivityTeamInfo> activityTeamInfoList= activityTeamInfoService.teamList(id);
+        List<ActivityTeamInfo> activityTeamInfoList= activityTeamInfoService.ActivityTeamList(id);
         return Result.success(activityTeamInfoList);
     }
 
diff --git a/muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/service/ActivityTeamInfoService.java b/muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/service/ActivityTeamInfoService.java
index f6652e4..ae991d6 100644
--- a/muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/service/ActivityTeamInfoService.java
+++ b/muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/service/ActivityTeamInfoService.java
@@ -41,11 +41,11 @@ public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
     boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel);
 
     /**
-     * 根据活动ID查询详情
-     * @param id id
-     * @return 查询详情
+     * 根据活动ID查询商品拼团信息
+     * @param id 活动ID
+     * @return 商品拼团信息
      */
-    List<ActivityTeamInfo> teamList(Long id);
+    List<ActivityTeamInfo> ActivityTeamList(Long id);
 }
 
 
diff --git a/muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/service/impl/ActivityTeamInfoServiceImpl.java b/muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/service/impl/ActivityTeamInfoServiceImpl.java
index 567aa4d..1ca2ddf 100644
--- a/muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/service/impl/ActivityTeamInfoServiceImpl.java
+++ b/muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/service/impl/ActivityTeamInfoServiceImpl.java
@@ -83,7 +83,7 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
     public Result<String> save(ActivityTeamInfoSaveReq activityTeamInfoSaveReq) {
         ActivityTeamInfo activityTeamInfo = ActivityTeamInfo.buildModel(activityTeamInfoSaveReq);
         //添加返回主键ID
-        Assert.isTrue(this.save(activityTeamInfo),StringUtils.format("添加商品拼团错误",activityTeamInfoSaveReq));
+        Assert.isTrue(this.save(activityTeamInfo),StringUtils.format("添加商品错误",activityTeamInfoSaveReq));
         List<ActivityInfoSkuAddReq> projectSkuList = activityTeamInfoSaveReq.getTeamProjectSkuInfoAddReqList();
 
         List<ActivityTeamProductSkuInfo> teamProductSkuInfoList = projectSkuList.stream().map(projectSkuModel -> {
@@ -96,7 +96,7 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
                             .teamPrice(projectSkuModel.getTeamPrice())
                             .build();
                 })
-                .filter(Objects::nonNull) // 过滤掉null值
+                .filter(Objects::nonNull)
                 .collect(Collectors.toList());
 
         activityTeamProductSkuInfoService.saveBatch(teamProductSkuInfoList);
@@ -130,12 +130,12 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
     }
 
     /**
-     * 根据ID查询详情
+     * 根据活动ID查询商品拼团信息
      * @param id 活动ID
-     * @return 查询详情
+     * @return 商品拼团信息
      */
     @Override
-    public List<ActivityTeamInfo> teamList(Long id) {
+    public List<ActivityTeamInfo> ActivityTeamList(Long id) {
         LambdaQueryWrapper<ActivityTeamInfo> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ActivityTeamInfo::getId,id);
         List<ActivityTeamInfo> list = this.list(queryWrapper);