2204A-cyj(11.27分支)

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.ActivityTeamProductSkuReqModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -69,4 +70,14 @@ public class ActivityTeamProductSkuInfo extends BaseEntity {
             .teamPrice(activityTeamProductSkuAddModel.getTeamPrice())
             .build();
   }
+
+  public static ActivityTeamProductSkuInfo updateModelBuild(ActivityTeamProductSkuReqModel activityTeamProductSkuReqModel) {
+    return ActivityTeamProductSkuInfo.builder()
+            .id(activityTeamProductSkuReqModel.getId())
+            .productId(activityTeamProductSkuReqModel.getProductId())
+            .teamStock(activityTeamProductSkuReqModel.getTeamStock())
+            .productSku(activityTeamProductSkuReqModel.getProductSku())
+            .teamPrice(activityTeamProductSkuReqModel.getTeamPrice())
+            .build();
+  }
 }

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

@@ -1,92 +0,0 @@
-package com.muyu.marketing.domain.model;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @program: 2204a-cloud-server
- * @description: 添加活动模型
- * @author: AoCi Tian
- * @create: 2024-11-26 10:59
- **/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class ActivityTeamInfoSaveModel {
-
-    /**
-     * 拼团名称
-     */
-    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;
-    /**
-     * 活动详情
-     */
-    private String content;
-    /**
-     * 活动状态
-     */
-    private String status;
-    /**
-     * 策略类型
-     */
-    private String strategyType;
-    /**
-     * 策略ID
-     */
-    private Long strategyId;
-    public static ActivityTeamInfoSaveModel activityTeamInfoSaveModelBuild (ActivityTeamInfoAddModel activityTeamInfoAddModel){
-        return ActivityTeamInfoSaveModel.builder()
-                .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/ActivityTeamProductSkuReqModel.java

@@ -8,12 +8,7 @@ import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 
-/**
+
- * @program: 2204a-cloud-server
- * @description: sku修改模型
- * @author: AoCi Tian
- * @create: 2024-11-26 19:45
- **/
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -37,4 +32,5 @@ public class ActivityTeamProductSkuReqModel {
                 .teamPrice(activityTeamProductSkuReq.getTeamPrice())
                 .build();
     }
+
 }

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

@@ -1,107 +0,0 @@
-package com.muyu.marketing.domain.resp;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.muyu.marketing.domain.model.ActivityTeamDetailModel;
-import com.muyu.marketing.domain.req.ProjectSkuInfoAddReq;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @program: 2204a-cloud-server
- * @description: 团购活动回显响应
- * @author: AoCi Tian
- * @create: 2024-11-26 15:19
- **/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class TeamInfoFindByIdResp {
-   /**
-    * 拼团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 List<ProjectFindSkuInfoResp> projectSkuInfoAddList;
-    /**
-     * 活动详情
-     */
-    private String content;
-    /**
-     * 活动状态
-     */
-    private String status;
-    /**
-     * 策略类型
-     */
-    private String strategyType;
-    /**
-     * 策略ID
-     */
-    private Long strategyId;
-
-    public static TeamInfoFindByIdResp teamInfoFindByIdBuild (ActivityTeamDetailModel activityTeamDetailModel){
-     return TeamInfoFindByIdResp.builder()
-              .id(activityTeamDetailModel.getId())
-              .name(activityTeamDetailModel.getName())
-              .productId(activityTeamDetailModel.getProductId())
-              .productImage(activityTeamDetailModel.getProductImage())
-              .introduction(activityTeamDetailModel.getIntroduction())
-              .unit(activityTeamDetailModel.getUnit())
-              .imageList(activityTeamDetailModel.getImageList())
-              .endTime(activityTeamDetailModel.getEndTime())
-              .sort(activityTeamDetailModel.getSort())
-              .projectSkuInfoAddList(activityTeamDetailModel.getProjectSkuInfoAddReqList().stream().map(ProjectFindSkuInfoResp::projectFindSkuInfoBuild).toList())
-//              .projectSkuInfoAddList(
-//                      teamInfoFindByIdRespModel.getProjectSkuInfoAddReqList().stream().map(activityTeamProductSkuModel ->
-//                              ProjectFindSkuInfoResp.projectFindSkuInfoBuild(activityTeamProductSkuModel)).toList()
-//              )
-              .content(activityTeamDetailModel.getContent())
-              .status(activityTeamDetailModel.getStatus())
-              .strategyType(activityTeamDetailModel.getStrategyType())
-              .strategyId(activityTeamDetailModel.getStrategyId())
-              .build();
- }
-}

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

@@ -3,11 +3,11 @@ package com.muyu.marketing.team.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
-import com.muyu.marketing.domain.TeamStrategyExemptionHundred;
 import com.muyu.marketing.domain.model.*;
 
 import java.util.List;
 
+/** 规格SKU*/
 public interface ActivityTeamProductSkuInfoService extends IService<ActivityTeamProductSkuInfo> {
 
     public default List<ActivityTeamProductSkuInfo> getActivityTeamProductSkuInfoByTeamId(Long teamId){
@@ -46,6 +46,7 @@ public interface ActivityTeamProductSkuInfoService extends IService<ActivityTeam
      */
     public List<ActivityTeamProductSkuModel> findListByTeamId(Long teamId);
 
+    /** 修改规格SKU*/
     public boolean updateBath(List<ActivityTeamProductSkuReqModel> activityTeamProductSkuReqModelList);
 
 }

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

@@ -99,7 +99,6 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
         ActivityTeamInfo activityTeamInfo = this.getById(teamId);
         //查询活动中的 商品sku集合
         List<ActivityTeamProductSkuInfo> activityTeamProductSkuInfoList = activityTeamProductSkuInfoService.getActivityTeamProductSkuInfoByTeamId(teamId);
-
         //构造成 ActivityTeamInfoSelectModel
         ActivityTeamInfoSelectModel teamInfoSelectModel = ActivityTeamInfoSelectModel.getTeamInfoSelectModel(activityTeamInfo, activityTeamProductSkuInfoList);
 

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

@@ -20,6 +20,9 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
 
+/**
+ * 规格SKU
+ */
 @Service
 public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityTeamProductSkuInfoMapper, ActivityTeamProductSkuInfo>
     implements ActivityTeamProductSkuInfoService {