Commit 19c4a5c9616f8598db2abb9552cce6e738bbee1a
1 parent
783f0193
【功能优化】商城:秒杀装修重构(PC端)
Showing
4 changed files
with
4 additions
and
3 deletions
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/SeckillActivityController.java
| @@ -115,4 +115,5 @@ public class SeckillActivityController { | @@ -115,4 +115,5 @@ public class SeckillActivityController { | ||
| 115 | List<ProductSpuRespDTO> spuList = productSpuApi.getSpuList(convertList(activityList, SeckillActivityDO::getSpuId)); | 115 | List<ProductSpuRespDTO> spuList = productSpuApi.getSpuList(convertList(activityList, SeckillActivityDO::getSpuId)); |
| 116 | return success(SeckillActivityConvert.INSTANCE.convertList(activityList, productList, spuList)); | 116 | return success(SeckillActivityConvert.INSTANCE.convertList(activityList, productList, spuList)); |
| 117 | } | 117 | } |
| 118 | + | ||
| 118 | } | 119 | } |
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/vo/activity/SeckillActivityRespVO.java
| @@ -57,5 +57,4 @@ public class SeckillActivityRespVO extends SeckillActivityBaseVO { | @@ -57,5 +57,4 @@ public class SeckillActivityRespVO extends SeckillActivityBaseVO { | ||
| 57 | @Schema(description = "拼团金额,单位:分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") | 57 | @Schema(description = "拼团金额,单位:分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") |
| 58 | private Integer seckillPrice; // 从 products 获取最小 price 读取 | 58 | private Integer seckillPrice; // 从 products 获取最小 price 读取 |
| 59 | 59 | ||
| 60 | - | ||
| 61 | } | 60 | } |
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityService.java
| @@ -142,7 +142,7 @@ public interface SeckillActivityService { | @@ -142,7 +142,7 @@ public interface SeckillActivityService { | ||
| 142 | /** | 142 | /** |
| 143 | * 获得拼团活动列表 | 143 | * 获得拼团活动列表 |
| 144 | * | 144 | * |
| 145 | - * @param ids 拼团活动 ids | 145 | + * @param ids 拼团活动编号数组 |
| 146 | * @return 拼团活动的列表 | 146 | * @return 拼团活动的列表 |
| 147 | */ | 147 | */ |
| 148 | List<SeckillActivityDO> getSeckillActivityListByIds(Collection<Long> ids); | 148 | List<SeckillActivityDO> getSeckillActivityListByIds(Collection<Long> ids); |
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculator.java
| 1 | package cn.iocoder.yudao.module.trade.service.price.calculator; | 1 | package cn.iocoder.yudao.module.trade.service.price.calculator; |
| 2 | 2 | ||
| 3 | import cn.hutool.core.collection.CollUtil; | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | +import cn.hutool.core.collection.ListUtil; | ||
| 4 | import cn.hutool.core.util.ObjectUtil; | 5 | import cn.hutool.core.util.ObjectUtil; |
| 5 | import cn.hutool.core.util.StrUtil; | 6 | import cn.hutool.core.util.StrUtil; |
| 6 | import cn.iocoder.yudao.framework.common.util.number.MoneyUtils; | 7 | import cn.iocoder.yudao.framework.common.util.number.MoneyUtils; |
| @@ -146,7 +147,7 @@ public class TradeRewardActivityPriceCalculator implements TradePriceCalculator | @@ -146,7 +147,7 @@ public class TradeRewardActivityPriceCalculator implements TradePriceCalculator | ||
| 146 | return filterList(result.getItems(), | 147 | return filterList(result.getItems(), |
| 147 | orderItem -> CollUtil.contains(rewardActivity.getProductScopeValues(), orderItem.getCategoryId())); | 148 | orderItem -> CollUtil.contains(rewardActivity.getProductScopeValues(), orderItem.getCategoryId())); |
| 148 | } | 149 | } |
| 149 | - return List.of(); | 150 | + return ListUtil.of(); |
| 150 | } | 151 | } |
| 151 | 152 | ||
| 152 | /** | 153 | /** |