From 54df322b0f94d8d916609c1494101975eca4cf79 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 30 May 2025 11:30:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=B6=85=E5=B8=82=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E6=B6=88=E8=B4=B9=E9=92=B1=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pjcloud/hard/service/impl/HardApiServiceImpl.java |  5 +----
 .../hard/service/impl/order/HardOrderServiceImpl.java | 11 ++++++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

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 6bc2304cf..c2d999f15 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
@@ -36,10 +36,7 @@ public class HardApiServiceImpl implements HardApiService {
         UserInfo user = userService.getInnerByUserId(userId).getData();
         if (ObjectUtil.isEmpty(user)) return null;
         // 查询钱包
-        // WalletTypeEnum walletType = ObjectUtil.equals(HardTypeEnum.CANTEEN, type) ? WalletTypeEnum.EAT : WalletTypeEnum.PAY;
-        // 默认都使用饭卡钱包
-        WalletTypeEnum walletType = WalletTypeEnum.EAT;
-
+        WalletTypeEnum walletType = ObjectUtil.equals(HardTypeEnum.CANTEEN, type) ? WalletTypeEnum.EAT : WalletTypeEnum.PAY;
         WalletManageEntity wallet = remoteWalletService.getWallet(userId, walletType).getData();
         if (ObjectUtil.isEmpty(wallet)) return null;
         SysUser sysUser = user.getSysUser();
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java
index cb0059252..7b9becf98 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java
@@ -203,7 +203,7 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
         // 查询用户
         UserInfo userDetail = null;
         SysUser sysUser = null;
-        if (isPay) {
+        if (isPay || isVerify) {
             userDetail = userService.getInnerByUserId(dto.getUserId()).getData();
             if (ObjectUtil.isEmpty(userDetail)) throw new RuntimeException("用户不存在不存在");
             sysUser = userDetail.getSysUser();
@@ -214,8 +214,13 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
         WalletManageEntity wallet = null;
         if (isPay) {
             if (ObjectUtil.isEmpty(mch.getDefaultWalletTypeId())) {
-                R<WalletManageEntity> walletResult = remoteWalletService.getWallet(dto.getUserId(), WalletTypeEnum.EAT);
-                wallet = Optional.of(walletResult).map(R::getData).orElseThrow(() -> new RuntimeException("用户钱包不存在"));
+                if (dto.getSysType().equals(HardTypeEnum.CANTEEN)) {
+                    R<WalletManageEntity> walletResult = remoteWalletService.getWallet(dto.getUserId(), WalletTypeEnum.EAT);
+                    wallet = Optional.of(walletResult).map(R::getData).orElseThrow(() -> new RuntimeException("用户钱包不存在"));
+                } else {
+                    R<WalletManageEntity> walletResult = remoteWalletService.getWallet(dto.getUserId(), WalletTypeEnum.PAY);
+                    wallet = Optional.of(walletResult).map(R::getData).orElseThrow(() -> new RuntimeException("用户钱包不存在"));
+                }
             } else {
                 R<WalletManageEntity> walletResult = remoteWalletService.getWalletByWalletTypeId(dto.getUserId(), mch.getDefaultWalletTypeId());
                 wallet = Optional.of(walletResult).map(R::getData).orElseThrow(() -> new RuntimeException("用户钱包不存在"));