From b9679b6f96bbe8b52ee1d699033d9021d5fe870f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 10 一月 2025 18:35:06 +0800
Subject: [PATCH] 1.小鹅通直播课程接口对接 2.商户端直播课程接口
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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..bf20bb0 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
@@ -1,21 +1,24 @@
package com.ruoyi.shop.controller.miniapp;
+import com.alibaba.fastjson.JSON;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.shop.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.RemoteMemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.extern.log4j.Log4j2;
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
@@ -27,20 +30,26 @@
@Api(value = "小程序首页相关接口", tags = "小程序首页相关接口", description = "小程序首页相关接口")
@RestController
@RequestMapping("/app/home")
+@Log4j2
public class AppHomeController {
- @Autowired
+ @Resource
private RemoteMemberService memberService;
- @Autowired
+
+ @Resource
private ShopService shopService;
@RequestMapping(value = "/getNearbyShop", method = RequestMethod.POST)
@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();
+ }
+ log.info("获取最近商户：userId=" + userId + "&appNearbyShopDto=" + JSON.toJSONString(appNearbyShopDto));
appNearbyShopDto.setUserId(userId);
AppNearbyShopVo appNearbyShopVo = shopService.getNearbyShop(appNearbyShopDto,member);
return R.ok(appNearbyShopVo);
--
Gitblit v1.7.1