From db02c79d9b8222cb8d5bac6de2442acf2e7c8f3a Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Wed, 17 Jun 2026 20:22:38 +0800 Subject: [PATCH] 1 --- .../controller/WalletSettingController.java | 12 +++++----- .../impl/WalletSettingServiceImpl.java | 22 ++++++++++++++++++- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletSettingController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletSettingController.java index 0cb940b31..41bc38f4a 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletSettingController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletSettingController.java @@ -60,12 +60,12 @@ public class WalletSettingController { /* ************************************* start android start ************************************* */ @GetMapping("/ad/get-discounts-list") - @Cacheable( - value = CacheConstants.WALLET_USER_DISCOUNTS_LIST, - key = "#userId + ':' + #hardId", - condition = "#userId != null && #hardId != null", - unless = "#result == null || #result.data == null" - ) +// @Cacheable( +// value = CacheConstants.WALLET_USER_DISCOUNTS_LIST, +// key = "#userId + ':' + #hardId", +// condition = "#userId != null && #hardId != null", +// unless = "#result == null || #result.data == null" +// ) public R> androidGetDiscountsList(@RequestParam String hardId, @RequestParam Long userId) { return R.ok(walletSettingService.androidGetDiscountsList(hardId, userId)); } diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletSettingServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletSettingServiceImpl.java index daea0cec3..604def966 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletSettingServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletSettingServiceImpl.java @@ -57,19 +57,36 @@ public class WalletSettingServiceImpl extends ServiceImpl androidGetDiscountsList(String hardId, Long userId) { + long startTime = System.currentTimeMillis(); List discountsList = new ArrayList<>(); + + // 远程调用: 获取用户信息 + long remoteUserStart = System.currentTimeMillis(); UserInfo userInfo = remoteUserService.getInnerByUserId(userId).getData(); + long remoteUserEnd = System.currentTimeMillis(); + log.info("[性能监控] androidGetDiscountsList - 远程调用获取用户信息耗时: {}ms", remoteUserEnd - remoteUserStart); + if (ObjectUtil.isEmpty(userInfo) || ObjectUtil.isEmpty(userInfo.getSysUser())) { return List.of(); } + + // SQL查询: 获取钱包设置 + long sqlSettingStart = System.currentTimeMillis(); WalletSettingVo setting = getSetting(); + long sqlSettingEnd = System.currentTimeMillis(); + log.info("[性能监控] androidGetDiscountsList - SQL查询钱包设置耗时: {}ms", sqlSettingEnd - sqlSettingStart); + if (ObjectUtil.isEmpty(setting)) { return List.of(); } SysUser sysUser = userInfo.getSysUser(); - // 在自营食堂 + // SQL查询: 获取用户所属食堂 + long sqlMchStart = System.currentTimeMillis(); MchManageVo userMch = mchManageService.getViewsCanteenMchByDeptId(sysUser.getDeptId()); + long sqlMchEnd = System.currentTimeMillis(); + log.info("[性能监控] androidGetDiscountsList - SQL查询用户食堂信息耗时: {}ms", sqlMchEnd - sqlMchStart); + boolean isSelfCatering = ObjectUtil.isNotEmpty(userMch); List list = new ArrayList<>(); @@ -110,6 +127,9 @@ public class WalletSettingServiceImpl extends ServiceImpl