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/RemoteCouponService.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 46 insertions(+), 3 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteCouponService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteCouponService.java index 849b0f9..04c6e7d 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteCouponService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteCouponService.java @@ -3,6 +3,8 @@ import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; import com.ruoyi.system.api.domain.dto.BirthdayGiftSendDto; +import com.ruoyi.system.api.domain.dto.MerBaseDto; +import com.ruoyi.system.api.domain.dto.MerVerifyMemberCouponDto; import com.ruoyi.system.api.domain.vo.AppMemberCouponVo; import com.ruoyi.system.api.domain.vo.MerVerifyCouponGetVo; import com.ruoyi.system.api.factory.RemoteCouponFallbackFactory; @@ -24,11 +26,11 @@ /** * 通过userid获取用户优惠 - * @param userId + * @param merBaseDto * @return */ @PostMapping("/coupon/listVoMemberCouponByUserId") - public R<List<AppMemberCouponVo>> listVoMemberCouponByUserId(@RequestBody Long userId); + public R<List<AppMemberCouponVo>> listVoMemberCouponByUserId(@RequestBody MerBaseDto merBaseDto); /** * @description 获取核销优惠券 @@ -38,7 +40,7 @@ * @return R<MerVerifyCouponGetVo> */ @PostMapping("/coupon/getVerifyCoupon") - public R<MerVerifyCouponGetVo> getVerifyCoupon(@RequestBody String verifyCoupon); + public R<MerVerifyCouponGetVo> getVerifyCoupon(@RequestBody Long verifyCoupon); /** * @description 发送用户优惠券礼物 @@ -49,4 +51,45 @@ */ @PostMapping("/coupon/sendCouponGift") public R sendCouponGift(@RequestBody List<BirthdayGiftSendDto> giftSendDtoList); + + /** + * @description 定时发送优惠券 + * @author jqs + * @date 2023/7/12 11:56 + * @param couponId + * @return R + */ + @PostMapping("/coupon/autoTimeSendCoupon") + public R autoTimeSendCoupon(@RequestBody String couponId); + + /** + * @description 使用优惠券 + * @author jqs + * @date 2023/7/13 19:38 + * @param memberCouponIds + * @return R + */ + @PostMapping("/coupon/useMemberCoupon") + public R useMemberCoupon(@RequestBody String memberCouponIds); + + /** + * @description 回退优惠券 + * @author jqs + * @date 2023/7/13 20:01 + * @param memberCouponIds + * @return R + */ + @PostMapping("/coupon/backMemberCoupon") + public R backMemberCoupon(@RequestBody String memberCouponIds); + + + /** + * @description 确认核销优惠券 + * @author jqs + * @date 2023/8/15 11:37 + * @param merVerifyMemberCouponDto + * @return R + */ + @PostMapping("/coupon/verifyMemberCoupon") + public R sureMemberCoupon(@RequestBody MerVerifyMemberCouponDto merVerifyMemberCouponDto); } -- Gitblit v1.7.1