From 56d62d9edb0dda9ae678dcea2323144db5d11c22 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 28 十二月 2024 18:06:58 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java | 7 ++++---
1 files changed, 4 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 3428da9..8176748 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
@@ -121,7 +121,8 @@
Long userid = tokenService.getLoginUserApplet().getUserid();
AppUser byId = appUserService.getById(userid);
- CouponInfo data = couponClient.detail(couponId).getData();
+ R<CouponInfo> detail = couponClient.detail(couponId);
+ CouponInfo data = detail.getData();
//检验当前优惠券是否存在
if (data==null){
return R.fail("当前优惠券不存在，请刷新后重试");
@@ -155,8 +156,8 @@
UserCoupon userCoupon = new UserCoupon();
userCoupon.setAppUserId(userid);
if (data.getPeriodType()==1) {
- userCoupon.setStartTime(data.getPeriodStartTime().atTime(0,0,0));
- userCoupon.setEndTime(data.getPeriodEndTime().atTime(0,0,0));
+ userCoupon.setStartTime(data.getPeriodStartTime().atTime(0, 0, 0));
+ userCoupon.setEndTime(data.getPeriodEndTime().atTime(23, 59, 59));
}else {
userCoupon.setStartTime(now);
userCoupon.setEndTime(now.plusDays(data.getPeriodDays()));
--
Gitblit v1.7.1