From afa0dbb4f54e7244835dd67ec33c3e545f122f71 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 一月 2025 16:40:43 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ActivityController.java | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 171 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..b91feff 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
@@ -1,14 +1,25 @@
package com.ruoyi.goods.controller.concole;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.domain.poji.activity.Activity;
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.AGStockChangeDto;
+import com.ruoyi.system.api.domain.dto.ActivityGoodsGetDto;
+import com.ruoyi.system.api.domain.dto.ActivityTotalChangeDto;
+import com.ruoyi.system.api.domain.dto.MerActivityShopDto;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
+import com.ruoyi.system.api.domain.poji.activity.ActivityRecord;
+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 +32,172 @@
@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);
+ }
+
+ /**
+ * @description 开始活动
+ * @author jqs
+ * @date 2023/7/12 20:30
+ * @param activityId
+ * @return R
+ */
+ @PostMapping("/startActivity")
+ public R startActivity(@RequestBody String activityId){
+
+ activityService.startActivity(activityId);
+ return R.ok();
+ }
+
+ /**
+ * @description 结束活动
+ * @author jqs
+ * @date 2023/7/12 20:30
+ * @param activityId
+ * @return R
+ */
+ @PostMapping("/endActivity")
+ public R endActivity(@RequestBody String activityId){
+ activityService.endActivity(activityId);
+ return R.ok();
+ }
+
+ /**
+ * @description 更新活动库存
+ * @author jqs
+ * @date 2023/7/13 15:39
+ * @param agStockChangeDto
+ * @return R
+ */
+ @PostMapping("/changeActivityStock")
+ public R changeActivityStock(@RequestBody AGStockChangeDto agStockChangeDto){
+ activityService.changeActivityStock(agStockChangeDto);
+ return R.ok();
+ }
+
+ /**
+ * @description 更新活动统计
+ * @author jqs
+ * @date 2023/7/13 16:12
+ * @param activityTotalChangeDto
+ * @return R
+ */
+ @PostMapping("/changeActivityTotal")
+ public R changeActivityTotal(@RequestBody ActivityTotalChangeDto activityTotalChangeDto){
+ activityService.changeActivityTotal(activityTotalChangeDto);
+ return R.ok();
+ }
+
+ /**
+ * @description 添加活动记录
+ * @author jqs
+ * @date 2023/7/25 14:00
+ * @param activityRecord
+ * @return R
+ */
+ @PostMapping("/addActivityRecord")
+ public R addActivityRecord(@RequestBody ActivityRecord activityRecord){
+ activityRecordService.save(activityRecord);
+ return R.ok();
+ }
+
+ /**
+ * @description 删除活动记录
+ * @author jqs
+ * @date 2023/7/25 14:23
+ * @param activityRecord
+ * @return R
+ */
+ @PostMapping("/delActivityRecord")
+ public R delActivityRecord(@RequestBody ActivityRecord activityRecord){
+ activityRecordService.delActivityRecord(activityRecord);
+ return R.ok();
+ }
+
+ /**
+ * @description 判断商户是否在活动范围
+ * @author jqs
+ * @date 2023/9/7 14:12
+ * @param merActivityShopDto
+ * @return R<Boolean>
+ */
+ @PostMapping("/judgeActivityShop")
+ public R<Boolean> judgeActivityShop(@RequestBody MerActivityShopDto merActivityShopDto){
+ Boolean judge = activityService.judgeActivityShop(merActivityShopDto);
+ return R.ok(judge);
+ }
+
+ /**
+ * @description 通过id获取活动
+ * @author jqs
+ * @date 2023/9/20 20:05
+ * @param activityId
+ * @return R<Activity>
+ */
+ @PostMapping("/getActivity")
+ public R<Activity> getActivity(@RequestBody String activityId){
+ Activity activity = activityService.getById(activityId);
+ return R.ok(activity);
+ }
}
--
Gitblit v1.7.1