From 5627daeb1ac1a29947e902f9a7efb6730ed98611 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 07 七月 2023 20:35:50 +0800
Subject: [PATCH] 管理台bug和用户端生日卡
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ActivityController.java | 65 +++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ActivityController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ActivityController.java
index d72338b..4e82059 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ActivityController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ActivityController.java
@@ -2,13 +2,19 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.goods.service.activity.ActivityGoodsService;
+import com.ruoyi.goods.service.activity.ActivityRecordService;
+import com.ruoyi.goods.service.activity.ActivityService;
+import com.ruoyi.system.api.domain.dto.ActivityGoodsGetDto;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
+import com.ruoyi.system.api.domain.vo.ActivityGoodsGetVo;
+import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.List;
/**
* @author jqs34
@@ -21,15 +27,68 @@
@RequestMapping("/activity")
public class ActivityController {
-
+ @Resource
+ private ActivityService activityService;
@Resource
private ActivityGoodsService activityGoodsService;
+ @Resource
+ private ActivityRecordService activityRecordService;
+
+ /**
+ * @description 通过活动id和商品id获取活动商品信息
+ * @author jqs
+ * @date 2023/7/6 16:16
+ * @param activityGoodsGetDto
+ * @return R<ActivityGoods>
+ */
@PostMapping("/getActivityGoods")
- public R<ActivityGoods> getActivityGoods(@RequestBody String goodsId)
+ public R<ActivityGoods> getActivityGoods(@RequestBody ActivityGoodsGetDto activityGoodsGetDto)
{
- ActivityGoods activityGoods = activityGoodsService.getByGoodsId(goodsId);
+ ActivityGoods activityGoods = activityGoodsService.getByGoodsId(activityGoodsGetDto.getActivityId(),activityGoodsGetDto.getGoodsId());
return R.ok(activityGoods);
}
+
+ /**
+ * @description 通过活动id获取参与活动用户id
+ * @author jqs
+ * @date 2023/6/13 18:19
+ * @param activityId
+ * @return R<List<Long>>
+ */
+ @PostMapping("/listUserIdByActivityId")
+ public R<List<Long>> listUserIdByActivityId(@RequestBody String activityId)
+ {
+ List<Long> userIdList = activityRecordService.listUserIdByActivityId(activityId);
+ return R.ok(userIdList);
+ }
+
+ /**
+ * @description boardOrderTotal
+ * @param
+ * @return R<MgtBulletinBoardVo>
+ * @author jqs34
+ * @date 2023/6/18 17:30
+ */
+ @PostMapping("/boardActivityTotal")
+ public R<MgtBulletinBoardVo> boardActivityTotal(){
+ MgtBulletinBoardVo mgtBulletinBoardVo = activityRecordService.boardActivityTotal();
+ return R.ok(mgtBulletinBoardVo);
+ }
+
+
+ /**
+ * @description 获取用户活动商品信息
+ * @author jqs
+ * @date 2023/7/6 16:16
+ * @param activityGoodsGetDto
+ * @return R<ActivityGoodsGetVo>
+ */
+ @PostMapping("/getUserActivityGoods")
+ public R<ActivityGoodsGetVo> getUserActivityGoods(@RequestBody ActivityGoodsGetDto activityGoodsGetDto){
+ ActivityGoodsGetVo activityGoodsGetVo = activityService.getUserActivityGoods(activityGoodsGetDto);
+ return R.ok(activityGoodsGetVo);
+ }
+
}
--
Gitblit v1.7.1