From fc633fca328b68ca22182441340d384ca27dba55 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 16 一月 2025 18:14:37 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserCouponServiceImpl.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 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 b1c2894..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
@@ -3,7 +3,6 @@
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.api.vo.CouponInfoVo;
import com.ruoyi.account.api.vo.PaymentUserCouponVo;
import com.ruoyi.account.mapper.UserCouponMapper;
import com.ruoyi.account.api.model.UserCoupon;
@@ -13,12 +12,14 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.time.Instant;
+import java.time.LocalDateTime;
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>
@@ -39,20 +40,19 @@
/**
* 获取支付页面的优惠券列表数据
* @param userId
- * @param orderMoney
* @return
*/
@Override
public List<PaymentUserCouponVo> getUserCoupon(Long userId, Integer type) {
List<UserCoupon> list = this.list(new LambdaQueryWrapper<UserCoupon>().eq(UserCoupon::getAppUserId, userId).eq(UserCoupon::getDelFlag, 0)
- .last(" and now() between start_time and end_time"));
+ .isNull(UserCoupon::getUseTime).gt(UserCoupon::getEndTime, LocalDateTime.now()).last(" and now() between start_time and end_time"));
List<Integer> couponIds = list.stream().map(UserCoupon::getCouponId).collect(Collectors.toList());
if(couponIds.size() == 0){
return null;
}
List<CouponInfo> couponInfoList = couponInfoClient.getCouponInfoList(couponIds).getData();
//构建返回数据
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ 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();
@@ -61,21 +61,23 @@
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.setPeriodEndTime(couponInfo.getPeriodEndTime().format(formatter));
- String forGoodIds = couponInfo.getForGoodIds();
- Integer instant = JSON.parseArray(forGoodIds).getInteger(0);
- if(-1 == instant){
+ 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)){
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