From 57c69219eb101c5ecc577a77882febf0cded1aed Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 30 六月 2025 11:02:18 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ActivityController.java | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 109 insertions(+), 0 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 4e82059..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,11 +1,16 @@
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;
@@ -91,4 +96,108 @@
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