From 63dbede8fd302de185b4ea7e085cbc9fab7419ec Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 13 一月 2025 11:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/UserCouponClient.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/UserCouponClient.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/UserCouponClient.java
index 6f75679..2a05f83 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/UserCouponClient.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/UserCouponClient.java
@@ -1,6 +1,7 @@
 package com.ruoyi.account.api.feignClient;
 
 import com.ruoyi.account.api.factory.UserCouponClientFallbackFactory;
+import com.ruoyi.account.api.model.UserCoupon;
 import com.ruoyi.account.api.vo.CouponInfoVo;
 import com.ruoyi.account.api.vo.PaymentUserCoupon;
 import com.ruoyi.account.api.vo.PaymentUserCouponVo;
@@ -40,4 +41,22 @@
 
 	@GetMapping("/user-coupon/getCouponCount")
 	R<Long> getCouponCount(@RequestParam("couponId") Integer couponId);
+
+
+	/**
+	 * 获取用户优惠券
+	 * @param id
+	 * @return
+	 */
+	@PostMapping("/user-coupon/getUserCoupon")
+	R<UserCoupon> getUserCoupon(@RequestParam("id") Long id);
+
+
+	/**
+	 * 编辑用户优惠券
+	 * @param userCoupon
+	 * @return
+	 */
+	@PostMapping("/user-coupon/editUserCoupon")
+	R editUserCoupon(@RequestBody UserCoupon userCoupon);
 }

--
Gitblit v1.7.1