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/RemoteCouponService.java | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 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..d704158 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 获取核销优惠券
@@ -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