From 95be57d7842d54c7043a5cdc448b1938e5ece058 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 29 七月 2023 19:09:54 +0800
Subject: [PATCH] bug

---
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppActivityController.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppActivityController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppActivityController.java
index 7eb6f61..0d7a49d 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppActivityController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppActivityController.java
@@ -74,6 +74,8 @@
             Member member = memberService.getMember(userId).getData();
             if(member!=null&&member.getRelationShopId()!=null){
                 appActivityGoodsPageDto.setShopId(member.getRelationShopId());
+            }else{
+                appActivityGoodsPageDto.setShopId(appActivityGoodsPageDto.getPositionShopId());
             }
         }
         if(appActivityGoodsPageDto.getShopId()==null){

--
Gitblit v1.7.1