BJ_ZTEITS-Developers / parking-cloud-yudao

Commit c95317577d000af0d17e06944cee92f8ad720505

Authored by puhui999
2 parents f40bd23f ec2c3e50

Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 

# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
Inline Side-by-side
Showing 6 changed files with 50 additions and 48 deletions
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java
  View file @c953175
1 1 package cn.iocoder.yudao.module.promotion.controller.app.combination;
2 2  
3   -import cn.hutool.core.util.ObjectUtil;
4 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
5   -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
6 4 import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.record.AppCombinationRecordDetailRespVO;
7 5 import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.record.AppCombinationRecordRespVO;
8 6 import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.record.AppCombinationRecordSummaryRespVO;
... ... @@ -23,6 +21,7 @@ import javax.annotation.Resource;
23 21 import javax.validation.constraints.Max;
24 22 import java.util.Collections;
25 23 import java.util.List;
  24 +import java.util.Objects;
26 25  
27 26 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
28 27 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
... ... @@ -61,7 +60,7 @@ public class AppCombinationRecordController {
61 60 @Operation(summary = "获得最近 n 条拼团记录（团长发起的）")
62 61 @Parameters({
63 62 @Parameter(name = "activityId", description = "拼团活动编号"),
64   - @Parameter(name = "status", description = "状态"),
  63 + @Parameter(name = "status", description = "拼团状态"), // 对应 CombinationRecordStatusEnum 枚举
65 64 @Parameter(name = "count", description = "数量")
66 65 })
67 66 public CommonResult<List<AppCombinationRecordRespVO>> getHeadCombinationRecordList(
... ... @@ -69,44 +68,37 @@ public class AppCombinationRecordController {
69 68 @RequestParam("status") Integer status,
70 69 @RequestParam(value = "count", defaultValue = "20") @Max(20) Integer count) {
71 70 return success(CombinationActivityConvert.INSTANCE.convertList3(
72   - combinationRecordService.getCombinationRecordListWithHead(activityId, status, count)));
  71 + combinationRecordService.getHeadCombinationRecordList(activityId, status, count)));
73 72 }
74 73  
75 74 @GetMapping("/get-detail")
76 75 @Operation(summary = "获得拼团记录明细")
77 76 @Parameter(name = "id", description = "拼团记录编号", required = true, example = "1024")
78 77 public CommonResult<AppCombinationRecordDetailRespVO> getCombinationRecordDetail(@RequestParam("id") Long id) {
79   - // 1、查询这条记录
  78 + // 1. 查找这条拼团记录
80 79 CombinationRecordDO record = combinationRecordService.getCombinationRecordById(id);
81 80 if (record == null) {
82 81 return success(null);
83 82 }
84 83  
85   - AppCombinationRecordDetailRespVO detail = new AppCombinationRecordDetailRespVO();
86   - List<CombinationRecordDO> records;
87   - // 2、判断是否为团长
88   - if (record.getHeadId() == null) {
89   - detail.setHeadRecord(CombinationActivityConvert.INSTANCE.convert(record));
90   - // 2.1、查找团员拼团记录
91   - records = combinationRecordService.getCombinationRecordListByHeadId(record.getId());
92   - } else {
93   - // 2.2、查找团长拼团记录
94   - CombinationRecordDO headRecord = combinationRecordService.getCombinationRecordById(record.getHeadId());
95   - if (headRecord == null) {
96   - return success(null);
97   - }
98   -
99   - detail.setHeadRecord(CombinationActivityConvert.INSTANCE.convert(headRecord));
100   - // 2.3、查找团员拼团记录
101   - records = combinationRecordService.getCombinationRecordListByHeadId(headRecord.getId());
102   -
  84 + // 2. 查找该拼团的参团记录
  85 + CombinationRecordDO headRecord;
  86 + List<CombinationRecordDO> memberRecords;
  87 + if (Objects.equals(record.getHeadId(), CombinationRecordDO.HEAD_ID_GROUP)) { // 情况一：团长
  88 + headRecord = record;
  89 + memberRecords = combinationRecordService.getCombinationRecordListByHeadId(record.getId());
  90 + } else { // 情况二：团员
  91 + headRecord = combinationRecordService.getCombinationRecordById(record.getHeadId());
  92 + memberRecords = combinationRecordService.getCombinationRecordListByHeadId(headRecord.getId());
103 93 }
104   - detail.setMemberRecords(CombinationActivityConvert.INSTANCE.convertList3(records));
105 94  
106   - // 3、获取当前用户参团记录订单编号
107   - CombinationRecordDO userRecord = CollectionUtils.findFirst(records, r -> ObjectUtil.equal(r.getUserId(), getLoginUserId()));
108   - detail.setOrderId(userRecord == null ? null : userRecord.getOrderId()); // 如果没参团，返回 null
109   - return success(detail);
  95 + // 3. 拼接数据
  96 + return success(CombinationActivityConvert.INSTANCE.convert(getLoginUserId(), headRecord, memberRecords));
110 97 }
111 98  
  99 + // TODO @puhui：新增一个取消拼团的接口，cancel
  100 + // 1. 需要先校验拼团记录未完成；
  101 + // 2. 在 Order 那增加一个 cancelPaidOrder 接口，用于取消已支付的订单
  102 + // 3. order 完成后，取消拼团记录。另外，如果它是团长，则顺序（下单时间）继承
  103 +
112 104 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java
  View file @c953175
1 1 package cn.iocoder.yudao.module.promotion.convert.combination;
2 2  
  3 +import cn.hutool.core.util.ObjectUtil;
3 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 5 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
5 6 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
... ... @@ -16,6 +17,7 @@ import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.product
16 17 import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.recrod.CombinationRecordRespVO;
17 18 import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.activity.AppCombinationActivityDetailRespVO;
18 19 import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.activity.AppCombinationActivityRespVO;
  20 +import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.record.AppCombinationRecordDetailRespVO;
19 21 import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.record.AppCombinationRecordRespVO;
20 22 import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationActivityDO;
21 23 import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationProductDO;
... ... @@ -168,4 +170,16 @@ public interface CombinationActivityConvert {
168 170  
169 171 PageResult<CombinationRecordRespVO> convert(PageResult<CombinationRecordDO> result);
170 172  
  173 + default AppCombinationRecordDetailRespVO convert(Long userId, CombinationRecordDO headRecord, List<CombinationRecordDO> memberRecords) {
  174 + AppCombinationRecordDetailRespVO respVO = new AppCombinationRecordDetailRespVO()
  175 + .setHeadRecord(convert(headRecord)).setMemberRecords(convertList3(memberRecords));
  176 + // 处理自己参与拼团的 orderId
  177 + CombinationRecordDO userRecord = CollectionUtils.findFirst(memberRecords, r -> ObjectUtil.equal(r.getUserId(), userId));
  178 + if (userRecord == null && ObjectUtil.equal(headRecord.getUserId(), userId)) {
  179 + userRecord = headRecord;
  180 + }
  181 + respVO.setOrderId(userRecord == null ? null : userRecord.getOrderId());
  182 + return respVO;
  183 + }
  184 +
171 185 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/combination/CombinationRecordDO.java
  View file @c953175
... ... @@ -31,7 +31,7 @@ public class CombinationRecordDO extends BaseDO {
31 31 /**
32 32 * 团长编号 - 团长
33 33 */
34   - public static final Integer HEAD_ID_GROUP = 0;
  34 + public static final Long HEAD_ID_GROUP = 0L;
35 35  
36 36 /**
37 37 * 编号，主键自增
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationRecordMapper.java
  View file @c953175
... ... @@ -81,25 +81,18 @@ public interface CombinationRecordMapper extends BaseMapperX&lt;CombinationRecordDO
81 81 .last("LIMIT " + count));
82 82 }
83 83  
84   - /**
85   - * 获得最近 count 条拼团记录（团长发起的）
86   - *
87   - * @param activityId 拼团活动编号
88   - * @param status 记录状态
89   - * @param count 数量
90   - * @return 拼团记录列表
91   - */
92   - default List<CombinationRecordDO> selectList(Long activityId, Integer status, Integer count) {
  84 + default List<CombinationRecordDO> selectListByActivityIdAndStatusAndHeadId(Long activityId, Integer status,
  85 + Long headId, Integer count) {
93 86 return selectList(new LambdaQueryWrapperX<CombinationRecordDO>()
94   - .eqIfPresent(CombinationRecordDO::getActivityId, activityId)
95   - .eqIfPresent(CombinationRecordDO::getStatus, status)
96   - .eq(CombinationRecordDO::getHeadId, null) // TODO 团长的 headId 是不是 null 还是自己的记录编号来着？
97   - .orderByDesc(CombinationRecordDO::getCreateTime)
  87 + .eq(CombinationRecordDO::getActivityId, activityId)
  88 + .eq(CombinationRecordDO::getStatus, status)
  89 + .eq(CombinationRecordDO::getHeadId, headId)
  90 + .orderByDesc(CombinationRecordDO::getId)
98 91 .last("LIMIT " + count));
99 92 }
100 93  
101 94 default Map<Long, Integer> selectCombinationRecordCountMapByActivityIdAndStatusAndHeadId(Collection<Long> activityIds,
102   - Integer status, Integer headId) {
  95 + Integer status, Long headId) {
103 96 // SQL count 查询
104 97 List<Map<String, Object>> result = selectMaps(new QueryWrapper<CombinationRecordDO>()
105 98 .select("COUNT(DISTINCT(user_id)) AS recordCount, activity_id AS activityId")
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordService.java
  View file @c953175
... ... @@ -139,7 +139,7 @@ public interface CombinationRecordService {
139 139 * @param count 数量
140 140 * @return 拼团记录列表
141 141 */
142   - List<CombinationRecordDO> getCombinationRecordListWithHead(Long activityId, Integer status, Integer count);
  142 + List<CombinationRecordDO> getHeadCombinationRecordList(Long activityId, Integer status, Integer count);
143 143  
144 144 /**
145 145 * 获取指定编号的拼团记录
... ... @@ -175,6 +175,6 @@ public interface CombinationRecordService {
175 175 */
176 176 Map<Long, Integer> getCombinationRecordCountMapByActivity(Collection<Long> activityIds,
177 177 @Nullable Integer status,
178   - @Nullable Integer headId);
  178 + @Nullable Long headId);
179 179  
180 180 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
  View file @c953175
... ... @@ -216,6 +216,8 @@ public class CombinationRecordServiceImpl implements CombinationRecordService {
216 216 ProductSpuRespDTO spu = productSpuApi.getSpu(reqDTO.getSpuId());
217 217 ProductSkuRespDTO sku = productSkuApi.getSku(reqDTO.getSkuId());
218 218 recordMapper.insert(CombinationActivityConvert.INSTANCE.convert(reqDTO, keyValue.getKey(), user, spu, sku));
  219 + // TODO @puhui999：status 未设置；headId 未设置
  220 + recordMapper.insert(CombinationActivityConvert.INSTANCE.convert(reqDTO, activity, user, spu, sku));
219 221 }
220 222  
221 223 @Override
... ... @@ -263,8 +265,9 @@ public class CombinationRecordServiceImpl implements CombinationRecordService {
263 265 }
264 266  
265 267 @Override
266   - public List<CombinationRecordDO> getCombinationRecordListWithHead(Long activityId, Integer status, Integer count) {
267   - return recordMapper.selectList(activityId, status, count);
  268 + public List<CombinationRecordDO> getHeadCombinationRecordList(Long activityId, Integer status, Integer count) {
  269 + return recordMapper.selectListByActivityIdAndStatusAndHeadId(activityId, status,
  270 + CombinationRecordDO.HEAD_ID_GROUP, count);
268 271 }
269 272  
270 273 @Override
... ... @@ -284,7 +287,7 @@ public class CombinationRecordServiceImpl implements CombinationRecordService {
284 287  
285 288 @Override
286 289 public Map<Long, Integer> getCombinationRecordCountMapByActivity(Collection<Long> activityIds,
287   - @Nullable Integer status, @Nullable Integer headId) {
  290 + @Nullable Integer status, @Nullable Long headId) {
288 291 return recordMapper.selectCombinationRecordCountMapByActivityIdAndStatusAndHeadId(activityIds, status, headId);
289 292 }
290 293  
... ...