From 546be8a1bafdfc804575a8d07a5d9f2306c29c42 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 19 六月 2025 11:20:58 +0800
Subject: [PATCH] 修改直播列表
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppActivityController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppActivityController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppActivityController.java
index 24600b8..291dc07 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppActivityController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppActivityController.java
@@ -5,9 +5,11 @@
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.goods.domain.vo.AppActivityPageVo;
+import com.ruoyi.goods.domain.vo.AppSimpleActivityGoodsVo;
import com.ruoyi.goods.service.activity.ActivityService;
import com.ruoyi.goods.service.goods.GoodsService;
import com.ruoyi.system.api.constant.AppErrorConstant;
+import com.ruoyi.system.api.domain.dto.AppActivityGoodsPageDto;
import com.ruoyi.system.api.domain.dto.AppPageDto;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.service.RemoteMemberService;
@@ -47,8 +49,9 @@
public R<Page<AppActivityPageVo>> pageAppActivity(@RequestBody AppPageDto appPageDto) {
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();
}
@@ -56,6 +59,9 @@
if(shopId==null){
throw new ServiceException(AppErrorConstant.NO_POSITION);
}
+// if(member!=null&&member.getBindingFlag()==0){
+// shopId = null;
+// }
Page<AppActivityPageVo> page = new Page<>();
page.setSize(appPageDto.getPageSize());
page.setCurrent(appPageDto.getPageNum());
@@ -64,7 +70,7 @@
}
- /*@RequestMapping(value = "/pageAppActivityGoods", method = RequestMethod.POST)
+ @RequestMapping(value = "/pageAppActivityGoods", method = RequestMethod.POST)
@ApiOperation(value = "分页获取活动商品")
public R<Page<AppSimpleActivityGoodsVo>> pageAppActivityGoods(@RequestBody AppActivityGoodsPageDto appActivityGoodsPageDto) {
Long userId = SecurityUtils.getUserId();
@@ -72,6 +78,8 @@
Member member = memberService.getMember(userId).getData();
if(member!=null&&member.getRelationShopId()!=null){
appActivityGoodsPageDto.setShopId(member.getRelationShopId());
+ }else{
+ appActivityGoodsPageDto.setShopId(appActivityGoodsPageDto.getPositionShopId());
}
}
if(appActivityGoodsPageDto.getShopId()==null){
@@ -82,5 +90,7 @@
page.setCurrent(appActivityGoodsPageDto.getPageNum());
List<AppSimpleActivityGoodsVo> appSimpleGoodsVoList = goodsService.pageAppActivityGoods(page,appActivityGoodsPageDto);
return R.ok(page.setRecords(appSimpleGoodsVoList));
- }*/
+ }
+
+
}
--
Gitblit v1.7.1