From 22be02314dae32d2fcfa2f3f31e7213cbbca5260 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 15 一月 2025 15:34:49 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserCouponServiceImpl.java | 69 ++++++++++++++++++++++++++++++++++
1 files changed, 68 insertions(+), 1 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 607932c..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
@@ -1,10 +1,25 @@
package com.ruoyi.account.service.impl;
+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.PaymentUserCouponVo;
import com.ruoyi.account.mapper.UserCouponMapper;
import com.ruoyi.account.api.model.UserCoupon;
import com.ruoyi.account.service.UserCouponService;
+import com.ruoyi.other.api.domain.CouponInfo;
+import com.ruoyi.other.api.feignClient.CouponInfoClient;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+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>
@@ -16,5 +31,57 @@
*/
@Service
public class UserCouponServiceImpl extends ServiceImpl<UserCouponMapper, UserCoupon> implements UserCouponService {
-
+
+ @Resource
+ private CouponInfoClient couponInfoClient;
+
+
+
+ /**
+ * 获取支付页面的优惠券列表数据
+ * @param userId
+ * @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)
+ .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 HH:mm");
+ List<PaymentUserCouponVo> infoVoList = new ArrayList<>();
+ for (UserCoupon userCoupon : list) {
+ CouponInfo couponInfo = couponInfoList.stream().filter(s -> s.getId().equals(userCoupon.getCouponId())).findFirst().get();
+ //排除商品券（商品券线下领取）
+ if(4 == couponInfo.getCouponType()){
+ continue;
+ }
+ PaymentUserCouponVo couponInfoVo = new PaymentUserCouponVo();
+ 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());
+ 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(Arrays.asList(split));
+ }
+ couponInfoVo.setAvailable(false);
+ infoVoList.add(couponInfoVo);
+ }
+ return infoVoList;
+ }
}
--
Gitblit v1.7.1