From 705e17684a227e30ee1cfd9b24d7386eb69ccfc4 Mon Sep 17 00:00:00 2001 From: zhouwentao <1577701412@qq.com> Date: Wed, 20 Mar 2024 16:49:04 +0800 Subject: [PATCH] updates --- .../modules/mini/service/MiniUserService.java | 15 +++++++++++---- .../yx/service/impl/YxVipCardServiceImpl.java | 3 ++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniUserService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniUserService.java index d6a0348..3579321 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniUserService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniUserService.java @@ -55,10 +55,17 @@ public class MiniUserService { //先判断是不是VIP激活的 List vipCardList = yxVipCardService.selectByUserId(userId); if (CollectionUtils.isNotEmpty(vipCardList)) { - YxVipCard yxVipCard = vipCardList.get(0); - skuCode =yxVipCard.getSkuCode(); - validTime = yxVipCard.getValidDate(); - activationTime = yxVipCard.getUsedTime(); + for (YxVipCard yxVipCard : vipCardList) { + if (yxVipCard.getValidDate()==null) { + continue; + } + if (yxVipCard.getValidDate().getTime()<=new Date().getTime()) { + continue; + } + skuCode =yxVipCard.getSkuCode(); + validTime = yxVipCard.getValidDate(); + activationTime = yxVipCard.getUsedTime(); + } } //判断支付订单中的 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVipCardServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVipCardServiceImpl.java index 02778ae..b4f8a17 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVipCardServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVipCardServiceImpl.java @@ -71,7 +71,8 @@ public class YxVipCardServiceImpl extends ServiceImpl yxVipCardLambdaQueryWrapper = new LambdaQueryWrapper<>(); yxVipCardLambdaQueryWrapper.eq(YxVipCard::getUserId,userId); - yxVipCardLambdaQueryWrapper.orderByDesc(YxVipCard::getUsedTime); + yxVipCardLambdaQueryWrapper.orderByAsc(YxVipCard::getValidDate); + //yxVipCardLambdaQueryWrapper.orderByDesc(YxVipCard::getUsedTime); return this.list(yxVipCardLambdaQueryWrapper); }