java/ruoyi-vue-pro
1
0
Fork 0
mirror of https://github.com/YunaiV/ruoyi-vue-pro.git synced 2025-10-31 02:28:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
This commit is contained in:
puhui999
2023-10-08 17:33:21 +08:00
parent c71bdd158a 8a11ca8126
commit 2e559ebe06
6 changed files with 68 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/collection/CollectionUtils.java
View File

@ -232,7 +232,8 @@ public class CollectionUtils {
return valueFunc.apply(t); return valueFunc.apply(t);
} }
public static <T, V extends Comparable<? super V>> V getSumValue(List<T> from, Function<T, V> valueFunc, BinaryOperator<V> accumulator) { public static <T, V extends Comparable<? super V>> V getSumValue(List<T> from, Function<T, V> valueFunc,
BinaryOperator<V> accumulator) {
if (CollUtil.isEmpty(from)) { if (CollUtil.isEmpty(from)) {
return null; return null;
} }

4
yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/combination/CombinationRecordStatusEnum.java
View File

@ -44,4 +44,8 @@ public enum CombinationRecordStatusEnum implements IntArrayValuable {
return ObjectUtil.equal(status, IN_PROGRESS.getStatus()); return ObjectUtil.equal(status, IN_PROGRESS.getStatus());
} }
public static boolean isFailed(Integer status) {
return ObjectUtil.equal(status, FAILED.getStatus());
}
} }

2
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationRecordMapper.java
View File

@ -35,7 +35,7 @@ public interface CombinationRecordMapper extends BaseMapperX<CombinationRecordDO
* @param headId 团长编号 * @param headId 团长编号
* @return 拼团记录 * @return 拼团记录
*/ */
default CombinationRecordDO selectOneByHeadId(Long headId, Integer status) { default CombinationRecordDO selectByHeadId(Long headId, Integer status) {
return selectOne(new LambdaQueryWrapperX<CombinationRecordDO>() return selectOne(new LambdaQueryWrapperX<CombinationRecordDO>()
.eq(CombinationRecordDO::getId, headId) .eq(CombinationRecordDO::getId, headId)
.eq(CombinationRecordDO::getStatus, status)); .eq(CombinationRecordDO::getStatus, status));

3
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordService.java
View File

@ -42,7 +42,8 @@ public interface CombinationRecordService {
* @param count 数量 * @param count 数量
* @return 拼团信息 * @return 拼团信息
*/ */
KeyValue<CombinationActivityDO, CombinationProductDO> validateCombinationRecord(Long userId, Long activityId, Long headId, Long skuId, Integer count); KeyValue<CombinationActivityDO, CombinationProductDO> validateCombinationRecord(Long userId, Long activityId, Long headId,
Long skuId, Integer count);
/** /**
* 创建拼团记录 * 创建拼团记录

118
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
View File

@ -89,13 +89,13 @@ public class CombinationRecordServiceImpl implements CombinationRecordService {
@Override @Override
public KeyValue<CombinationActivityDO, CombinationProductDO> validateCombinationRecord( public KeyValue<CombinationActivityDO, CombinationProductDO> validateCombinationRecord(
Long userId, Long activityId, Long headId, Long skuId, Integer count) { Long userId, Long activityId, Long headId, Long skuId, Integer count) {
// 1 校验拼团活动是否存在 // 1. 校验拼团活动是否存在
CombinationActivityDO activity = combinationActivityService.validateCombinationActivityExists(activityId); CombinationActivityDO activity = combinationActivityService.validateCombinationActivityExists(activityId);
// 1.1 校验活动是否开启 // 1.1 校验活动是否开启
if (ObjUtil.equal(activity.getStatus(), CommonStatusEnum.DISABLE.getStatus())) { if (ObjUtil.equal(activity.getStatus(), CommonStatusEnum.DISABLE.getStatus())) {
throw exception(COMBINATION_ACTIVITY_STATUS_DISABLE); throw exception(COMBINATION_ACTIVITY_STATUS_DISABLE);
} }
// 1.2、校验活动开始时间 // 1.2. 校验活动开始时间
if (afterNow(activity.getStartTime())) { if (afterNow(activity.getStartTime())) {
throw exception(COMBINATION_RECORD_FAILED_TIME_NOT_START); throw exception(COMBINATION_RECORD_FAILED_TIME_NOT_START);
} }
@ -104,69 +104,67 @@ public class CombinationRecordServiceImpl implements CombinationRecordService {
throw exception(COMBINATION_RECORD_FAILED_SINGLE_LIMIT_COUNT_EXCEED); throw exception(COMBINATION_RECORD_FAILED_SINGLE_LIMIT_COUNT_EXCEED);
} }
// 2、父拼团是否存在,是否已经满了 // 2. 父拼团是否存在,是否已经满了
if (headId != null) { if (headId != null) {
// 2.1、查询进行中的父拼团 // 2.1. 查询进行中的父拼团
CombinationRecordDO record = recordMapper.selectOneByHeadId(headId, CombinationRecordStatusEnum.IN_PROGRESS.getStatus()); CombinationRecordDO record = recordMapper.selectByHeadId(headId, CombinationRecordStatusEnum.IN_PROGRESS.getStatus());
if (record == null) { if (record == null) {
throw exception(COMBINATION_RECORD_HEAD_NOT_EXISTS); throw exception(COMBINATION_RECORD_HEAD_NOT_EXISTS);
} }
// 2.2、校验拼团是否满足要求 // 2.2. 校验拼团是否已满
if (ObjUtil.equal(record.getUserCount(), record.getUserSize())) { if (ObjUtil.equal(record.getUserCount(), record.getUserSize())) {
throw exception(COMBINATION_RECORD_USER_FULL); throw exception(COMBINATION_RECORD_USER_FULL);
} }
// 2.3、校验拼团是否过期（有父拼团的时候只校验父拼团的过期时间） // 2.3 校验拼团是否过期（有父拼团的时候只校验父拼团的过期时间）
if (beforeNow(record.getExpireTime())) { if (beforeNow(record.getExpireTime())) {
throw exception(COMBINATION_RECORD_FAILED_TIME_END); throw exception(COMBINATION_RECORD_FAILED_TIME_END);
} }
} else { } else {
// 3、校验当前活动是否结束(自己是父拼团的时候才校验活动是否结束) // 3. 校验当前活动是否结束(自己是父拼团的时候才校验活动是否结束)
if (beforeNow(activity.getEndTime())) { if (beforeNow(activity.getEndTime())) {
throw exception(COMBINATION_RECORD_FAILED_TIME_END); throw exception(COMBINATION_RECORD_FAILED_TIME_END);
} }
} }
// 4、校验活动商品是否存在 // 4.1 校验活动商品是否存在
CombinationProductDO product = combinationActivityService.selectByActivityIdAndSkuId(activityId, skuId); CombinationProductDO product = combinationActivityService.selectByActivityIdAndSkuId(activityId, skuId);
if (product == null) { if (product == null) {
throw exception(COMBINATION_JOIN_ACTIVITY_PRODUCT_NOT_EXISTS); throw exception(COMBINATION_JOIN_ACTIVITY_PRODUCT_NOT_EXISTS);
} }
// 4.2 校验 sku 是否存在
// 5、校验 sku 是否存在
ProductSkuRespDTO sku = productSkuApi.getSku(skuId); ProductSkuRespDTO sku = productSkuApi.getSku(skuId);
if (sku == null) { if (sku == null) {
throw exception(COMBINATION_JOIN_ACTIVITY_PRODUCT_NOT_EXISTS); throw exception(COMBINATION_JOIN_ACTIVITY_PRODUCT_NOT_EXISTS);
} }
// 5.1、校验库存是否充足 // 4.3 校验库存是否充足
if (count > sku.getStock()) { if (count > sku.getStock()) {
throw exception(COMBINATION_ACTIVITY_UPDATE_STOCK_FAIL); throw exception(COMBINATION_ACTIVITY_UPDATE_STOCK_FAIL);
} }
// 6、校验是否有拼团记录 // 6.1 校验是否有拼团记录
List<CombinationRecordDO> recordList = getCombinationRecordListByUserIdAndActivityId(userId, activityId); List<CombinationRecordDO> recordList = recordMapper.selectListByUserIdAndActivityId(userId, activityId);
if (CollUtil.isEmpty(recordList)) { recordList.removeIf(record -> CombinationRecordStatusEnum.isFailed(record.getStatus())); // 取消的订单，不算数
if (CollUtil.isEmpty(recordList)) { // 如果为空，说明可以参与，直接返回
return new KeyValue<>(activity, product); return new KeyValue<>(activity, product);
} }
// 6.1、校验用户是否有该活动正在进行的拼团 // 6.2 校验用户是否有该活动正在进行的拼团
List<CombinationRecordDO> filtered = filterList(recordList, record -> CombinationRecordStatusEnum.isInProgress(record.getStatus())); CombinationRecordDO inProgressRecord = findFirst(recordList,
if (CollUtil.isNotEmpty(filtered)) { record -> CombinationRecordStatusEnum.isInProgress(record.getStatus()));
if (inProgressRecord != null) {
throw exception(COMBINATION_RECORD_FAILED_HAVE_JOINED); throw exception(COMBINATION_RECORD_FAILED_HAVE_JOINED);
} }
// 6.2、校验是否超出总限购数量 // 6.3 校验是否超出总限购数量
Integer sumValue = getSumValue(convertList(recordList, CombinationRecordDO::getCount, Integer sumValue = getSumValue(recordList, CombinationRecordDO::getCount, Integer::sum);
item -> CombinationRecordStatusEnum.isSuccess(item.getStatus())), i -> i, Integer::sum); if (sumValue != null && sumValue + count > activity.getTotalLimitCount()) {
if ((sumValue + count) > activity.getTotalLimitCount()) {
throw exception(COMBINATION_RECORD_FAILED_TOTAL_LIMIT_COUNT_EXCEED); throw exception(COMBINATION_RECORD_FAILED_TOTAL_LIMIT_COUNT_EXCEED);
} }
return new KeyValue<>(activity, product); return new KeyValue<>(activity, product);
} }
// TODO 芋艿：在详细 review 下；
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void createCombinationRecord(CombinationRecordCreateReqDTO reqDTO) { public void createCombinationRecord(CombinationRecordCreateReqDTO reqDTO) {
// 1、校验拼团活动 // 1. 校验拼团活动
KeyValue<CombinationActivityDO, CombinationProductDO> keyValue = validateCombinationRecord(reqDTO.getUserId(), KeyValue<CombinationActivityDO, CombinationProductDO> keyValue = validateCombinationRecord(reqDTO.getUserId(),
reqDTO.getActivityId(), reqDTO.getHeadId(), reqDTO.getSkuId(), reqDTO.getCount()); reqDTO.getActivityId(), reqDTO.getHeadId(), reqDTO.getSkuId(), reqDTO.getCount());
@ -174,23 +172,25 @@ public class CombinationRecordServiceImpl implements CombinationRecordService {
MemberUserRespDTO user = memberUserApi.getUser(reqDTO.getUserId()); MemberUserRespDTO user = memberUserApi.getUser(reqDTO.getUserId());
ProductSpuRespDTO spu = productSpuApi.getSpu(reqDTO.getSpuId()); ProductSpuRespDTO spu = productSpuApi.getSpu(reqDTO.getSpuId());
ProductSkuRespDTO sku = productSkuApi.getSku(reqDTO.getSkuId()); ProductSkuRespDTO sku = productSkuApi.getSku(reqDTO.getSkuId());
CombinationRecordDO recordDO = CombinationActivityConvert.INSTANCE.convert(reqDTO, keyValue.getKey(), user, spu, sku); CombinationRecordDO record = CombinationActivityConvert.INSTANCE.convert(reqDTO, keyValue.getKey(), user, spu, sku);
recordMapper.insert(recordDO); // TODO @puhui：有 head 的情况下，以 head 结束为准
recordMapper.insert(record);
// 3、如果是团长(CombinationRecordCreateReqDTO#headId 为 null 时)需要设置 headId 为 CombinationRecordDO#HEAD_ID_GROUP // 3. 如果是团长需要设置 headId 为 CombinationRecordDO#HEAD_ID_GROUP
if (reqDTO.getHeadId() == null) { // TODO @puhui999：是不是只要是团长，record 设置了就好啦，不用 update。。。。
recordMapper.updateById(new CombinationRecordDO().setId(recordDO.getId()).setHeadId(CombinationRecordDO.HEAD_ID_GROUP)); if (ObjUtil.equal(CombinationRecordDO.HEAD_ID_GROUP, reqDTO.getHeadId())) {
recordMapper.updateById(new CombinationRecordDO().setId(record.getId()).setHeadId(CombinationRecordDO.HEAD_ID_GROUP));
return; return;
} }
// TODO 这里要不要弄成异步的 // TODO 这里要不要弄成异步的；不用异步哈，就是事务好了；
// 4、更新拼团相关信息到订单 // 4、更新拼团相关信息到订单
updateOrderCombinationInfo(recordDO.getOrderId(), recordDO.getActivityId(), recordDO.getId(), recordDO.getHeadId()); updateOrderCombinationInfo(record.getOrderId(), record.getActivityId(), record.getId(), record.getHeadId());
// 4、更新拼团记录 // 4、更新拼团记录
updateCombinationRecords(keyValue.getKey(), reqDTO.getHeadId()); updateCombinationRecordWhenCreate(reqDTO.getHeadId(), keyValue.getKey());
} }
// TODO @puhui999：这个更新，放到 trade 那就好了；createCombinationRecord 返回一个 recordId；
/** /**
* 更新拼团相关信息到订单 * 更新拼团相关信息到订单
* *
@ -204,35 +204,31 @@ public class CombinationRecordServiceImpl implements CombinationRecordService {
} }
/** /**
* 更新拼团记录 * 当新增拼团时，更新拼团记录的进展
* *
* @param activity 活动
* @param headId 团长编号 * @param headId 团长编号
* @param activity 活动
*/ */
private void updateCombinationRecords(CombinationActivityDO activity, Long headId) { private void updateCombinationRecordWhenCreate(Long headId, CombinationActivityDO activity) {
// 团长 // 1. 团长 + 团员
CombinationRecordDO recordHead = recordMapper.selectById(headId);
// 团员
List<CombinationRecordDO> records = getCombinationRecordListByHeadId(headId); List<CombinationRecordDO> records = getCombinationRecordListByHeadId(headId);
// 需要更新的记录
List<CombinationRecordDO> updateRecords = new ArrayList<>();
if (CollUtil.isEmpty(records)) { if (CollUtil.isEmpty(records)) {
return; return;
} }
records.add(recordHead); // 加入团长，团长也需要更新 CombinationRecordDO headRecord = recordMapper.selectById(headId);
boolean isEqual = ObjUtil.equal(records.size(), activity.getUserSize());
records.forEach(item -> {
CombinationRecordDO recordDO = new CombinationRecordDO();
recordDO.setId(item.getId());
recordDO.setUserCount(records.size());
// 校验拼团是否满足要求
if (isEqual) {
recordDO.setStatus(CombinationRecordStatusEnum.SUCCESS.getStatus());
}
updateRecords.add(recordDO);
});
// 2. 批量更新记录
List<CombinationRecordDO> updateRecords = new ArrayList<>();
records.add(headRecord); // 加入团长，团长也需要更新
boolean isFull = records.size() >= activity.getUserSize();
records.forEach(item -> {
CombinationRecordDO updateRecord = new CombinationRecordDO();
updateRecord.setId(item.getId()).setUserCount(records.size());
if (isFull) {
updateRecord.setStatus(CombinationRecordStatusEnum.SUCCESS.getStatus());
}
updateRecords.add(updateRecord);
});
recordMapper.updateBatch(updateRecords); recordMapper.updateBatch(updateRecords);
} }
@ -247,12 +243,12 @@ public class CombinationRecordServiceImpl implements CombinationRecordService {
} }
@Override @Override
public CombinationValidateJoinRespDTO validateJoinCombination(Long userId, Long activityId, Long headId, Long skuId, Integer count) { public CombinationValidateJoinRespDTO validateJoinCombination(Long userId, Long activityId, Long headId,
KeyValue<CombinationActivityDO, CombinationProductDO> keyValue = validateCombinationRecord(userId, activityId, headId, skuId, count); Long skuId, Integer count) {
return new CombinationValidateJoinRespDTO() KeyValue<CombinationActivityDO, CombinationProductDO> keyValue = validateCombinationRecord(userId, activityId,
.setActivityId(keyValue.getKey().getId()) headId, skuId, count);
.setName(keyValue.getKey().getName()) return new CombinationValidateJoinRespDTO().setActivityId(keyValue.getKey().getId())
.setCombinationPrice(keyValue.getValue().getCombinationPrice()); .setName(keyValue.getKey().getName()).setCombinationPrice(keyValue.getValue().getCombinationPrice());
} }
@Override @Override

4
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeCombinationHandler.java
View File

@ -30,11 +30,11 @@ public class TradeCombinationHandler implements TradeOrderHandler {
} }
Assert.isTrue(orderItems.size() == 1, "拼团时，只允许选择一个商品"); Assert.isTrue(orderItems.size() == 1, "拼团时，只允许选择一个商品");
// 获取商品信息
TradeOrderItemDO item = orderItems.get(0);
// 校验是否满足拼团活动相关限制 // 校验是否满足拼团活动相关限制
TradeOrderItemDO item = orderItems.get(0);
combinationRecordApi.validateCombinationRecord(order.getUserId(), order.getCombinationActivityId(), combinationRecordApi.validateCombinationRecord(order.getUserId(), order.getCombinationActivityId(),
order.getCombinationHeadId(), item.getSkuId(), item.getCount()); order.getCombinationHeadId(), item.getSkuId(), item.getCount());
// TODO @puhui999：这里还要限制下，是不是已经 createOrder；就是还没支付的时候，重复下单了；需要校验下；不然的话，一个拼团可以下多个单子了；
} }
@Override @Override