From c203ff63489126a94d1be5dbfe32cadb69a70594 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 25 五月 2023 16:26:56 +0800
Subject: [PATCH] 完善数据库和框架
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 88cec68..6781191 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,15 +2,17 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.shop.domain.dto.AppBaseGetDto;
+import com.ruoyi.system.api.service.RemoteConfigService;
+import com.ruoyi.system.api.service.RemoteMemberService;
+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.poji.member.Member;
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;
@@ -27,11 +29,14 @@
@Api(value = "小程序首页相关接口", tags = "小程序首页相关接口", description = "小程序首页相关接口")
@RestController
@RequestMapping("/app/home")
+@Log4j2
public class AppHomeController {
@Autowired
private RemoteMemberService memberService;
+
+ RemoteConfigService remoteConfigService;
@Autowired
private ShopService shopService;
@@ -40,7 +45,10 @@
@ApiOperation(value = "获取最近商户")
public R<AppNearbyShopVo> getNearbyShop(@RequestBody AppNearbyShopDto appNearbyShopDto) {
Long userId = SecurityUtils.getUserId();
- Member member = memberService.getMember(userId).getData();
+ 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