diff --git a/src/main/java/com/gxwebsoft/booking/service/impl/CardServiceImpl.java b/src/main/java/com/gxwebsoft/booking/service/impl/CardServiceImpl.java index 2a13be6..3acbd72 100644 --- a/src/main/java/com/gxwebsoft/booking/service/impl/CardServiceImpl.java +++ b/src/main/java/com/gxwebsoft/booking/service/impl/CardServiceImpl.java @@ -37,7 +37,7 @@ public class CardServiceImpl extends ServiceImpl implements Ca // 只显示可购买的会员卡 if(param.getSceneType() != null && param.getSceneType().equals("showCanBuyVipCard")){ - final List userCardList = userCardService.list(new LambdaUpdateWrapper().eq(UserCard::getUserId, param.getBuyUserId())); + final List userCardList = userCardService.list(new LambdaUpdateWrapper().eq(UserCard::getUserId, param.getBuyUserId()).eq(UserCard::getPayStatus,1)); final Set collect = userCardList.stream().map(UserCard::getCardId).collect(Collectors.toSet()); if (!CollectionUtils.isEmpty(collect)) { param.setCardIds(collect); diff --git a/src/main/java/com/gxwebsoft/shop/task/OrderTask.java b/src/main/java/com/gxwebsoft/shop/task/OrderTask.java index 1334f42..69a9e57 100644 --- a/src/main/java/com/gxwebsoft/shop/task/OrderTask.java +++ b/src/main/java/com/gxwebsoft/shop/task/OrderTask.java @@ -29,7 +29,7 @@ public class OrderTask extends BaseController { /** * 自动处理过期订单任务 */ -// @Scheduled(fixedDelay = 2000, initialDelay = 2000) + @Scheduled(fixedDelay = 2000, initialDelay = 2000) @Transactional(rollbackFor = {Exception.class}) public void settledExpirationOrder() { final OrderParam p = new OrderParam();