From 1123d1e3e12fc42e581a71724a3be491aa94224a Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Sat, 22 Mar 2025 18:56:48 +0800 Subject: [PATCH] 11 --- .../main/resources/file/支付方式交易汇总.xlsx | Bin 0 -> 10036 bytes .../admin/controller/SysUserController.java | 2 +- .../impl/thrid/WalletThirdZyServiceImpl.java | 5 ++++- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/file/支付方式交易汇总.xlsx diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/file/支付方式交易汇总.xlsx b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/file/支付方式交易汇总.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..4509264c91e0fc6ab82fae698686bbcb8076f0e8 GIT binary patch literal 10036 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 Y{Ua(0us;_o`eQp5{G%K$ userVOList = remoteUserService.getRemoteUserPage(page.getCurrent(), page.getSize(), query).getData(); + log.info("|{}|getRemoteUserPage,params|{}|page|{}|size:|{}|", TAG, JSONUtil.toJsonStr(query), page.getCurrent(), page.getSize()); if (ObjectUtil.isEmpty(userVOList)) return 0; + log.info("|{}|getRemoteUserPage,数据length|{}|", TAG, userVOList.size()); List syncList = new ArrayList<>(); String syncAllMchVersion = getSyncAllMchVersion(); for (UserVO v : userVOList) { @@ -264,7 +267,7 @@ public class WalletThirdZyServiceImpl implements WalletThirdZyService { } } ZyMerSyncAccountInfoDto item = new ZyMerSyncAccountInfoDto(); - item.setAccName(v.getUsername()); + item.setAccName(v.getName()); item.setAccNum(v.getUserId().toString()); item.setCardAccNum(userWallet.getId()); item.setCardSID(userWallet.getCardNumber());