From 3183d1a910d72eefb96d4cb72f556a54a5d2f874 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 25 五月 2023 11:42:39 +0800
Subject: [PATCH] 完善数据库和框架

---
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppGoodsController.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppGoodsController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppGoodsController.java
index 5354c45..e935f67 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppGoodsController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppGoodsController.java
@@ -5,6 +5,7 @@
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.goods.domain.vo.AppShoppingCartVo;
+import com.ruoyi.system.api.constant.AppErrorConstant;
 import com.ruoyi.system.api.domain.dto.AppBaseBathDto;
 import com.ruoyi.goods.domain.dto.AppGoodsInfoGetDto;
 import com.ruoyi.goods.domain.dto.AppShoppingCartAddDto;
@@ -54,9 +55,12 @@
             if(member!=null&&member.getRelationShopId()!=null){
                 appGoodsInfoGetDto.setShopId(member.getRelationShopId());
             }else{
-                throw new ServiceException("请先获取附近商户定位");
+                appGoodsInfoGetDto.setShopId(appGoodsInfoGetDto.getPositionShopId());
             }
         }
+        if(appGoodsInfoGetDto.getShopId()==null){
+            throw new ServiceException(AppErrorConstant.NO_POSITION);
+        }
         AppGoodsInfoVo appGoodsInfoVo = goodsService.getGoodsInfo(appGoodsInfoGetDto);
         return R.ok(appGoodsInfoVo);
     }

--
Gitblit v1.7.1