From cd3a4c5e2b85d5fda1cfc5acd50a2958bb1986c9 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Tue, 29 Jul 2025 17:26:54 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E6=9C=80=E6=96=B0=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=AD=89=E7=BA=A7=E5=A4=84=E7=90=86=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sale/order/service/impl/SaOrderServiceImpl.java    | 10 ++--------
 .../main/resources/mapper/sale/order/SaOrderMapper.xml |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
index 34e6af0d..b4ddd5c2 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
@@ -566,13 +566,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
                     cuMember.setPkSettleGradeValue(newGradeDTO.getGradeValue());
                 }
             }
-//            else if (EGrade.HAI_FAN.getValue() == gradeDTO.getGradeValue()) {
-//                // 2025.07.15 新需求，报 188 给 660 等级
-//                GradeDTO newGradeDTO = iGradeServiceApi.getGradeByGradeValue(EGrade.YOU_KE.getValue(), saOrderExt.getPkCountry()).getData();
-//                if (null != newGradeDTO) {
-//                    cuMember.setPkSettleGrade(newGradeDTO.getPkId());
-//                }
-//            }
         }
 
         // 判断奖衔，原会员有奖衔的话判断哪个大，使用大的
@@ -1079,7 +1072,8 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
                 // TODO 2025.07.17 为兼容注册送等级逻辑，此处需要查询一下会员的实际订单对应等级
                 SaOrderExt gradeOrder = baseMapper.getLastOrderGrade(member.getPkId());
                 if (null != gradeOrder) {
-                    if (gradeOrder.getGradeValue() < gradeDTO.getGradeValue()) {
+                    if (gradeOrder.getGradeValue() < gradeDTO.getGradeValue()
+                            && gradeOrder.getGradeValue() < EGrade.VIP.getValue()) {
                         orderReturn.setIsEnough(Boolean.TRUE);
                     } else {
                         gradeDTO.setGradeName(null);
diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml
index 9553182f..f7f4b76b 100644
--- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml
+++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml
@@ -1541,7 +1541,7 @@
                                      and bg.del_flag = 0
                                      and bg.pk_country = so.pk_country
               order by bg.grade_value desc) so
-        where grade_rownum = 1
+        where rownum = 1
     </select>
 
 </mapper>