From e6cbb10d10889d0e7cdb76c6d71d43a4a69f53da Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Tue, 2 Jun 2026 18:27:26 +0800 Subject: [PATCH] 11 --- ...ThirdAppPlusWechatMicropayServiceImpl.java | 3 +++ .../service/impl/WalletManageServiceImpl.java | 27 ++++++++++--------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/appplus/ThirdAppPlusWechatMicropayServiceImpl.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/appplus/ThirdAppPlusWechatMicropayServiceImpl.java index ee2e9dda0..0d5ffd7c8 100644 --- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/appplus/ThirdAppPlusWechatMicropayServiceImpl.java +++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/appplus/ThirdAppPlusWechatMicropayServiceImpl.java @@ -107,6 +107,7 @@ public class ThirdAppPlusWechatMicropayServiceImpl implements ThirdAppPlusWechat if (ObjectUtil.equals(res.getResultCode(), "SUCCESS") && ObjectUtil.equals(res.getReturnCode(), "SUCCESS")) { payOrder.setStatus(ThirdPayOrderStatusEnum.PAY_SUCCESS.getType()); payOrder.setThirdPayNo(res.getTransactionId()); + payOrder.setPayTime(LocalDateTime.now()); } // 如果支付失败了就撤销订单 else { @@ -157,6 +158,8 @@ public class ThirdAppPlusWechatMicropayServiceImpl implements ThirdAppPlusWechat // 支付成功 if (ObjectUtil.equals(transaction.getTradeState(), Transaction.TradeStateEnum.SUCCESS)) { payOrder.setStatus(ThirdPayOrderStatusEnum.PAY_SUCCESS.getType()); + payOrder.setThirdPayNo(transaction.getTransactionId()); + payOrder.setPayTime(LocalDateTime.now()); return transaction.getOutTradeNo(); } // 支付失败 diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletManageServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletManageServiceImpl.java index 7a78cb5cb..c79f418bd 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletManageServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletManageServiceImpl.java @@ -253,18 +253,21 @@ public class WalletManageServiceImpl extends ServiceImpl list = baseMapper.scopePage(page, dto, dataScope); disposeList(list.getRecords()); if (ObjectUtil.isNotEmpty(list.getRecords())) { - // 查询用户属于的店铺 - MchManageVo mchDetail = mchManageService.getViewsCanteenMchByDeptId(user.getDeptId()); - if (ObjectUtil.isNotEmpty(mchDetail) && ObjectUtil.isNotEmpty(mchDetail.getWalletAliasList())) { - List walletAliasList = mchDetail.getWalletAliasList(); - Iterator iterator = list.getRecords().iterator(); - while (iterator.hasNext()) { - WalletManageVo walletVo = iterator.next(); - Optional matchingAlias = walletAliasList.stream() - .filter(alias -> ObjectUtil.equals(alias.getWalletTypeId(), walletVo.getWalletTypeId())) - .findFirst(); - if (matchingAlias.isPresent() && !matchingAlias.get().getVisible()) { - iterator.remove(); + UserInfo userInfo = userService.getByUserId(user.getId()).getData(); + if (ObjectUtil.isNotEmpty(userInfo)) { + // 查询用户属于的店铺 + MchManageVo mchDetail = mchManageService.getViewsCanteenMchByDeptId(userInfo.getSysUser().getDeptId()); + if (ObjectUtil.isNotEmpty(mchDetail) && ObjectUtil.isNotEmpty(mchDetail.getWalletAliasList())) { + List walletAliasList = mchDetail.getWalletAliasList(); + Iterator iterator = list.getRecords().iterator(); + while (iterator.hasNext()) { + WalletManageVo walletVo = iterator.next(); + Optional matchingAlias = walletAliasList.stream() + .filter(alias -> ObjectUtil.equals(alias.getWalletTypeId(), walletVo.getWalletTypeId())) + .findFirst(); + if (matchingAlias.isPresent() && !matchingAlias.get().getVisible()) { + iterator.remove(); + } } } }