2204-11-20 (添加拼团11.24)

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

@@ -10,6 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.sql.Date;
 import java.sql.Timestamp;
+import java.util.function.Function;
 
 /**
  *   拼团 添加 Model
@@ -66,5 +67,4 @@ public class ActivityTeamInfoAddModel {
         return build;
     }
 
-
 }

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

@@ -3,12 +3,16 @@ package com.muyu.marketing.domain.model;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.muyu.common.core.model.QueryModel;
-import lombok.*;
+import com.muyu.marketing.domain.ActivityTeamInfo;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
-
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.function.Function;
 
 /**
  * 团购活动 列表查询 结果模型
@@ -58,4 +62,14 @@ public class ActivityTeamInfoListModel extends QueryModel<ActivityTeamInfoListMo
      * 拼团库存
      */
     private Long teamStock;
+    public static ActivityTeamInfoListModel infoBuild(ActivityTeamInfo activityTeamInfo, Function<ActivityTeamInfoListModelBuilder , ActivityTeamInfoListModel> function){
+        return function.apply(
+                ActivityTeamInfoListModel.builder()
+                        .id(activityTeamInfo.getId())
+                        .name(activityTeamInfo.getName())
+                        .endTime(activityTeamInfo.getEndTime())
+                        .productImage(activityTeamInfo.getProductImage())
+                        .status(activityTeamInfo.getStatus())
+        );
+    }
 }

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

@@ -0,0 +1,27 @@
+package com.muyu.marketing.domain.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *  商品库存
+ * @author: CuiFu Bo
+ * @create: 2024-11-21 16:54
+ **/
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class TeamProductStockModel {
+    /**
+     * 团购库存
+     */
+    private Long teamStock;
+    /**
+     * 剩余库存
+     */
+    private Long remainStock;
+}

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

@@ -3,5 +3,6 @@ package com.muyu.marketing.service;
 import com.muyu.marketing.domain.model.TeamProductDiscountPriceModel;
 
 public interface ActivityTeamProductSkuInfoService {
+    /** 商品优惠*/
     public TeamProductDiscountPriceModel getDiscountPrice(Long teamId);
 }

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

@@ -38,7 +38,7 @@ implements ActivityTeamInfoService {
     @Autowired
     private ActivityTeamProductSkuInfoMapper activityTeamProductSkuInfoMapper;
     @Autowired
-    private ActivityTeamProductSkuInfoService activityTeamProductSkuInfoService;
+    private ActivityTeamProductSkuInfoServiceImpl activityTeamProductSkuInfoService;
     /**
      * 团购活动列表
      */
@@ -46,13 +46,8 @@ implements ActivityTeamInfoService {
     public TableDataInfo<ActivityTeamInfoListModel> tabDateInfo(ActivityTeamInfoListQueryModel teamInfoListQueryModel) {
 
         LambdaQueryWrapper<ActivityTeamInfo> queryWrapper = new LambdaQueryWrapper<>();
-        if (StringUtils.isNotEmpty(teamInfoListQueryModel.getName()) ){
-            queryWrapper.like(StringUtils.isNotEmpty(teamInfoListQueryModel.getName()),ActivityTeamInfo::getName,teamInfoListQueryModel.getName());
-        }
-        if (StringUtils.isNotEmpty(teamInfoListQueryModel.getStatus()) ){
-            queryWrapper.like(StringUtils.isNotEmpty(teamInfoListQueryModel.getStatus()),ActivityTeamInfo::getStatus,teamInfoListQueryModel.getStatus());
-        }
-
+        queryWrapper.like(StringUtils.isNotEmpty(teamInfoListQueryModel.getName()),ActivityTeamInfo::getName,teamInfoListQueryModel.getName());
+        queryWrapper.like(StringUtils.isNotEmpty(teamInfoListQueryModel.getStatus()),ActivityTeamInfo::getStatus,teamInfoListQueryModel.getStatus());
 
         Page<ActivityTeamInfo> activityTeamInfoPage = this.page(teamInfoListQueryModel.buildPage(), queryWrapper);
         List<ActivityTeamInfo> activityTeamInfoList = activityTeamInfoPage.getRecords();
@@ -103,12 +98,12 @@ implements ActivityTeamInfoService {
             Long goodsId = activityTeamInfo.getProductId();
             List<AddProjectSkuListReq> skuList = activityTeamInfoReq.getProjectSkuList();
 
+            ArrayList<ActivityTeamProductSkuInfo> infoArrayList = new ArrayList<>();
             skuList.forEach(skuInfo->{
-                ActivityTeamProductSkuInfoModel.saveModelBuild(projectId,goodsId,skuInfo);
+                ActivityTeamProductSkuInfo activityTeamProductSkuInfo = ActivityTeamProductSkuInfoModel.saveModelBuild(projectId, goodsId, skuInfo);
+                infoArrayList.add(activityTeamProductSkuInfo);
             });
-
-
-
+            activityTeamProductSkuInfoService.saveBatch(infoArrayList);
         }
 
 

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

@@ -23,6 +23,11 @@ implements ActivityTeamProductSkuInfoService {
 
     private ProjectSkuCache projectSkuCache;
 
+    /**
+     * 商品优惠
+     * @param teamId
+     * @return
+     */
     @Override //
     public TeamProductDiscountPriceModel getDiscountPrice(Long teamId) {
         LambdaQueryWrapper<ActivityTeamProductSkuInfo> queryWrapper = new LambdaQueryWrapper<>();