From 65816321c28dab1f43d0563af67dbcbad2c5bdca Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 22 五月 2023 18:15:39 +0800
Subject: [PATCH] demo补完
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppHomeController.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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 21a93ff..b54b1a3 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,6 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.dto.AppPageDto;
@@ -47,6 +48,7 @@
@ApiOperation(value = "推荐商品")
public R<Page<AppSimpleGoodsVo>> pageRecommendGoods(@RequestBody AppPageDto appPageDto) {
Long userId = SecurityUtils.getUserId();
+ logger.info("userId-----"+userId.toString());
Long shopId = null;
if(userId!=null){
Member member = memberService.getMember(userId).getData();
@@ -54,11 +56,15 @@
shopId = member.getRelationShopId();
}
}
+ if(shopId==null){
+ shopId = 1L;
+ }
Page<AppSimpleGoodsVo> page = new Page<>();
page.setSize(appPageDto.getPageSize());
page.setCurrent(appPageDto.getPageNum());
+ //logger.info("shopId"+shopId.toString());
List<AppSimpleGoodsVo> appSimpleGoodsVoList = goodsService.pageRecommendGoods(page,shopId);
-
+ //logger.info("appSimpleGoodsVoList"+appSimpleGoodsVoList.toString());
return R.ok(page.setRecords(appSimpleGoodsVoList));
}
@@ -70,6 +76,8 @@
Member member = memberService.getMember(userId).getData();
if(member!=null&&member.getRelationShopId()!=null){
appShopGoodsPageDto.setShopId(member.getRelationShopId());
+ }else{
+ appShopGoodsPageDto.setShopId(1L);
}
}
Page<AppSimpleGoodsVo> page = new Page<>();
@@ -87,6 +95,8 @@
Member member = memberService.getMember(userId).getData();
if(member!=null&&member.getRelationShopId()!=null){
appSearchGoodsPageDto.setShopId(member.getRelationShopId());
+ }else{
+ appSearchGoodsPageDto.setShopId(1L);
}
}
Page<AppSimpleGoodsVo> page = new Page<>();
@@ -104,6 +114,8 @@
Member member = memberService.getMember(userId).getData();
if(member!=null&&member.getRelationShopId()!=null){
appSearchGoodsPageDto.setShopId(member.getRelationShopId());
+ }else{
+ appSearchGoodsPageDto.setShopId(1L);
}
}
Page<AppSimpleActivityGoodsVo> page = new Page<>();
--
Gitblit v1.7.1