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/controller/app/seckill/AppSeckillActivityController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityService.java
This commit is contained in:
puhui999
2023-09-20 10:14:43 +08:00
56 changed files with 989 additions and 411 deletions

View File

@ -31,7 +31,7 @@ public interface CombinationRecordApi {
boolean isCombinationRecordSuccess(Long userId, Long orderId);
/**
* 更新拼团状态为 成功
* 更新拼团状态为成功
*
* @param userId 用户编号
* @param orderId 订单编号
@ -39,7 +39,7 @@ public interface CombinationRecordApi {
void updateRecordStatusToSuccess(Long userId, Long orderId);
/**
* 更新拼团状态为 失败
* 更新拼团状态为失败
*
* @param userId 用户编号
* @param orderId 订单编号

View File

@ -7,6 +7,7 @@ package cn.iocoder.yudao.module.promotion.api.seckill;
*/
public interface SeckillActivityApi {
// TODO @puhui999activityId 改成 id 好点哈;
/**
* 更新秒杀库存
*