fix():营销团购活动的修改

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityProductUpdReq.java

@@ -0,0 +1,75 @@
+package com.muyu.marketing.domain.req;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.marketing.domain.resp.ActivityProductUpdResp;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ActivityProductUpdReq {
+    /**
+     * 活动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 Long sort;
+    /**
+     * 商品SkU
+     */
+    private ActivityProductUpdResp activityProductUpdResp;
+    /**
+     * 活动详情
+     */
+    private String content;
+    /**
+     * 活动状态
+     */
+    private String status;
+    /**
+     * 策略类型
+     */
+    private String strategyType;
+    /**
+     * 策略ID
+     */
+    private Long strategyId;
+}

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java

@@ -6,6 +6,7 @@ import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.marketing.domain.model.ActivityProductUpdModel;
 import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel;
 import com.muyu.marketing.domain.model.ActivityTeamInfoListModel;
+import com.muyu.marketing.domain.req.ActivityProductUpdReq;
 import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq;
 import com.muyu.marketing.domain.req.TeamInfoListReq;
 import com.muyu.marketing.domain.resp.ActivityTeamInfoDetailResp;
@@ -68,8 +69,8 @@ public class ActivityTeamController {
      * 营销活动的修改
      */
     @PutMapping("update")
-    public Result<String> update(@RequestBody ActivityProductUpdModel activityProductUpdModel){
+    public Result<String> update(@RequestBody ActivityProductUpdReq activityProductUpdReq){
-        activityTeamInfoService.edit(activityProductUpdModel);
+        activityTeamInfoService.edit(activityProductUpdReq);
         return Result.success();
     }
 }

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java

@@ -7,6 +7,7 @@ import com.muyu.marketing.domain.model.ActivityProductUpdModel;
 import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel;
 import com.muyu.marketing.domain.model.ActivityTeamInfoListModel;
 import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel;
+import com.muyu.marketing.domain.req.ActivityProductUpdReq;
 import com.muyu.marketing.domain.resp.ActivityTeamInfoDetailResp;
 
 import java.util.List;
@@ -35,7 +36,7 @@ public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
 
     /**
      * 修改团购活动信息
-     * @param activityProductUpdModel
+     * @param activityProductUpdReq
      */
-    void edit(ActivityProductUpdModel activityProductUpdModel);
+    void edit(ActivityProductUpdReq activityProductUpdReq);
 }

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java

@@ -10,6 +10,7 @@ import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.marketing.domain.ActivityTeamInfo;
 import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
 import com.muyu.marketing.domain.model.*;
+import com.muyu.marketing.domain.req.ActivityProductUpdReq;
 import com.muyu.marketing.domain.resp.ActivityProductUpdResp;
 import com.muyu.marketing.domain.resp.ActivityTeamInfoDetailResp;
 import com.muyu.marketing.domain.resp.ActivityTeamProductSkuResp;
@@ -135,13 +136,13 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
 
     /**
      * 修改团购活动信息
-     * @param activityProductUpdModel
+     * @param activityProductUpdReq
      */
     @Transactional
     @Override
-    public void edit(ActivityProductUpdModel activityProductUpdModel) {
+    public void edit(ActivityProductUpdReq activityProductUpdReq) {
         //获取活动商品SKU
-        ActivityProductUpdResp activityProductUpdResp = activityProductUpdModel.getActivityProductUpdResp();
+        ActivityProductUpdResp activityProductUpdResp = activityProductUpdReq.getActivityProductUpdResp();
         //获取需要删除的SKU集合
         List<Long> deleteSkuIdList = activityProductUpdResp.getDeleteSkuIdList();
         //判断是否为空