feat: 拼团活动修改

doc/修改数据结构.java

@@ -0,0 +1,27 @@
+$.{
+        "活动ID":"Long",
+        "商品ID": "Long", //activity_team_info.product_id
+        "商品图片": "String",
+        "活动名称": "String",
+        "活动简介": "String",
+        "商品单位": "String",
+        "活动状态":"Long",
+        "商品的轮播图": [
+          "String", "String"
+        ],
+        "活动时间": "date",
+        "策略类型": "String",
+        "策略ID": "Long",
+        "商品规格List": [ // activity_team_product_sku_info
+          {
+              "规格ID":"Long",
+              "规格SKU": "String", // activity_team_product_sku_info.product_sku
+              "拼团价格": "BigDecimal",
+              "拼团库存": "Long",
+              "剩余库存":"Long",
+              "拼团价格":"BigDecimal",
+          }
+        ],
+        "排序": "Integer",
+        "详情": "String"
+}

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

@@ -93,4 +93,22 @@ public class ActivityTeamInfo extends BaseEntity {
             .strategyId(activityTeamInfoAddModel.getStrategyId())
             .build();
   }
+
+  public static ActivityTeamInfo updModelBuild(ActivityTeamInfoAddModel activityTeamInfoAddModel,Long id){
+    return ActivityTeamInfo.builder()
+            .id(id)
+            .name(activityTeamInfoAddModel.getName())
+            .productId(activityTeamInfoAddModel.getProductId())
+            .productImage(activityTeamInfoAddModel.getProductImage())
+            .introduction(activityTeamInfoAddModel.getIntroduction())
+            .unit(activityTeamInfoAddModel.getUnit())
+            .imageList(activityTeamInfoAddModel.getImageList())
+            .endTime(activityTeamInfoAddModel.getEndTime())
+            .sort(activityTeamInfoAddModel.getSort())
+            .content(activityTeamInfoAddModel.getContent())
+            .status(activityTeamInfoAddModel.getStatus())
+            .strategyType(activityTeamInfoAddModel.getStrategyType())
+            .strategyId(activityTeamInfoAddModel.getStrategyId())
+            .build();
+  }
 }

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoUpdModel.java

@@ -0,0 +1,73 @@
+package com.muyu.marketing.domain.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActivityTeamInfoUpdModel {
+    /**
+     * 主键
+     */
+    private long id;
+    /**
+     * 拼团名称
+     */
+    private String name;
+    /**
+     * 商品ID
+     */
+    private long productId;
+    /**
+     * 商品活动图
+     */
+    private String productImage;
+    /**
+     * 活动简介
+     */
+    private String introduction;
+    /**
+     * 单位
+     */
+    private String unit;
+    /**
+     * 轮播图
+     */
+    private String imageList;
+    /**
+     * 活动结束时间
+     */
+    private Date endTime;
+    /**
+     * 活动排序
+     */
+    private long sort;
+    /**
+     * 活动详情
+     */
+    private String content;
+    /**
+     * 活动状态
+     */
+    private String status;
+    /**
+     * 策略类型
+     */
+    private String strategyType;
+    /**
+     * 策略ID
+     */
+    private long strategyId;
+
+    /**
+     * 修改活动规格模型
+     */
+    private ActivityTeamProductSkuInfoUpdModel activityTeamProductSkuInfoUpdModel;
+
+}

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuInfoUpdModel.java

@@ -0,0 +1,17 @@
+package com.muyu.marketing.domain.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.List;
+
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ActivityTeamProductSkuInfoUpdModel {
+
+
+}

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamInfoResponse.java

@@ -1,11 +1,14 @@
 package com.muyu.marketing.domain.resp;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.muyu.marketing.domain.model.ActivityTeamInfoModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
+
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -74,4 +77,26 @@ public class ActivityTeamInfoResponse {
      * 商品SkU集合
      */
     private List<ActivityTeamProductSkuInfoResponse> teamProjectSkuInfoAddReqList;
+
+
+
+
+    public static ActivityTeamInfoResponse ActivityTeamInfoResponseBulider(ActivityTeamInfoModel activityTeamInfoModel, ArrayList<ActivityTeamProductSkuInfoResponse> activityTeamProductSkuInfoResponses){
+       return ActivityTeamInfoResponse.builder()
+                .id(activityTeamInfoModel.getId())
+                .name(activityTeamInfoModel.getName())
+                .productId(activityTeamInfoModel.getProductId())
+                .productImage(activityTeamInfoModel.getProductImage())
+                .introduction(activityTeamInfoModel.getIntroduction())
+                .unit(activityTeamInfoModel.getUnit())
+                .imageList(activityTeamInfoModel.getImageList())
+                .endTime((activityTeamInfoModel.getEndTime()))
+                .sort((int) activityTeamInfoModel.getSort())
+                .status(activityTeamInfoModel.getStatus())
+                .content(activityTeamInfoModel.getContent())
+                .strategyType(activityTeamInfoModel.getStrategyType())
+                .strategyId(activityTeamInfoModel.getStrategyId())
+                .teamProjectSkuInfoAddReqList(activityTeamProductSkuInfoResponses)
+                .build();
+    }
 }

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamProductSkuInfoResponse.java

@@ -2,6 +2,7 @@ package com.muyu.marketing.domain.resp;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuInfoModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -42,4 +43,17 @@ public class ActivityTeamProductSkuInfoResponse {
      */
     private BigDecimal teamPrice;
 
+
+    public static ActivityTeamProductSkuInfoResponse ActivityTeamProductSkuInfoResponseBulider(ActivityTeamProductSkuInfoModel activityTeamProductSkuInfoModel){
+        return ActivityTeamProductSkuInfoResponse.builder()
+                .id(activityTeamProductSkuInfoModel.getId())
+                .productId(activityTeamProductSkuInfoModel.getProductId())
+                .productSku(activityTeamProductSkuInfoModel.getProductSku())
+                .teamStock(activityTeamProductSkuInfoModel.getTeamStock())
+                .remainStock(activityTeamProductSkuInfoModel.getRemainStock())
+                .teamPrice(activityTeamProductSkuInfoModel.getTeamPrice())
+                .build();
+
+    }
+
 }

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

@@ -97,40 +97,17 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
 
         ArrayList<ActivityTeamProductSkuInfoResponse> activityTeamProductSkuInfoResponses = new ArrayList<>();
 
-
         activityTeamInfoModelActivityTeamProductSkuInfoModelList.stream().map(ActivityTeamProductSkuInfoModel->{
-            return activityTeamProductSkuInfoResponses.add(
+            return activityTeamProductSkuInfoResponses.add(ActivityTeamProductSkuInfoResponse.ActivityTeamProductSkuInfoResponseBulider(ActivityTeamProductSkuInfoModel));
-                    ActivityTeamProductSkuInfoResponse.builder()
-                            .id(ActivityTeamProductSkuInfoModel.getId())
-                            .productId(ActivityTeamProductSkuInfoModel.getProductId())
-                            .productSku(ActivityTeamProductSkuInfoModel.getProductSku())
-                            .teamStock(ActivityTeamProductSkuInfoModel.getTeamStock())
-                            .remainStock(ActivityTeamProductSkuInfoModel.getRemainStock())
-                            .teamPrice(ActivityTeamProductSkuInfoModel.getTeamPrice())
-                            .build()
-            );
-
         }).toList();
-        return ActivityTeamInfoResponse.builder()
+        return ActivityTeamInfoResponse.ActivityTeamInfoResponseBulider(activityTeamInfoModel,activityTeamProductSkuInfoResponses);
-                .id(activityTeamInfoModel.getId())
-                .name(activityTeamInfoModel.getName())
-                .productId(activityTeamInfoModel.getProductId())
-                .productImage(activityTeamInfoModel.getProductImage())
-                .introduction(activityTeamInfoModel.getIntroduction())
-                .unit(activityTeamInfoModel.getUnit())
-                .imageList(activityTeamInfoModel.getImageList())
-                .endTime((activityTeamInfoModel.getEndTime()))
-                .sort((int) activityTeamInfoModel.getSort())
-                .status(activityTeamInfoModel.getStatus())
-                .content(activityTeamInfoModel.getContent())
-                .strategyType(activityTeamInfoModel.getStrategyType())
-                .strategyId(activityTeamInfoModel.getStrategyId())
-                .teamProjectSkuInfoAddReqList(activityTeamProductSkuInfoResponses)
-                .build();
     }
 
     @Override
     public void updactivityTeamInfo(ActivityTeamInfoAddModel activityTeamInfoAddModel,Long id) {
+        this.updateById(ActivityTeamInfo.updModelBuild(activityTeamInfoAddModel,id));
+
+
 
     }
 }

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

@@ -87,19 +87,10 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
     @Override
     public List<ActivityTeamProductSkuInfoModel> ActivityTeamProductSkuInfoModelList(Long teamId) {
 
-        LambdaQueryWrapper<ActivityTeamProductSkuInfo> queryWrapper = new LambdaQueryWrapper<>();
+        List<ActivityTeamProductSkuInfo> list = this.list(
-
+                new LambdaQueryWrapper<ActivityTeamProductSkuInfo>().eq(
-        queryWrapper.eq(ActivityTeamProductSkuInfo::getTeamId,teamId);
+                        ActivityTeamProductSkuInfo::getTeamId,teamId));
-
+        return list.stream().map(ActivityTeamProductSkuInfoModel::reqSkuBulider).toList();
-        List<ActivityTeamProductSkuInfo> list = this.list(queryWrapper);
-
-        List<ActivityTeamProductSkuInfoModel> activityTeamProductSkuInfoModelList = list.stream().
-                map(ActivityTeamProductSkuInfo -> {
-                    ActivityTeamProductSkuInfoModel teamProductSkuInfoModel = ActivityTeamProductSkuInfoModel.reqSkuBulider(ActivityTeamProductSkuInfo);
-                    return teamProductSkuInfoModel;
-                }).toList();
-
-        return activityTeamProductSkuInfoModelList;
 
 //        LambdaQueryWrapper<ActivityTeamProductSkuInfo> queryWrapper = new LambdaQueryWrapper<>();
 //        queryWrapper.eq(ActivityTeamProductSkuInfo::getTeamId,teamId);