From 49b65f4897bb47888aa4a47501637a1492309fed Mon Sep 17 00:00:00 2001
From: taozi <9108791@qq.com>
Date: Fri, 28 Jan 2022 23:30:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E5=BA=97bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/impl/YxStoreOrderServiceImpl.java        | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
index f86711b2..efc70a15 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
@@ -2434,8 +2434,11 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
                 yxStoreOrder.getRefundStatus());
 
         if (yxStoreOrder.getStoreId() > 0) {
-            String storeName = systemStoreService.getById(yxStoreOrder.getStoreId()).getName();
-            yxStoreOrderDto.setStoreName(storeName);
+            YxSystemStore systemStore = systemStoreService.getById(yxStoreOrder.getStoreId());
+            if (Objects.nonNull(systemStore)) {
+                String storeName = systemStore.getName();
+                yxStoreOrderDto.setStoreName(storeName);
+            }
         }
 
         //订单状态