fit(): 增加规格修改功能

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.muyu.common.core.web.domain.BaseEntity;
 import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel;
+import com.muyu.marketing.domain.model.ActivityTeamInfoModel;
 import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel;
 import com.muyu.marketing.domain.model.ActivityTeamProductSkuModel;
 import lombok.*;
@@ -97,4 +98,21 @@ public class ActivityTeamInfo extends BaseEntity {
             .strategyId(activityTeamInfoAddModel.getStrategyId())
             .build();
   }
+
+  public static ActivityTeamInfo addTeamInfoModelBuild(ActivityTeamInfoModel activityTeamInfoModel) {
+    return ActivityTeamInfo.builder()
+            .name(activityTeamInfoModel.getName())
+            .productId(activityTeamInfoModel.getProductId())
+            .productImage(activityTeamInfoModel.getProductImage())
+            .introduction(activityTeamInfoModel.getIntroduction())
+            .unit(activityTeamInfoModel.getUnit())
+            .imageList(activityTeamInfoModel.getImageList())
+            .endTime(activityTeamInfoModel.getEndTime())
+            .sort(activityTeamInfoModel.getSort())
+            .content(activityTeamInfoModel.getContent())
+            .status(activityTeamInfoModel.getStatus())
+            .strategyType(activityTeamInfoModel.getStrategyType())
+            .strategyId(activityTeamInfoModel.getStrategyId())
+            .build();
+  }
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.muyu.common.core.web.domain.BaseEntity;
 import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel;
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuModel;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
@@ -48,6 +49,7 @@ public class ActivityTeamProductSkuInfo extends BaseEntity {
    */
   private BigDecimal teamPrice;
 
+
   /**
    * 通过模型钢构件对象
    * @param activityTeamProductSkuAddModel 模型
@@ -62,4 +64,12 @@ public class ActivityTeamProductSkuInfo extends BaseEntity {
             .teamPrice(activityTeamProductSkuAddModel.getTeamPrice())
             .build();
   }
+
+  public static ActivityTeamProductSkuInfo skuUpdModel(ActivityTeamProductSkuModel activityTeamProductSkuModel) {
+    return ActivityTeamProductSkuInfo.builder()
+            .id(activityTeamProductSkuModel.getId())
+            .teamStock(activityTeamProductSkuModel.getTeamStock())
+            .teamPrice(activityTeamProductSkuModel.getTeamPrice())
+            .build();
+  }
 }

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

@@ -15,7 +15,7 @@ import java.util.function.Supplier;
 /**
  * 团购活动添加模型
  *
- * @author DongZeLiang
+ * @author
  * @date 2024-11-26 09:38
  */
 @Data

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

@@ -7,10 +7,14 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 import java.util.Date;
 import java.util.List;
 
+/**
+ * 团购活动信息模型
+ */
 @Data
 @Builder
 @NoArgsConstructor

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

@@ -12,7 +12,7 @@ import java.util.function.Function;
 
 /**
  * 团购活动雷彪查询结果模型
- * @author DongZeLiang
+ * @author
  * @date 2024-11-20 14:18:10
  */
 @Data

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

@@ -9,7 +9,7 @@ import lombok.experimental.SuperBuilder;
 
 /**
  * 团购活动雷彪查询模型
- * @author DongZeLiang
+ * @author
  * @date 2024-11-20 14:18:10
  */
 @Data

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

@@ -0,0 +1,95 @@
+package com.muyu.marketing.domain.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.muyu.marketing.domain.req.ActivityTeamProductReq;
+import com.muyu.marketing.domain.req.ActivityTeamProductUpdReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+@Data
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityTeamInfoModel {
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    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 ActivityTeamProductUpdModel activityTeamProductUpdModel;
+
+    public static ActivityTeamInfoModel activityTeamBuilder(ActivityTeamProductReq activityTeamProductReq) {
+        return ActivityTeamInfoModel.builder()
+                .id(activityTeamProductReq.getId())
+                .name(activityTeamProductReq.getName())
+                .productId(activityTeamProductReq.getProductId())
+                .productImage(activityTeamProductReq.getProductImage())
+                .introduction(activityTeamProductReq.getIntroduction())
+                .unit(activityTeamProductReq.getUnit())
+                .imageList(activityTeamProductReq.getImageList())
+                .endTime(activityTeamProductReq.getEndTime())
+                .sort(activityTeamProductReq.getSort())
+                .content(activityTeamProductReq.getContent())
+                .status(activityTeamProductReq.getStatus())
+                .strategyType(activityTeamProductReq.getStrategyType())
+                .strategyId(activityTeamProductReq.getProductId())
+                .activityTeamProductUpdModel(ActivityTeamProductUpdModel.teamProductBuilder(activityTeamProductReq.getActivityTeamProductUpdReq()))
+                .build();
+    }
+
+}

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

@@ -15,7 +15,7 @@ import java.util.function.Function;
 
 /**
  * 团购活动Id查询结果模型
- * @author DongZeLiang
+ * @author
  * @date 2024-11-20 14:18:10
  */
 @Data

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

@@ -8,13 +8,12 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
-import java.util.function.Function;
 import java.util.function.Supplier;
 
 /**
  * 团购spu库存添加模型
  *
- * @author DongZeLiang
+ * @author
  * @date 2024-11-26 09:36
  */
 @Data
@@ -56,4 +55,5 @@ public class ActivityTeamProductSkuAddModel {
                 .teamPrice(teamProjectSkuInfoAddReq.getTeamPrice())
                 .build();
     }
+
 }

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

@@ -4,9 +4,13 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 import java.math.BigDecimal;
 
+/**
+ * 团购活动规格模型
+ */
 @Data
 @Builder
 @NoArgsConstructor
@@ -27,7 +31,7 @@ public class ActivityTeamProductSkuModel {
     private Long productId;
 
     /**
-     * 规格SKU
+     * 商品SKU
      */
     private String sku;
 

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

@@ -0,0 +1,36 @@
+package com.muyu.marketing.domain.model;
+
+import com.muyu.marketing.domain.req.ActivityTeamProductUpdReq;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.List;
+
+@Data
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityTeamProductUpdModel {
+    /**
+     * 批量修改商品规格
+     */
+    private List<ActivityTeamProductSkuModel> activityTeamProductSkuUpdModelList;
+    /**
+     * 批量删除商品规格
+     */
+    private List<Long> ids;
+    /**
+     * 批量添加商品规格
+     */
+    private List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList;
+
+    public static ActivityTeamProductUpdModel teamProductBuilder(ActivityTeamProductUpdReq activityTeamProductUpdReq) {
+        return ActivityTeamProductUpdModel.builder()
+                .activityTeamProductSkuUpdModelList(activityTeamProductUpdReq.getActivityTeamProductSkuUpdModelList())
+                .ids(activityTeamProductUpdReq.getIds())
+                .activityTeamProductSkuAddModelList(activityTeamProductUpdReq.getActivityTeamProductSkuAddModelList())
+                .build();
+    }
+}

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

@@ -12,7 +12,7 @@ import java.math.RoundingMode;
 /**
  * 团购商品优惠力度模型
  *
- * @author DongZeLiang
+ * @author
  * @date 2024-11-21 11:57
  */
 @Data

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

@@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
 /**
  * 团购商品库存模型
  *
- * @author DongZeLiang
+ * @author
  * @date 2024-11-21 14:04
  */
 @Data

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

@@ -11,6 +11,9 @@ import lombok.experimental.SuperBuilder;
 
 import java.util.Date;
 import java.util.List;
+
+
+
 @Data
 @SuperBuilder
 @NoArgsConstructor

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

@@ -0,0 +1,77 @@
+package com.muyu.marketing.domain.req;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.muyu.marketing.domain.model.ActivityTeamInfoModel;
+import com.muyu.marketing.domain.model.ActivityTeamProductUpdModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.Date;
+
+@Data
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityTeamProductReq {
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    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 ActivityTeamProductUpdReq activityTeamProductUpdReq;
+
+}

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

@@ -0,0 +1,30 @@
+package com.muyu.marketing.domain.req;
+
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel;
+import com.muyu.marketing.domain.model.ActivityTeamProductSkuModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import java.util.List;
+@Data
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityTeamProductUpdReq {
+    /**
+     * 批量修改商品规格
+     */
+    private List<ActivityTeamProductSkuModel> activityTeamProductSkuUpdModelList;
+    /**
+     * 批量删除商品规格
+     */
+    private List<Long> ids;
+    /**
+     * 批量添加商品规格
+     */
+    private List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList;
+
+
+}

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

@@ -16,7 +16,7 @@ import java.util.List;
 /**
  * 团购活动添加模型
  *
- * @author DongZeLiang
+ * @author
  * @date 2024-11-26 09:38
  */
 @Data

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

@@ -16,7 +16,7 @@ import java.util.function.Supplier;
 /**
  * 团购spu库存添加模型
  *
- * @author DongZeLiang
+ * @author
  * @date 2024-11-26 09:36
  */
 @Data