From 1772afb069b75871572c9c438bbd2bc403f864df Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 13 十二月 2023 11:43:51 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java
index c14d4d9..8e25340 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java
@@ -50,16 +50,21 @@
public R<AppHomeActivityVo> pageActivityGoods(@RequestBody AppRecommendGoodsPageDto appRecommendGoodsPageDto) {
Long userId = SecurityUtils.getUserId();
Long shopId = null;
+ Member member = null;
if(userId!=null){
- Member member = memberService.getMember(userId).getData();
+ member = memberService.getMember(userId).getData();
if(member!=null&&member.getRelationShopId()!=null){
shopId = member.getRelationShopId();
}
- }else{
+ }
+ if(shopId==null){
shopId = appRecommendGoodsPageDto.getPositionShopId();
}
if(shopId==null){
throw new ServiceException(AppErrorConstant.NO_POSITION);
+ }
+ if(member!=null&&member.getBindingFlag()==0){
+ shopId = null;
}
AppHomeActivityVo homeActivityVo = goodsService.pageActivityGoods(shopId);
return R.ok(homeActivityVo);
@@ -75,7 +80,8 @@
if(member!=null&&member.getRelationShopId()!=null){
shopId = member.getRelationShopId();
}
- }else{
+ }
+ if(shopId==null){
shopId = appRecommendGoodsPageDto.getPositionShopId();
}
if(shopId==null){
@@ -136,8 +142,9 @@
@ApiOperation(value = "搜索活动商品")
public R<Page<AppSimpleActivityGoodsVo>> pageSearchActivityGoods(@RequestBody AppSearchGoodsPageDto appSearchGoodsPageDto) {
Long userId = SecurityUtils.getUserId();
+ Member member = null;
if(userId!=null){
- Member member = memberService.getMember(userId).getData();
+ member = memberService.getMember(userId).getData();
if(member!=null&&member.getRelationShopId()!=null){
appSearchGoodsPageDto.setShopId(member.getRelationShopId());
}else{
@@ -147,6 +154,9 @@
if(appSearchGoodsPageDto.getShopId()==null){
throw new ServiceException(AppErrorConstant.NO_POSITION);
}
+ if(member!=null&&member.getBindingFlag()==0){
+ appSearchGoodsPageDto.setShopId(null);
+ }
Page<AppSimpleActivityGoodsVo> page = new Page<>();
page.setSize(appSearchGoodsPageDto.getPageSize());
page.setCurrent(appSearchGoodsPageDto.getPageNum());
--
Gitblit v1.7.1