From 51b8fe2ecab72cd5342c481051474d22d6136f45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=97=B4=E8=B4=A7?= <252048765@qq.com>
Date: Sat, 14 Sep 2024 19:16:48 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90BUG=E3=80=91=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=99=90=E6=97=B6=E4=BC=98=E6=83=A0=E5=92=8C=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E4=BC=98=E6=83=A0=E6=98=BE=E7=A4=BA=E6=9C=80=E4=BE=BF=E5=AE=9C?=
 =?UTF-8?q?=E7=9B=B8=E5=8F=8D=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trade/controller/app/order/AppTradeOrderController.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
index b325c99ec..24bbfb6e7 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
@@ -106,9 +106,9 @@ public class AppTradeOrderController {
 
                 if(skuDiscount != null && skuVip != null){
                     if(skuDiscount.getPrice() > skuVip.getPrice()){
-                        skus.add(skuDiscount);
-                    }else{
                         skus.add(skuVip);
+                    }else{
+                        skus.add(skuDiscount);
                     }
                 }else if(skuDiscount != null){
                     skus.add(skuDiscount);
@@ -335,7 +335,7 @@ public class AppTradeOrderController {
                 RewardActivityMatchRespDTO.Rule rule = rewardActivityMatchRespDTO.getRules().get(0);
                 return AppTradeProductSettlementRespVO.Reward.builder().
                         rewardActivity("满" + rule.getLimit() / 100 + (Objects.equals(rewardActivityMatchRespDTO.getConditionType(), PromotionConditionTypeEnum.PRICE.getType())?"元":"件"+"减") +rule.getDiscountPrice() / 100)
-                        .rewardId(rewardActivityMatchRespDTO.getId()).build();
+                        .id(rewardActivityMatchRespDTO.getId()).build();
             }
         }
         return null;