From 03f1f3372a10a08f96f3308bfa099e86a55046d0 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期二, 30 一月 2024 09:32:38 +0800 Subject: [PATCH] 修改数据权限bug --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteActivityService.java | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 101 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 f9db9d3..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 @@ -2,7 +2,14 @@ import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; +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; import org.springframework.cloud.openfeign.FeignClient; @@ -22,7 +29,7 @@ public interface RemoteActivityService { @PostMapping("/activity/getActivityGoods") - public R<ActivityGoods> getActivityGoods(@RequestBody String goodsId); + public R<ActivityGoods> getActivityGoods(@RequestBody ActivityGoodsGetDto activityGoodsGetDto); /** * @description 通过活动id获取参与活动用户id @@ -41,6 +48,98 @@ * @author jqs34 * @date 2023/6/18 17:30 */ - @PostMapping("/boardActivityTotal") + @PostMapping("/activity/boardActivityTotal") public R<MgtBulletinBoardVo> boardActivityTotal(); + + /** + * @description 获取用户活动商品信息 + * @author jqs + * @date 2023/7/6 16:16 + * @param activityGoodsGetDto + * @return R<ActivityGoodsGetVo> + */ + @PostMapping("/activity/getUserActivityGoods") + public R<ActivityGoodsGetVo> getUserActivityGoods(@RequestBody ActivityGoodsGetDto activityGoodsGetDto); + + /** + * @description 更新活动库存 + * @author jqs + * @date 2023/7/13 15:39 + * @param agStockChangeDto + * @return R + */ + @PostMapping("/activity/changeActivityStock") + public R changeActivityStock(@RequestBody AGStockChangeDto agStockChangeDto); + + /** + * @description 更新活动统计 + * @author jqs + * @date 2023/7/13 16:12 + * @param activityTotalChangeDto + * @return R + */ + @PostMapping("/activity/changeActivityTotal") + public R changeActivityTotal(@RequestBody ActivityTotalChangeDto activityTotalChangeDto); + + /** + * @description 开始活动 + * @author jqs + * @date 2023/7/12 20:30 + * @param activityId + * @return R + */ + @PostMapping("/activity/startActivity") + public R startActivity(@RequestBody String activityId); + + /** + * @description 结束活动 + * @author jqs + * @date 2023/7/12 20:30 + * @param activityId + * @return R + */ + @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