From 5f159dab33dce77f05472b16045ab6ca4f48d07b Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 12 五月 2023 16:49:39 +0800
Subject: [PATCH] DEMO完成

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java
index f195a20..a764811 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java
@@ -54,6 +54,9 @@
                 shopId = member.getRelationShopId();
             }
         }
+        if(shopId==null){
+            shopId = 1L;
+        }
         Page<AppSimpleGoodsVo> page = new Page<>();
         page.setSize(appPageDto.getPageSize());
         page.setCurrent(appPageDto.getPageNum());
@@ -71,6 +74,8 @@
             Member member = memberService.getMember(userId).getData();
             if(member!=null&&member.getRelationShopId()!=null){
                 appShopGoodsPageDto.setShopId(member.getRelationShopId());
+            }else{
+                appShopGoodsPageDto.setShopId(1L);
             }
         }
         Page<AppSimpleGoodsVo> page = new Page<>();
@@ -88,6 +93,8 @@
             Member member = memberService.getMember(userId).getData();
             if(member!=null&&member.getRelationShopId()!=null){
                 appSearchGoodsPageDto.setShopId(member.getRelationShopId());
+            }else{
+                appSearchGoodsPageDto.setShopId(1L);
             }
         }
         Page<AppSimpleGoodsVo> page = new Page<>();
@@ -105,6 +112,8 @@
             Member member = memberService.getMember(userId).getData();
             if(member!=null&&member.getRelationShopId()!=null){
                 appSearchGoodsPageDto.setShopId(member.getRelationShopId());
+            }else{
+                appSearchGoodsPageDto.setShopId(1L);
             }
         }
         Page<AppSimpleActivityGoodsVo> page = new Page<>();

--
Gitblit v1.7.1