yitisheng
/
yitisheng-new-api
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates

This commit is contained in:
zhouwentao 2024-03-20 16:49:04 +08:00
parent cd8243e09f
commit 705e17684a
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/service/MiniUserService.java
View File

@ -55,10 +55,17 @@ public class MiniUserService {
//先判断是不是VIP激活的
List<YxVipCard> 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();
}
}
//判断支付订单中的

3
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVipCardServiceImpl.java
View File

@ -71,7 +71,8 @@ public class YxVipCardServiceImpl extends ServiceImpl<YxVipCardMapper, YxVipCard
}
LambdaQueryWrapper<YxVipCard> yxVipCardLambdaQueryWrapper = new LambdaQueryWrapper<>();
yxVipCardLambdaQueryWrapper.eq(YxVipCard::getUserId,userId);
yxVipCardLambdaQueryWrapper.orderByDesc(YxVipCard::getUsedTime);
yxVipCardLambdaQueryWrapper.orderByAsc(YxVipCard::getValidDate);
//yxVipCardLambdaQueryWrapper.orderByDesc(YxVipCard::getUsedTime);
return this.list(yxVipCardLambdaQueryWrapper);
}