From 08b55c9949f3980562ff46d0b624263b1e6be790 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 02 十二月 2024 15:20:18 +0800
Subject: [PATCH] 1.用户表添加账户余额

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java |   25 ++++++++++++++++++++++---
 1 files changed, 22 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 f0a9b72..dd9e7ff 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,12 +7,21 @@
 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;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.bean.BeanUtils;
+import com.ruoyi.account.api.vo.CouponInfoVo;
+import com.ruoyi.account.api.vo.PaymentUserCoupon;
+import com.ruoyi.account.service.UserCouponService;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.domain.AjaxResult;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
 import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.other.api.domain.Banner;
 import com.ruoyi.other.api.domain.CouponInfo;
@@ -128,9 +137,19 @@
 
     }
 
-
-
-
+	
+	
+	/**
+	 * 获取支付页面用户优惠券列表数据
+	 * @param paymentUserCoupon
+	 * @return
+	 */
+	@ResponseBody
+	@PostMapping("/getPaymentUserCoupon")
+	public R<List<PaymentUserCouponVo>> getPaymentUserCoupon(@RequestBody PaymentUserCoupon paymentUserCoupon){
+		List<PaymentUserCouponVo> userCoupon = userCouponService.getUserCoupon(paymentUserCoupon.getUserId(), paymentUserCoupon.getOrderMoney(), paymentUserCoupon.getType());
+		return R.ok(userCoupon);
+	}
 
 }
 

--
Gitblit v1.7.1