From cfa7d0a90e7da9b52606ab8fca364fa5bddddcd4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 28 八月 2025 20:14:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-course/src/main/java/com/dsh/course/feignclient/activity/UserCouponClient.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/feignclient/activity/UserCouponClient.java b/cloud-server-course/src/main/java/com/dsh/course/feignclient/activity/UserCouponClient.java
index 704dc64..eb9dbef 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/feignclient/activity/UserCouponClient.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/feignclient/activity/UserCouponClient.java
@@ -3,7 +3,9 @@
import com.dsh.course.feignclient.activity.model.SendCouponReq;
import com.dsh.course.feignclient.activity.model.UserCoupon;
import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* @author zhibing.pu
@@ -15,16 +17,29 @@
/**
* 根据id获取用户优惠券数据
+ *
* @param id
* @return
*/
- @PostMapping("/userCoupon/queryUserCouponById")
+ @PostMapping("/userCoupon/queryUserCouponById1")
UserCoupon queryUserCouponById(Long id);
+ /**
+ * 根据id获取用户优惠券数据
+ *
+ * @param id
+ * @return
+ */
+ @PostMapping("/userCoupon/updateUserCouponStatus/{id}/{storeId}/{siteId}")
+ void updateUserCouponStatus(@PathVariable("id") Long id,@PathVariable("storeId") Integer storeId,@PathVariable("siteId") Integer siteId);
/**
* 送优惠券
+ *
* @param sendCouponReq
*/
@PostMapping("/userCoupon/sendUserCoupon")
void sendUserCoupon(SendCouponReq sendCouponReq);
+
+ @PostMapping("/userCoupon/edit")
+ void edit(@RequestBody UserCoupon userCoupon);
}
--
Gitblit v1.7.1