product:商品规格,调整成商品属性,避免和 sku 概念冲突

This commit is contained in:
YunaiV
2022-12-08 21:12:35 +08:00
parent 373188b58d
commit fac3e7c726
55 changed files with 283 additions and 210 deletions

View File

@@ -265,7 +265,7 @@ public class PriceServiceImpl implements PriceService {
private void calculatePriceByRewardActivity(PriceCalculateRespDTO priceCalculate, List<PriceCalculateRespDTO.OrderItem> orderItems,
RewardActivityDO rewardActivity) {
// 获得最大匹配的满减送活动的规
// 获得最大匹配的满减送活动的规
RewardActivityDO.Rule rule = getLastMatchRewardActivityRule(rewardActivity, orderItems);
if (rule == null) {
// 获取不到的情况下,记录不满足的优惠明细
@@ -288,11 +288,11 @@ public class PriceServiceImpl implements PriceService {
}
/**
* 获得最大匹配的满减送活动的规
* 获得最大匹配的满减送活动的规
*
* @param rewardActivity 满减送活动
* @param orderItems 商品项
* @return 匹配的活动规
* @return 匹配的活动规
*/
private RewardActivityDO.Rule getLastMatchRewardActivityRule(RewardActivityDO rewardActivity,
List<PriceCalculateRespDTO.OrderItem> orderItems) {