From ef66972437dce1d459409415add4f08f1c1629c8 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 03 十二月 2024 16:07:18 +0800
Subject: [PATCH] 1.分佣延迟队列

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
index 003c5b0..1846885 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
@@ -7,6 +7,7 @@
 import com.ruoyi.account.api.model.UserCoupon;
 import com.ruoyi.account.api.model.UserPoint;
 import com.ruoyi.account.api.vo.CouponInfoVo;
+import com.ruoyi.account.api.vo.PaymentUserCouponVo;
 import com.ruoyi.account.service.AppUserService;
 import com.ruoyi.account.service.UserCouponService;
 import com.ruoyi.account.service.UserPointService;
@@ -145,10 +146,25 @@
 	 */
 	@ResponseBody
 	@PostMapping("/getPaymentUserCoupon")
-	public R<List<CouponInfoVo>> getPaymentUserCoupon(@RequestBody PaymentUserCoupon paymentUserCoupon){
-		List<CouponInfoVo> userCoupon = userCouponService.getUserCoupon(paymentUserCoupon.getUserId(), paymentUserCoupon.getOrderMoney(), paymentUserCoupon.getType());
+	public R<List<PaymentUserCouponVo>> getPaymentUserCoupon(@RequestBody PaymentUserCoupon paymentUserCoupon){
+		List<PaymentUserCouponVo> userCoupon = userCouponService.getUserCoupon(paymentUserCoupon.getUserId(), paymentUserCoupon.getType());
 		return R.ok(userCoupon);
 	}
-
+    
+    
+    /**
+     * 根据用户优惠券id获取优惠券详情
+     * @param userCouponId
+     * @return
+     */
+    @ResponseBody
+    @PostMapping("/getCouponInfo")
+    public R<CouponInfoVo> getCouponInfo(@RequestParam("userCouponId") Long userCouponId){
+        UserCoupon userCoupon = userCouponService.getById(userCouponId);
+        CouponInfo data = couponClient.detail(userCoupon.getCouponId()).getData();
+        CouponInfoVo couponInfoVo = new CouponInfoVo();
+        BeanUtils.copyProperties(data, couponInfoVo);
+        return R.ok(couponInfoVo);
+    }
 }
 

--
Gitblit v1.7.1