From d10302001c4a6776a190cf97a403dab3816ed4f9 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 04 七月 2023 21:59:30 +0800
Subject: [PATCH] 用户端活动商品

---
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 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..c14d4d9 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,28 @@
     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;
+        if(userId!=null){
+            Member member = memberService.getMember(userId).getData();
+            if(member!=null&&member.getRelationShopId()!=null){
+                shopId = member.getRelationShopId();
+            }
+        }else{
+            shopId = appRecommendGoodsPageDto.getPositionShopId();
+        }
+        if(shopId==null){
+            throw new ServiceException(AppErrorConstant.NO_POSITION);
+        }
+        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;

--
Gitblit v1.7.1