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

【BUG】修改限时优惠和会员优惠显示最便宜相反的问题

Browse Source
This commit is contained in:
痴货
2024-09-14 19:16:48 +08:00
parent 0496ac237c
commit 51b8fe2eca
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
View File

@ -106,9 +106,9 @@ public class AppTradeOrderController {
if(skuDiscount != null && skuVip != null){ if(skuDiscount != null && skuVip != null){
if(skuDiscount.getPrice() > skuVip.getPrice()){ if(skuDiscount.getPrice() > skuVip.getPrice()){
skus.add(skuDiscount);
}else{
skus.add(skuVip); skus.add(skuVip);
}else{
skus.add(skuDiscount);
} }
}else if(skuDiscount != null){ }else if(skuDiscount != null){
skus.add(skuDiscount); skus.add(skuDiscount);
@ -335,7 +335,7 @@ public class AppTradeOrderController {
RewardActivityMatchRespDTO.Rule rule = rewardActivityMatchRespDTO.getRules().get(0); RewardActivityMatchRespDTO.Rule rule = rewardActivityMatchRespDTO.getRules().get(0);
return AppTradeProductSettlementRespVO.Reward.builder(). return AppTradeProductSettlementRespVO.Reward.builder().
rewardActivity("满" + rule.getLimit() / 100 + (Objects.equals(rewardActivityMatchRespDTO.getConditionType(), PromotionConditionTypeEnum.PRICE.getType())?"元":"件"+"减") +rule.getDiscountPrice() / 100) rewardActivity("满" + rule.getLimit() / 100 + (Objects.equals(rewardActivityMatchRespDTO.getConditionType(), PromotionConditionTypeEnum.PRICE.getType())?"元":"件"+"减") +rule.getDiscountPrice() / 100)
.rewardId(rewardActivityMatchRespDTO.getId()).build(); .id(rewardActivityMatchRespDTO.getId()).build();
} }
} }
return null; return null;