From 3bba8ccaea4c0ff7ad5a7acb056d554c42b2eca2 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 03 五月 2023 17:10:43 +0800
Subject: [PATCH] 小程序初步完成
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 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 6f7675c..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
@@ -4,7 +4,7 @@
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;
@@ -50,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));
}
@@ -67,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<>();
@@ -84,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<>();
@@ -101,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