diff --git a/doc/策略.md b/doc/策略.md new file mode 100644 index 0000000..9374a85 --- /dev/null +++ b/doc/策略.md @@ -0,0 +1,21 @@ +# 功能划分 +## 查看商品列表 + 获取商品列表 +## 选择团购信息 + 获取团购列表 +## 选择商品以及规格 + 根据商品id查询规格列表 + 选择商品规格信息 +## 加入团购 + 填写拼团信息 + 将拼团信息添加到团购执行表中 +## 完成付款 + 付款接口 + + +### 商品详情页面 + 1.商品详情 + 2.商品评论 + 3.商品商品规格 + 4.商品详情 + diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemption.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemption.java index 4c4190f..a9ee90b 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemption.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/TeamStrategyExemption.java @@ -7,12 +7,15 @@ import com.muyu.common.core.web.domain.BaseEntity; import lombok.*; import lombok.experimental.SuperBuilder; +/** + * @author zhuyufeng + */ @Data @SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@TableName(value = "team_strategy_exemption", autoResultMap = true) +@TableName(value = "team_strategy_exemption_free", autoResultMap = true) public class TeamStrategyExemption extends BaseEntity { /** diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListModel.java index d717000..820e952 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListModel.java @@ -31,6 +31,8 @@ public class ActivityTeamInfoListModel { * 拼团名称 */ private String name; + + private Long productId; /** * 参团人数 */ @@ -79,6 +81,7 @@ public class ActivityTeamInfoListModel { ActivityTeamInfoListModel activityTeamInfoListModel = ActivityTeamInfoListModel.builder() .id(activityTeamInfo.getId()) .name(activityTeamInfo.getName()) + .productId(activityTeamInfo.getProductId()) // .openTeamNumber(teamOpenTypeNumber) // .addTeamNumber(teamInTypeNumber) // .attendNumber(teamOpenTypeNumber + teamInTypeNumber) @@ -94,6 +97,7 @@ public class ActivityTeamInfoListModel { ActivityTeamInfoListModel.builder() .id(activityTeamInfo.getId()) .name(activityTeamInfo.getName()) + .productId(activityTeamInfo.getProductId()) .endTime(activityTeamInfo.getEndTime()) .productImage(activityTeamInfo.getProductImage()) .status(activityTeamInfo.getStatus()) diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoListResp.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoListResp.java index 687a85c..b596013 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoListResp.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoListResp.java @@ -27,6 +27,8 @@ public class TeamInfoListResp { */ private String name; + private Long productId; + /** * 参团人数 */ @@ -79,6 +81,7 @@ public class TeamInfoListResp { return TeamInfoListResp.builder() .id(activityTeamInfoListModel.getId()) .name(activityTeamInfoListModel.getName()) + .productId(activityTeamInfoListModel.getProductId()) .openTeamNumber(activityTeamInfoListModel.getOpenTeamNumber()) .addTeamNumber(activityTeamInfoListModel.getAddTeamNumber()) .addTeamNumber(activityTeamInfoListModel.getAddTeamNumber()) diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java index d41b70c..e1faae3 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java @@ -1,6 +1,7 @@ package com.muyu.marketing.team.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.marketing.domain.ActivityTeamInfo; @@ -45,12 +46,11 @@ public class ActivityTeamController { return Result.success( new TableDataInfo<>() {{ setRows(respList); - setTotal(tableDataInfo.getTotal()); + setTotal(respList.size()); }} ); } - /** * 添加团购活动 * @@ -79,4 +79,16 @@ public class ActivityTeamController { activityTeamInfoService.update(ActivityTeamInfoUpdModel.activityTeamInfoUpdReqModelBuild(activityTeamInfoUpdReq)); return Result.success(); } + + /** + * 根据商品ID查询活动列表 + * @param id + * @return + */ + @GetMapping("getTeamListByProductId/{id}") + public Result> getTeamListByProductId(@PathVariable Long id){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ActivityTeamInfo::getProductId,id); + return Result.success(this.activityTeamInfoService.list(queryWrapper)); + } } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionService.java index 2176bc8..97e045b 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionService.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/TeamStrategyExemptionService.java @@ -3,6 +3,11 @@ package com.muyu.marketing.team.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.marketing.domain.TeamStrategyExemption; import com.muyu.marketing.domain.TeamStrategyExemptionHundred; +import com.muyu.marketing.team.strategy.ActivityTeamStrategy; -public interface TeamStrategyExemptionService extends IService { +/** + * @author zhuyufeng + * 免单 + */ +public interface TeamStrategyExemptionService extends ActivityTeamStrategy,IService { } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionHundredServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionHundredServiceImpl.java index 0091d59..73986fa 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionHundredServiceImpl.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionHundredServiceImpl.java @@ -9,8 +9,11 @@ import com.muyu.marketing.team.service.TeamStrategyExemptionHundredService; import com.muyu.marketing.team.service.TeamStrategyExemptionService; import org.springframework.stereotype.Service; +/** + * @author zhuyufeng + */ @Service public class TeamStrategyExemptionHundredServiceImpl extends ServiceImpl implements TeamStrategyExemptionHundredService { - + } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionOrdinaryServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionOrdinaryServiceImpl.java index 5125ec4..e0588e8 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionOrdinaryServiceImpl.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionOrdinaryServiceImpl.java @@ -6,8 +6,11 @@ import com.muyu.marketing.team.mapper.TeamStrategyExemptionOrdinaryMapper; import com.muyu.marketing.team.service.TeamStrategyExemptionOrdinaryService; import org.springframework.stereotype.Service; +/** + * @author zhuyufeng + */ @Service public class TeamStrategyExemptionOrdinaryServiceImpl extends ServiceImpl implements TeamStrategyExemptionOrdinaryService { - + } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionServiceImpl.java index 829f618..eaae29d 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionServiceImpl.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionServiceImpl.java @@ -6,8 +6,35 @@ import com.muyu.marketing.team.mapper.TeamStrategyExemptionMapper; import com.muyu.marketing.team.service.TeamStrategyExemptionService; import org.springframework.stereotype.Service; +/** + * @author zhuyufeng + */ @Service public class TeamStrategyExemptionServiceImpl extends ServiceImpl implements TeamStrategyExemptionService { - + + @Override + public void openTeam(Long activityTeamId) { + + } + + @Override + public void applyTeam(Long teamId) { + + } + + @Override + public void addTeam(Long teamId, String orderNumber) { + + } + + @Override + public void exitTeam(Long teamId) { + + } + + @Override + public void settleTeam(Long teamId) { + + } } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/strategy/ActivityTeamStrategy.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/strategy/ActivityTeamStrategy.java new file mode 100644 index 0000000..ded5b13 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/strategy/ActivityTeamStrategy.java @@ -0,0 +1,45 @@ +package com.muyu.marketing.team.strategy; + +/** + * @Author 夜は眠れるかい? + * @Date 2024/11/29 16:49 + * 好好学习，天天向上 + */ +public interface ActivityTeamStrategy { + + /** + * 开团 + * + * @param activityTeamId 团购活动id + */ + public void openTeam(Long activityTeamId); + + /** + * 申请加团 + * + * @param teamId 团id + */ + public void applyTeam(Long teamId); + + /** + * 参团 + * + * @param teamId 团id + * @param orderNumber 订单编号 + */ + public void addTeam(Long teamId, String orderNumber); + + /** + * 退出团 + * + * @param teamId + */ + public void exitTeam(Long teamId); + + /** + * 结算团 + * + * @param teamId + */ + public void settleTeam(Long teamId); +}