From 4b08359ddd1c5e17e5535c3ba3b651a1fa687d3d Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 27 Oct 2025 09:09:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=9A=E5=91=98=E4=BB=B7=20=E5=88=A4?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czg/service/order/service/impl/OrderInfoServiceImpl.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
index b9372a720..ca41ab5aa 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
@@ -401,7 +401,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             orderInfo.setUserId(userInfo.getId());
         }
         //会员价校验
-        if (param.isVipPrice() && (shopUser == null || shopUser.getIsMemberPrice() == 0 || shopUser.getIsVip().equals(0))) {
+        if (param.isVipPrice() && (shopUser == null || shopUser.getIsMemberPrice() == null
+                || shopUser.getIsMemberPrice() == 0 || shopUser.getIsVip().equals(0))) {
             throw new ValidateException("生成支付订单失败，仅会员可使用会员价");
         }
 

From f1341b8c7fc1c69ba935d08c69714251416291d0 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 27 Oct 2025 09:24:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=99=90=E6=97=B6=E6=8A=98=E6=89=A3=20?=
 =?UTF-8?q?=E4=BC=98=E5=85=88=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/MkLimitTimeDiscountMapper.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cash-service/market-service/src/main/resources/mapper/MkLimitTimeDiscountMapper.xml b/cash-service/market-service/src/main/resources/mapper/MkLimitTimeDiscountMapper.xml
index ba3ea07a7..5c436f160 100644
--- a/cash-service/market-service/src/main/resources/mapper/MkLimitTimeDiscountMapper.xml
+++ b/cash-service/market-service/src/main/resources/mapper/MkLimitTimeDiscountMapper.xml
@@ -19,7 +19,7 @@
           AND (use_time_type = 'all' OR
                (use_time_type = 'custom' AND TIME(NOW()) BETWEEN use_start_time AND use_end_time))
           AND FIND_IN_SET(#{useDay}, use_days) > 0
-        ORDER BY sort,
+        ORDER BY sort DESC,
                  update_time DESC,
                  create_time DESC
         LIMIT 1;