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 000000000..4509264c9 Binary files /dev/null and b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/file/支付方式交易汇总.xlsx differ diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java index b8e32106e..8c6145d05 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java @@ -217,7 +217,7 @@ public class SysUserController { userDTO.setIsFindCheckUser(true); } Page pageParams = new Page(); - pageParams.setCurrent(1); + pageParams.setCurrent(current); pageParams.setSize(size); return R.ok(userService.getUsersWithRolePage(pageParams, userDTO).getRecords()); } diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/thrid/WalletThirdZyServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/thrid/WalletThirdZyServiceImpl.java index 10c53540b..2094b3175 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/thrid/WalletThirdZyServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/thrid/WalletThirdZyServiceImpl.java @@ -3,6 +3,7 @@ package com.bsd.pjcloud.wallet.service.impl.thrid; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.json.JSON; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -242,7 +243,9 @@ public class WalletThirdZyServiceImpl implements WalletThirdZyService { query.setDeptIds(syncZyDeptIds); } List 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());