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 342b35d..ee2c0ff 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
@@ -3,17 +3,16 @@ package com.muyu.marketing.team.controller;
 
 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.ActivityTeamInfoProductSkuDetailModel;
+import com.muyu.marketing.domain.req.ActivityTeamInfoEditReq;
 import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq;
 import com.muyu.marketing.domain.req.TeamInfoListReq;
+import com.muyu.marketing.domain.resp.ActivityTeamInfoProductSkuDetailResp;
 import com.muyu.marketing.domain.resp.TeamInfoListResp;
 import com.muyu.marketing.team.service.ActivityTeamInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -46,16 +45,29 @@ public class ActivityTeamController {
                 }}
         );
     }
-
-
     /**
      * 添加团购活动
-     * @param activityTeamInfoSaveReq 添加请求对象
-     * @return 结果集
      */
-    @PostMapping
-    public Result<String> save(@RequestBody ActivityTeamInfoSaveReq activityTeamInfoSaveReq) {
-        activityTeamInfoService.save(ActivityTeamInfoAddModel.addReqBuild(activityTeamInfoSaveReq));
+    @PostMapping("/activityTeamInfoAdd")
+    public void activityTeamInfoAdd(@RequestBody ActivityTeamInfoSaveReq activityTeamInfoSaveReq){
+        activityTeamInfoService.save(activityTeamInfoSaveReq.activityTeamInfoReqBuild());
+    }
+    /**
+     * 根据id查询拼团商品信息
+     */
+    @GetMapping("/inquireActivityTeam/{id}")
+    public Result<ActivityTeamInfoProductSkuDetailResp> inquireActivityTeam(@PathVariable("id") Long id){
+        ActivityTeamInfoProductSkuDetailModel detailModel = activityTeamInfoService.echo(id);
+        ActivityTeamInfoProductSkuDetailResp productSkuDetailBuild = ActivityTeamInfoProductSkuDetailResp.productSkuDetailBuild(detailModel);
+        return Result.success(productSkuDetailBuild);
+    }
+    /**
+     *修改团购活动
+     */
+    @PostMapping("/activityTeamEdit")
+    public Result<String> activityTeamEdit(@RequestBody ActivityTeamInfoEditReq activityTeamInfoEditReq){
+        activityTeamInfoService.edit(activityTeamInfoEditReq.activityTeamInfoEditBuild());
         return Result.success();
     }
+
 }