From a61d4ee3b541da5773d0e498c3d36c5bd446a2b6 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 一月 2025 14:34:06 +0800
Subject: [PATCH] 修改
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserCouponServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserCouponServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserCouponServiceImpl.java
index 2dc890d..9c18143 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserCouponServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserCouponServiceImpl.java
@@ -52,7 +52,7 @@
}
List<CouponInfo> couponInfoList = couponInfoClient.getCouponInfoList(couponIds).getData();
//构建返回数据
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd HH:mm");
List<PaymentUserCouponVo> infoVoList = new ArrayList<>();
for (UserCoupon userCoupon : list) {
CouponInfo couponInfo = couponInfoList.stream().filter(s -> s.getId().equals(userCoupon.getCouponId())).findFirst().get();
@@ -68,8 +68,10 @@
couponInfoVo.setDiscountAmount(couponInfo.getDiscountAmount());
couponInfoVo.setMoneyAmount(couponInfo.getMoneyAmount());
couponInfoVo.setDiscount(couponInfo.getDiscount());
- couponInfoVo.setPeriodStartTime(couponInfo.getPeriodStartTime().format(formatter));
- couponInfoVo.setPeriodEndTime(couponInfo.getPeriodEndTime().format(formatter));
+ if(null != userCoupon.getStartTime()){
+ couponInfoVo.setPeriodStartTime(userCoupon.getStartTime().format(formatter));
+ couponInfoVo.setPeriodEndTime(userCoupon.getEndTime().format(formatter));
+ }
String forGoodIds = couponInfo.getForGoodIds();
String[] split = forGoodIds.split(",");
if("-1".equals(forGoodIds)){
--
Gitblit v1.7.1