feat:激活

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<HardAdUserVo> getUserByCard(@RequestParam String card) {
+        return R.ok(hardApiService.getUserByCard(card));
+    }
+
+
 }

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);
 }

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;
+    }
 }

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<WalletManageEntity> getWallet(@RequestParam Long userId, @RequestParam WalletTypeEnum walletTypeCode);
 
+    @NoToken
+    @GetMapping("/wallet-manage/get-wallet-by-card-number")
+    R<WalletManageEntity> getWalletByCardNumber(@RequestParam String cardNumber);
+
     @NoToken
     @GetMapping("/wallet-manage/create-wallet")
     R<WalletManageEntity> createWallet(@RequestParam Long userId);

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);
     }