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/service/impl/UserCouponServiceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 f7ed6b2..c3d6242 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
@@ -14,8 +14,11 @@
import javax.annotation.Resource;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
+
+import static org.aspectj.util.LangUtil.split;
/**
* <p>
@@ -58,21 +61,21 @@
continue;
}
PaymentUserCouponVo couponInfoVo = new PaymentUserCouponVo();
- couponInfoVo.setId(userCoupon.getId());
+ couponInfoVo.setId(userCoupon.getId().toString());
couponInfoVo.setName(couponInfo.getCouponName());
couponInfoVo.setCouponType(couponInfo.getCouponType());
couponInfoVo.setConditionAmount(couponInfo.getConditionAmount());
couponInfoVo.setDiscountAmount(couponInfo.getDiscountAmount());
couponInfoVo.setMoneyAmount(couponInfo.getMoneyAmount());
couponInfoVo.setDiscount(couponInfo.getDiscount());
- couponInfoVo.setPeriodEndTime(couponInfo.getPeriodStartTime().format(formatter));
+ couponInfoVo.setPeriodStartTime(couponInfo.getPeriodStartTime().format(formatter));
couponInfoVo.setPeriodEndTime(couponInfo.getPeriodEndTime().format(formatter));
- String forGoodIds = couponInfo.getForGoodIds();
- Integer instant = JSON.parseArray(forGoodIds).getInteger(0);
- if(-1 == instant){
+ String forGoodIds = couponInfo.getForGoodIds();
+ String[] split = forGoodIds.split(",");
+ if("-1".equals(forGoodIds)){
couponInfoVo.setForGoodIds(null);
}else{
- couponInfoVo.setForGoodIds(JSON.parseArray(forGoodIds, Integer.class));
+ couponInfoVo.setForGoodIds(Arrays.asList(split));
}
couponInfoVo.setAvailable(false);
infoVoList.add(couponInfoVo);
--
Gitblit v1.7.1