From f147a6ae7f543f6db757b3933adaf8f10b896ccf Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 20 一月 2025 19:23:17 +0800
Subject: [PATCH] 合并代码
---
cloud-server-course/src/main/java/com/dsh/course/feignclient/activity/CouponClient.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/feignclient/activity/CouponClient.java b/cloud-server-course/src/main/java/com/dsh/course/feignclient/activity/CouponClient.java
index 14d78a6..4b535a7 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/feignclient/activity/CouponClient.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/feignclient/activity/CouponClient.java
@@ -5,6 +5,7 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
+import java.util.List;
import java.util.Map;
/**
@@ -17,12 +18,27 @@
/**
* 根据id获取优惠券
+ *
* @param id
* @return
*/
@PostMapping("/coupon/queryCouponById")
Coupon queryCouponById(Integer id);
+ /**
+ * 根据领取优惠券记录id获取优惠券
+ *
+ * @param id
+ * @return
+ */
+ @PostMapping("/coupon/queryUserCouponById")
+ Integer queryUserCouponById(Long id);
@PostMapping("/base/userConpon/queryCouponRules")
- Map<String,Object> getCouponRules(@RequestBody Integer couponId);
+ Map<String, Object> getCouponRules(@RequestBody Integer couponId);
+
+ @PostMapping("/base/userConpon/getCoupons")
+ List<Coupon> getCoupons(String couponIds);
+
+ @PostMapping("/coupon/queryCouponByUid")
+ List<Coupon> queryCouponByUid(Integer uid);
}
--
Gitblit v1.7.1