From 9ac3c5efd5860bef93ad654d28b4a3bcda729736 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 09 六月 2025 14:02:12 +0800
Subject: [PATCH] 开发商户端相关接口

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteCouponService.java |   31 ++++++++++++++++++++++++++++---
 1 files changed, 28 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 440d8e3..2194ecd 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,12 +3,15 @@
 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;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -24,11 +27,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 +41,7 @@
      * @return  R<MerVerifyCouponGetVo>
      */
     @PostMapping("/coupon/getVerifyCoupon")
-    public R<MerVerifyCouponGetVo> getVerifyCoupon(@RequestBody String verifyCoupon);
+    public R<MerVerifyCouponGetVo> getVerifyCoupon(@RequestBody Long verifyCoupon);
 
     /**
      * @description  发送用户优惠券礼物
@@ -79,4 +82,26 @@
      */
     @PostMapping("/coupon/backMemberCoupon")
     public R backMemberCoupon(@RequestBody String memberCouponIds);
+    
+    
+    /**
+     * @param merVerifyMemberCouponDto
+     * @return R
+     * @description 确认核销优惠券
+     * @author jqs
+     * @date 2023/8/15 11:37
+     */
+    @PostMapping("/coupon/verifyMemberCoupon")
+    public R sureMemberCoupon(@RequestBody MerVerifyMemberCouponDto merVerifyMemberCouponDto);
+    
+    
+    /**
+     * 手动添加用户优惠券
+     *
+     * @param couponId
+     * @param number
+     * @return
+     */
+    @PostMapping("/coupon/addMemberCoupon")
+    R addMemberCoupon(@RequestParam("couponId") String couponId, @RequestParam("number") Integer number, @RequestParam("userId") Long userId);
 }

--
Gitblit v1.7.1