From 0f9d03ee930d1c2dc62b34dd2c3522cda91f93cf Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 06 六月 2023 14:29:33 +0800
Subject: [PATCH] 基础配置

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java
index efea8ee..ce5c413 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java
@@ -2,21 +2,23 @@
 
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.domain.dto.AppBaseGetDto;
 import com.ruoyi.shop.domain.dto.AppNearbyShopDto;
 import com.ruoyi.shop.domain.vo.AppNearbyShopVo;
 import com.ruoyi.shop.domain.vo.AppShopInfoVo;
 import com.ruoyi.shop.service.shop.ShopService;
-import com.ruoyi.system.api.RemoteMemberService;
+import com.ruoyi.system.api.domain.dto.AppBaseGetDto;
 import com.ruoyi.system.api.domain.poji.member.Member;
+import com.ruoyi.system.api.service.RemoteConfigService;
+import com.ruoyi.system.api.service.RemoteMemberService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
 
 /**
  * @author jqs34
@@ -32,19 +34,22 @@
 public class AppHomeController {
 
 
-    @Autowired
+    @Resource
     private RemoteMemberService memberService;
 
-    @Autowired
+    RemoteConfigService remoteConfigService;
+
+    @Resource
     private ShopService shopService;
 
     @RequestMapping(value = "/getNearbyShop", method = RequestMethod.POST)
     @ApiOperation(value = "获取最近商户")
     public R<AppNearbyShopVo> getNearbyShop(@RequestBody AppNearbyShopDto appNearbyShopDto) {
         Long userId = SecurityUtils.getUserId();
-        log.info("userId"+userId);
-        Member member = memberService.getMember(userId).getData();
-        log.info("member"+member);
+        Member member = null;
+        if(userId!=null){
+            member = memberService.getMember(userId).getData();
+        }
         appNearbyShopDto.setUserId(userId);
         AppNearbyShopVo appNearbyShopVo = shopService.getNearbyShop(appNearbyShopDto,member);
         return R.ok(appNearbyShopVo);

--
Gitblit v1.7.1