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/AppHomeController.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 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 0dbf3bf..18d3e6f 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
@@ -8,6 +8,7 @@
import com.ruoyi.goods.domain.dto.AppRecommendGoodsPageDto;
import com.ruoyi.goods.domain.dto.AppSearchGoodsPageDto;
import com.ruoyi.goods.domain.dto.AppShopGoodsPageDto;
+import com.ruoyi.goods.domain.vo.AppHomeActivityVo;
import com.ruoyi.goods.domain.vo.AppSimpleActivityGoodsVo;
import com.ruoyi.goods.domain.vo.AppSimpleGoodsVo;
import com.ruoyi.goods.service.goods.GoodsService;
@@ -44,9 +45,33 @@
private GoodsService goodsService;
+ @RequestMapping(value = "/pageActivityGoods", method = RequestMethod.POST)
+ @ApiOperation(value = "热门活动")
+ public R<AppHomeActivityVo> pageActivityGoods(@RequestBody AppRecommendGoodsPageDto appRecommendGoodsPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ Long shopId = null;
+ Member member = null;
+ if(userId!=null){
+ member = memberService.getMember(userId).getData();
+ if(member!=null&&member.getRelationShopId()!=null){
+ shopId = member.getRelationShopId();
+ }
+ }
+ 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);
+ }
@RequestMapping(value = "/pageRecommendGoods", method = RequestMethod.POST)
- @ApiOperation(value = "推荐商品")
+ @ApiOperation(value = "商城精选")
public R<Page<AppSimpleGoodsVo>> pageRecommendGoods(@RequestBody AppRecommendGoodsPageDto appRecommendGoodsPageDto) {
Long userId = SecurityUtils.getUserId();
Long shopId = null;
@@ -55,7 +80,8 @@
if(member!=null&&member.getRelationShopId()!=null){
shopId = member.getRelationShopId();
}
- }else{
+ }
+ if(shopId==null){
shopId = appRecommendGoodsPageDto.getPositionShopId();
}
if(shopId==null){
@@ -116,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{
@@ -127,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