From 86dd9b7d0c8f8ed26fc965483eb934b425330eb0 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Tue, 28 Oct 2025 10:29:55 +0800
Subject: [PATCH] =?UTF-8?q?##=20448=E4=B8=8B=E5=8D=95=E6=97=B6=E6=8A=A5?=
 =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E5=A4=84=E7=90=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/RetailOrderServiceImpl.java         | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java
index e0f6511c..b9d57b35 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java
@@ -302,11 +302,13 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
             gradeList = iGradeServiceApi.getRetailGradeList().getData();
         }
 
-        BdGrade bdGrade = gradeList.stream().filter(tmpGrade -> updateGradeMember.getPkSettleGrade().equals(tmpGrade.getPkId())).findFirst().get();
-        if (bdGrade.getGradeValue() == EGrade.YOU_KE.getValue()) {
-            // 最高级，直接返回
-            updateGradeMember.setPkSettleGrade(bdGrade.getPkId());
-            return bdGrade;
+        if (null != updateGradeMember.getPkSettleGrade()) {
+            BdGrade bdGrade = gradeList.stream().filter(tmpGrade -> updateGradeMember.getPkSettleGrade().equals(tmpGrade.getPkId())).findFirst().get();
+            if (bdGrade.getGradeValue() == EGrade.YOU_KE.getValue()) {
+                // 最高级，直接返回
+                updateGradeMember.setPkSettleGrade(bdGrade.getPkId());
+                return bdGrade;
+            }
         }
 
         // 订单业绩