2204A-cyj(回显)

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

@@ -12,6 +12,7 @@ import lombok.NoArgsConstructor;
 
 import java.util.Date;
 import java.util.List;
+import java.util.function.Function;
 
 /**
  * 团购活动查询模型
@@ -67,7 +68,7 @@ public class ActivityTeamInfoSelectModel {
     /**
      * 商品SkU集合
      */
-    private List<TeamProjectSkuInfoResp> teamProjectSkuInfoResp;
+    private List<ActivityTeamProductSkuModel> activityTeamProductSkuModels;
     /**
      * 活动详情
      */
@@ -84,28 +85,28 @@ public class ActivityTeamInfoSelectModel {
      * 策略ID
      */
     private Long strategyId;
+    private Long remainStock;
 
 
     /** 回显 构造 ActivityTeamInfoSelectModel*/
 
-    public static ActivityTeamInfoSelectModel getTeamInfoSelectModel(ActivityTeamInfo activityTeamInfo, List<ActivityTeamProductSkuInfo> list) {
-        return ActivityTeamInfoSelectModel.builder()
-                .teamId(activityTeamInfo.getId())
-                .name(activityTeamInfo.getName())
-                .productId(activityTeamInfo.getProductId())
-                .productImage(activityTeamInfo.getProductImage())
-                .introduction(activityTeamInfo.getIntroduction())
-                .unit(activityTeamInfo.getUnit())
-                .imageList(activityTeamInfo.getImageList())
-                .endTime(activityTeamInfo.getEndTime())
-                .sort(activityTeamInfo.getSort())
-                .teamProjectSkuInfoResp(        list.stream().map(skuInfo ->
-                        TeamProjectSkuInfoResp.getSkuInfoResp(skuInfo)
-                ).toList())
-                .content(activityTeamInfo.getContent())
-                .status(activityTeamInfo.getStatus())
-                .strategyType(activityTeamInfo.getStrategyType())
-                .strategyId(activityTeamInfo.getStrategyId())
-                .build();
+    public static ActivityTeamInfoSelectModel getTeamInfoSelectModel(ActivityTeamInfo activityTeamInfo,
+                                                                     Function<ActivityTeamInfoSelectModel.ActivityTeamInfoSelectModelBuilder, ActivityTeamInfoSelectModel> function) {
+        return function.apply(
+                ActivityTeamInfoSelectModel.builder()
+                        .teamId(activityTeamInfo.getId())
+                        .name(activityTeamInfo.getName())
+                        .productId(activityTeamInfo.getProductId())
+                        .productImage(activityTeamInfo.getProductImage())
+                        .introduction(activityTeamInfo.getIntroduction())
+                        .unit(activityTeamInfo.getUnit())
+                        .imageList(activityTeamInfo.getImageList())
+                        .endTime(activityTeamInfo.getEndTime())
+                        .sort(activityTeamInfo.getSort())
+                        .content(activityTeamInfo.getContent())
+                        .status(activityTeamInfo.getStatus())
+                        .strategyType(activityTeamInfo.getStrategyType())
+                        .strategyId(activityTeamInfo.getStrategyId())
+        );
     }
 }

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

@@ -71,7 +71,7 @@ public class ActivityTeamInfoResp extends BaseEntity {
     /**
      * 商品SkU集合
      */
-    private List<TeamProjectSkuInfoResp> teamProjectSkuInfoResp;
+    private List<ProjectFindSkuInfoResp> projectFindSkuInfoResps;
     /**
      * 活动详情
      */
@@ -90,7 +90,7 @@ public class ActivityTeamInfoResp extends BaseEntity {
     private Long strategyId;
 
     /** 构造ActivityTeamInfoResp  */
-    public static ActivityTeamInfoResp select(ActivityTeamInfoSelectModel teamSelectModel) {
+    public static ActivityTeamInfoResp teamInfoFindByIdBuild(ActivityTeamInfoSelectModel teamSelectModel) {
 
         return ActivityTeamInfoResp.builder()
                 .teamId(teamSelectModel.getTeamId())
@@ -102,13 +102,16 @@ public class ActivityTeamInfoResp extends BaseEntity {
                 .imageList(teamSelectModel.getImageList())
                 .endTime(teamSelectModel.getEndTime())
                 .sort(teamSelectModel.getSort())
-                .teamProjectSkuInfoResp(teamSelectModel.getTeamProjectSkuInfoResp())
+                .projectFindSkuInfoResps(
+                        teamSelectModel.getActivityTeamProductSkuModels()
+                                .stream().map(ProjectFindSkuInfoResp::projectFindSkuInfoBuild).toList())
                 .content(teamSelectModel.getContent())
                 .status(teamSelectModel.getStatus())
                 .strategyType(teamSelectModel.getStrategyType())
                 .strategyId(teamSelectModel.getStrategyId())
                 .build();
     }
+
     /** 构造  */
     public static ActivityTeamInfoResp client(ActivityTeamInfo activityTeamInfo) {
         return ActivityTeamInfoResp.builder()

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

@@ -11,7 +11,7 @@ import lombok.experimental.SuperBuilder;
 import java.math.BigDecimal;
 
 /**
- * 回显resp
+ * 回显 Sku resp
  */
 @Data
 @SuperBuilder

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

@@ -39,11 +39,11 @@ public class ActivityTeamController {
      * 客户端拼团列表
      */
     @PostMapping("/clientList")
-    public Result<List<ActivityTeamInfoResp>> clientList(@RequestBody TeamInfoListReq teamInfoListReq){
+    public Result<PageInfo<ActivityTeamInfoResp>> clientList(@RequestBody TeamInfoListReq teamInfoListReq){
         PageUtils.startPage(teamInfoListReq.getPageNum(),teamInfoListReq.getPageSize());
         List<ActivityTeamInfoResp> activityTeamInfoRespList=activityTeamInfoService.clientList(teamInfoListReq);
         PageInfo<ActivityTeamInfoResp> pageInfo = new PageInfo<>(activityTeamInfoRespList);
-        return Result.success(pageInfo.getList());
+        return Result.success(pageInfo);
 
     }
 
@@ -82,13 +82,9 @@ public class ActivityTeamController {
      * 回显拼团活动
      * @teamId 拼团活动id
      */
-    @GetMapping("/{teamId}")
-    public Result<ActivityTeamInfoResp> getTeamInfo(@PathVariable Long teamId){
-        //调用Service方法 获取回显Model
-        ActivityTeamInfoSelectModel activityTeamInfoSelectModel = activityTeamInfoService.selectTeamInfo(teamId);
-        // 将 回显的Model 构造 成 Resp
-        ActivityTeamInfoResp activityTeamInfoResp = ActivityTeamInfoResp.select(activityTeamInfoSelectModel);
-        return Result.success(activityTeamInfoResp);
+    @GetMapping("/getById/{teamId}")
+    public Result<ActivityTeamInfoResp> getTeamInfo(@PathVariable("teamId") Long teamId){
+        return Result.success(ActivityTeamInfoResp.teamInfoFindByIdBuild(activityTeamInfoService.findDetailById(teamId)));
     }
 
     /** 修改拼团活动*/

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

@@ -30,9 +30,12 @@ public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
     public void save(ActivityTeamInfoAddModel activityTeamInfoAddModel);
 
     /**
-     * 查询拼团活动（回显）
+     * 根据ID查询商品的详情
+     * @param id 团购活动ID
+     * @return 团购详情
      */
-    public ActivityTeamInfoSelectModel selectTeamInfo(Long teamId);
+    ActivityTeamInfoSelectModel findDetailById(Long id);
+//    public ActivityTeamInfoSelectModel selectTeamInfo(Long teamId);
 
     /**
      * 修改活动
@@ -42,4 +45,6 @@ public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
     /** 客户端列表*/
     List<ActivityTeamInfoResp> clientList(TeamInfoListReq teamInfoListReq);
 
+
+
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.marketing.domain.ActivityTeamInfo;
+import com.muyu.marketing.domain.ActivityTeamOpenInfo;
 import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
 import com.muyu.marketing.domain.model.*;
 import com.muyu.marketing.domain.req.TeamInfoListReq;
@@ -91,15 +92,14 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
      * @return
      */
     @Override
-    public ActivityTeamInfoSelectModel selectTeamInfo(Long teamId) {
-        activityTeamOpenInfoService.getById(teamId);
+    public ActivityTeamInfoSelectModel findDetailById(Long teamId) {
         //根据拼团活动id 查询拼团活动
         ActivityTeamInfo activityTeamInfo = this.getById(teamId);
         //查询活动中的 商品sku集合
-        List<ActivityTeamProductSkuInfo> activityTeamProductSkuInfoList = activityTeamProductSkuInfoService.getActivityTeamProductSkuInfoByTeamId(teamId);
-        //构造成 ActivityTeamInfoSelectModel
-        ActivityTeamInfoSelectModel teamInfoSelectModel = ActivityTeamInfoSelectModel.getTeamInfoSelectModel(activityTeamInfo, activityTeamProductSkuInfoList);
-        return teamInfoSelectModel;
+        List<ActivityTeamProductSkuModel> activityTeamProductSkuModelList = activityTeamProductSkuInfoService.findListByTeamId(teamId);
+        return ActivityTeamInfoSelectModel.getTeamInfoSelectModel(activityTeamInfo,
+                (teamInfoFindByIdRespModelBuilder) -> teamInfoFindByIdRespModelBuilder.activityTeamProductSkuModels(activityTeamProductSkuModelList).build()
+        );
     }
 
     /**