From fd7bde636229e0d293add3fc8241b2679fa71639 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 27 九月 2023 15:26:06 +0800
Subject: [PATCH] 活动商品搜索bug
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteActivityService.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteActivityService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteActivityService.java
index 4c87d9d..6ee0221 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteActivityService.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteActivityService.java
@@ -5,6 +5,8 @@
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.Activity;
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;
@@ -121,4 +123,23 @@
public R delActivityRecord(@RequestBody ActivityRecord activityRecord);
+ /**
+ * @description 判断商户是否在活动范围
+ * @author jqs
+ * @date 2023/9/7 14:12
+ * @param merActivityShopDto
+ * @return R<Boolean>
+ */
+ @PostMapping("/activity/judgeActivityShop")
+ public R<Boolean> judgeActivityShop(@RequestBody MerActivityShopDto merActivityShopDto);
+
+ /**
+ * @description 通过id获取活动
+ * @author jqs
+ * @date 2023/9/20 20:05
+ * @param activityId
+ * @return R<Activity>
+ */
+ @PostMapping("/activity/getActivity")
+ public R<Activity> getActivity(@RequestBody String activityId);
}
--
Gitblit v1.7.1