From 3d6f2cd1483c5e85a3f2eeb2edd89c088d1d5c6b Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 09 五月 2023 22:52:48 +0800
Subject: [PATCH] DEMO初步完成
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java
index 66e954c..21a93ff 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java
@@ -2,8 +2,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.order.domain.dto.AppPageDto;
+import com.ruoyi.system.api.domain.dto.AppPageDto;
import com.ruoyi.order.domain.dto.AppSearchGoodsPageDto;
import com.ruoyi.order.domain.dto.AppShopGoodsPageDto;
import com.ruoyi.order.domain.vo.AppSimpleActivityGoodsVo;
@@ -31,7 +32,7 @@
@Api(value = "小程序首页相关接口", tags = "小程序首页相关接口", description = "小程序首页相关接口")
@RestController
@RequestMapping("/app/home")
-public class AppHomeController {
+public class AppHomeController extends BaseController {
@Autowired
@@ -49,14 +50,15 @@
Long shopId = null;
if(userId!=null){
Member member = memberService.getMember(userId).getData();
- if(member!=null&&member.getRealtionShopId()!=null){
- shopId = member.getRealtionShopId();
+ if(member!=null&&member.getRelationShopId()!=null){
+ shopId = member.getRelationShopId();
}
}
Page<AppSimpleGoodsVo> page = new Page<>();
page.setSize(appPageDto.getPageSize());
page.setCurrent(appPageDto.getPageNum());
List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsService.pageRecommendGoods(page,shopId);
+
return R.ok(page.setRecords(appSimpleGoodsVoList));
}
@@ -66,8 +68,8 @@
Long userId = SecurityUtils.getUserId();
if(userId!=null){
Member member = memberService.getMember(userId).getData();
- if(member!=null&&member.getRealtionShopId()!=null){
- appShopGoodsPageDto.setShopId(member.getRealtionShopId());
+ if(member!=null&&member.getRelationShopId()!=null){
+ appShopGoodsPageDto.setShopId(member.getRelationShopId());
}
}
Page<AppSimpleGoodsVo> page = new Page<>();
@@ -83,8 +85,8 @@
Long userId = SecurityUtils.getUserId();
if(userId!=null){
Member member = memberService.getMember(userId).getData();
- if(member!=null&&member.getRealtionShopId()!=null){
- appSearchGoodsPageDto.setShopId(member.getRealtionShopId());
+ if(member!=null&&member.getRelationShopId()!=null){
+ appSearchGoodsPageDto.setShopId(member.getRelationShopId());
}
}
Page<AppSimpleGoodsVo> page = new Page<>();
@@ -100,8 +102,8 @@
Long userId = SecurityUtils.getUserId();
if(userId!=null){
Member member = memberService.getMember(userId).getData();
- if(member!=null&&member.getRealtionShopId()!=null){
- appSearchGoodsPageDto.setShopId(member.getRealtionShopId());
+ if(member!=null&&member.getRelationShopId()!=null){
+ appSearchGoodsPageDto.setShopId(member.getRelationShopId());
}
}
Page<AppSimpleActivityGoodsVo> page = new Page<>();
--
Gitblit v1.7.1