From cf9be203b137a54641d2b8e7c62c02c9dc0f9e9d Mon Sep 17 00:00:00 2001 From: tangqian Date: Fri, 9 Jun 2023 14:32:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shop/service/recharge/RechargeOrderServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java index dbd7577dd..eee8767fb 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java @@ -202,7 +202,8 @@ public class RechargeOrderServiceImpl implements RechargeOrderService { Assert.notNull(loginUser, "登录失效,请重新登录!"); List orderDOS = rechargeOrderMapper.selectList(Wrappers.lambdaQuery() .eq(RechargeOrderDO::getUid, loginUser.getId()) - .ne(RechargeOrderDO::getPaid, 1) + .eq(RechargeOrderDO::getPaid, 1) + .eq(RechargeOrderDO::getRefundStatus, 0) .orderByDesc(RechargeOrderDO::getCreateTime)); if (!CollectionUtils.isEmpty(orderDOS)) { List rechargeOrderRespVOS = RechargeOrderConvert.INSTANCE.convertList(orderDOS); @@ -317,7 +318,9 @@ public class RechargeOrderServiceImpl implements RechargeOrderService { @Override public List memberOrderInfoByPhone(String phone) { List orderDOS = rechargeOrderMapper.selectList(Wrappers.lambdaQuery() - .eq(RechargeOrderDO::getUserPhone, phone).eq(RechargeOrderDO::getPaid, 1)); + .eq(StringUtils.isNotBlank(phone), RechargeOrderDO::getUserPhone, phone) + .eq(RechargeOrderDO::getRefundStatus, 0) + .eq(RechargeOrderDO::getPaid, 1)); if (!CollectionUtils.isEmpty(orderDOS)) { List rechargeOrderRespVOS = RechargeOrderConvert.INSTANCE.convertList(orderDOS); List collect1 = rechargeOrderRespVOS.stream().map(RechargeOrderBaseVO::getOrderId).collect(Collectors.toList());