From 32291a03e69e7c3bdb627c893d52eebde0b140fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 十月 2024 14:20:36 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppCouponClient.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppCouponClient.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppCouponClient.java
index 00990ee..9444f2b 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppCouponClient.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppCouponClient.java
@@ -43,7 +43,7 @@
* @return
*/
@PostMapping("/t-app-coupon/getExchangeRecordByCouponId")
- R<PageInfo<ExchangeRecordVO>> getExchangeRecordByCouponId(@RequestBody ExchangeRecordGoodsQuery couponId);
+ R<List<ExchangeRecordVO>> getExchangeRecordByCouponId(@RequestBody ExchangeRecordGoodsQuery couponId);
/**
* 后台远程调用 给用户发放优惠券
*/
@@ -62,4 +62,13 @@
*/
@PostMapping(value = "/t-app-coupon/getAppCouponById")
R<TAppCoupon> getAppCouponById(@RequestParam("id") Long id);
+
+
+ /**
+ * 修改用户优惠券
+ * @param appCoupon
+ * @return
+ */
+ @PostMapping(value = "/t-app-coupon/updateAppCoupon")
+ R updateAppCoupon(@RequestBody TAppCoupon appCoupon);
}
--
Gitblit v1.7.1