From 0b956579c125f41f27d1e09ecae5853926ef19fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 18 三月 2024 15:48:57 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteCouponService.java | 16 ++++++++++++++--
1 files changed, 14 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 686183a..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
@@ -4,6 +4,7 @@
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;
@@ -25,7 +26,7 @@
/**
* 通过userid获取用户优惠
- * @param userId
+ * @param merBaseDto
* @return
*/
@PostMapping("/coupon/listVoMemberCouponByUserId")
@@ -39,7 +40,7 @@
* @return R<MerVerifyCouponGetVo>
*/
@PostMapping("/coupon/getVerifyCoupon")
- public R<MerVerifyCouponGetVo> getVerifyCoupon(@RequestBody String verifyCoupon);
+ public R<MerVerifyCouponGetVo> getVerifyCoupon(@RequestBody Long verifyCoupon);
/**
* @description 发送用户优惠券礼物
@@ -80,4 +81,15 @@
*/
@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