From 64251287f735a6a26bc585a8ca593c3936113137 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 07 九月 2023 18:04:47 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ActivityController.java | 15 +++++++++++++++
1 files changed, 15 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 4142726..f68cebe 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
@@ -7,6 +7,7 @@
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;
@@ -172,4 +173,18 @@
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);
+ }
+
}
--
Gitblit v1.7.1