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-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteActivityService.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 47 insertions(+), 2 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 b8c0948..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,7 +5,10 @@ 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; import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo; import com.ruoyi.system.api.factory.RemoteActivityFallbackFactory; @@ -85,7 +88,7 @@ * @param activityId * @return R */ - @PostMapping("/startActivity") + @PostMapping("/activity/startActivity") public R startActivity(@RequestBody String activityId); /** @@ -95,6 +98,48 @@ * @param activityId * @return R */ - @PostMapping("/endActivity") + @PostMapping("/activity/endActivity") public R endActivity(@RequestBody String activityId); + + /** + * @description 添加活动记录 + * @author jqs + * @date 2023/7/25 14:00 + * @param activityRecord + * @return R + */ + @PostMapping("/activity/addActivityRecord") + public R addActivityRecord(@RequestBody ActivityRecord activityRecord); + + + /** + * @description 删除活动记录 + * @author jqs + * @date 2023/7/25 14:23 + * @param activityRecord + * @return R + */ + @PostMapping("/activity/delActivityRecord") + 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