From 1f9b64476716a6a1de3bcb886bf4e64b123f7523 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 06 七月 2023 18:28:31 +0800
Subject: [PATCH] 管理台bug和用户端活动商品购买

---
 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppActivityController.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 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..38f6285 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;
@@ -64,7 +66,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();
@@ -82,5 +84,5 @@
         page.setCurrent(appActivityGoodsPageDto.getPageNum());
         List<AppSimpleActivityGoodsVo> appSimpleGoodsVoList = goodsService.pageAppActivityGoods(page,appActivityGoodsPageDto);
         return R.ok(page.setRecords(appSimpleGoodsVoList));
-    }*/
+    }
 }

--
Gitblit v1.7.1