From 395318b34ff1b0f4304af3f0987df77cfd9dbedd Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Wed, 15 Jan 2025 14:10:25 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=BF=80=E6=B4=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/hard/HardApiController.java | 7 ++++++ .../pjcloud/hard/service/HardApiService.java | 1 + .../hard/service/impl/HardApiServiceImpl.java | 24 +++++++++++++++++++ .../wallet/api/feign/RemoteWalletService.java | 4 ++++ .../controller/WalletManageController.java | 12 +++++++--- 5 files changed, 45 insertions(+), 3 deletions(-) diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/hard/HardApiController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/hard/HardApiController.java index bbbaf1cdb..0bbe034a1 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/hard/HardApiController.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/hard/HardApiController.java @@ -109,4 +109,11 @@ public class HardApiController { return R.ok(hardApiService.getUserById(id, type)); } + @GetMapping("/get-user-by-card") + @Operation(summary = "获取用户和钱包") + public R getUserByCard(@RequestParam String card) { + return R.ok(hardApiService.getUserByCard(card)); + } + + } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardApiService.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardApiService.java index 18a249c79..cb116e25a 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardApiService.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardApiService.java @@ -10,4 +10,5 @@ public interface HardApiService { HardAdUserVo getUserById(Long userId, HardTypeEnum type); + HardAdUserVo getUserByCard(String card); } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardApiServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardApiServiceImpl.java index e1f194de0..4fd0236e1 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardApiServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardApiServiceImpl.java @@ -47,4 +47,28 @@ public class HardApiServiceImpl implements HardApiService { result.setWalletIsFreeze(wallet.getIsFreeze()); return result; } + + + @Override + public HardAdUserVo getUserByCard(String card) { + HardAdUserVo result = new HardAdUserVo(); + // 查询钱包 + WalletManageEntity wallet = remoteWalletService.getWalletByCardNumber(card).getData(); + if (ObjectUtil.isEmpty(wallet)) return null; + // 查询用户 + UserInfo user = userService.getByUserId(wallet.getUserId()).getData(); + if (ObjectUtil.isEmpty(user)) return null; + SysUser sysUser = user.getSysUser(); + result.setUserId(sysUser.getUserId()); + result.setUsername(sysUser.getUsername()); + result.setUserAvatar(sysUser.getAvatar()); + result.setUserMobile(sysUser.getPhone()); + result.setDeptId(sysUser.getDeptId()); + result.setWalletCardNumber(wallet.getCardNumber()); + result.setWalletId(wallet.getId()); + result.setWalletTypeId(wallet.getWalletTypeId()); + result.setWalletBalance(wallet.getBalance()); + result.setWalletIsFreeze(wallet.getIsFreeze()); + return result; + } } diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/feign/RemoteWalletService.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/feign/RemoteWalletService.java index e789a3548..ae2ee8705 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/feign/RemoteWalletService.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/feign/RemoteWalletService.java @@ -23,6 +23,10 @@ public interface RemoteWalletService { @GetMapping("/wallet-manage/get-wallet") R getWallet(@RequestParam Long userId, @RequestParam WalletTypeEnum walletTypeCode); + @NoToken + @GetMapping("/wallet-manage/get-wallet-by-card-number") + R getWalletByCardNumber(@RequestParam String cardNumber); + @NoToken @GetMapping("/wallet-manage/create-wallet") R createWallet(@RequestParam Long userId); diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletManageController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletManageController.java index 629ddfa16..44f82797d 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletManageController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletManageController.java @@ -67,9 +67,15 @@ public class WalletManageController { @GetMapping("/get-wallet") public R getWallet(@RequestParam Long userId, @RequestParam WalletTypeEnum walletTypeCode) { WalletManageEntity wallet = walletManageService.getWallet(userId, walletTypeCode); - if (ObjectUtil.isEmpty(wallet)) { - return R.failed("用户钱包不存在"); - } + if (ObjectUtil.isEmpty(wallet)) return R.failed("用户钱包不存在"); + return R.ok(wallet); + } + + @Inner + @GetMapping("/get-wallet-by-card-number") + public R getWalletByCardNumber(@RequestParam String cardNumber) { + WalletManageEntity wallet = walletManageService.getWallet(cardNumber); + if (ObjectUtil.isEmpty(wallet)) return R.failed("用户钱包不存在"); return R.ok(wallet); }