From 9d2cf0f5d201f392199f7b6bbeb5439cfe6fd919 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 23 Jan 2025 16:02:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=85=85=E5=80=BC/=E6=89=A3=E6=AC=BE?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E8=87=AA=E5=8A=A8=E5=88=9B=E5=BB=BA=E9=92=B1?=
 =?UTF-8?q?=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bsd/pjcloud/wallet/api/constant/WalletTypeEnum.java   | 5 +++++
 .../impl/recharge/WalletRechargeApplyServiceImpl.java     | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletTypeEnum.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletTypeEnum.java
index 0023549e0..65a7779b2 100644
--- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletTypeEnum.java
+++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletTypeEnum.java
@@ -21,6 +21,11 @@ public enum WalletTypeEnum {
 
     private final String desc;
 
+    public static WalletTypeEnum valueOfByCode(String code) {
+        if (ObjectUtil.isEmpty(code)) return null;
+        return Arrays.stream(values()).filter(v -> ObjectUtil.equals(code, v.getCode())).findFirst().get();
+    }
+
     public static WalletTypeEnum descOf(String description) {
         return Arrays.stream(WalletTypeEnum.values())
                 .filter(v -> ObjectUtil.equal(v.getDesc(), description))
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeApplyServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeApplyServiceImpl.java
index 70a16a1e7..1f5e9a8e8 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeApplyServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeApplyServiceImpl.java
@@ -28,6 +28,7 @@ import com.bsd.pjcloud.flow.task.constant.TaskCheckStatusEnum;
 import com.bsd.pjcloud.flow.task.dto.ProcessNodeRecordAssignUserParamDto;
 import com.bsd.pjcloud.wallet.api.constant.WalletBizEnum;
 import com.bsd.pjcloud.wallet.api.constant.WalletBizRechargeEnum;
+import com.bsd.pjcloud.wallet.api.constant.WalletTypeEnum;
 import com.bsd.pjcloud.wallet.api.dto.WalletTypeDto;
 import com.bsd.pjcloud.wallet.api.dto.recharge.WalletRechargeApplyDto;
 import com.bsd.pjcloud.wallet.api.dto.recharge.WalletRechargeImportDto;
@@ -347,6 +348,11 @@ public class WalletRechargeApplyServiceImpl extends ServiceImpl<WalletRechargeAp
         if (ObjectUtil.isNotEmpty(detail.getProcessStatus()) || ObjectUtil.equals(detail.getProcessStatus(), TaskCheckStatusEnum.PADDING.getCode())) {
             return;
         }
+        WalletTypeEntity walletType = walletTypeService.getById(detail.getWalletTypeId());
+        WalletTypeEnum walletTypeEnum = WalletTypeEnum.valueOfByCode(walletType.getUniqueCode());
+        if (ObjectUtil.isEmpty(walletType) || ObjectUtil.isEmpty(walletTypeEnum)) {
+            return;
+        }
         String importTimeStr = LocalDateTimeUtil.format(detail.getImportTime(), DatePattern.NORM_MONTH_PATTERN);
         List<WalletRechargeImportEntity> importList = rechargeImportService.list(new LambdaQueryWrapper<WalletRechargeImportEntity>()
                 .eq(WalletRechargeImportEntity::getApplyId, detail.getId())
@@ -356,7 +362,7 @@ public class WalletRechargeApplyServiceImpl extends ServiceImpl<WalletRechargeAp
         for (WalletRechargeImportEntity v : importList) {
             WalletRechargeImportEntity item = new WalletRechargeImportEntity();
             item.setId(v.getId());
-            WalletManageEntity wallet = walletManageService.getWallet(v.getUserId(), detail.getWalletTypeId());
+            WalletManageEntity wallet = walletManageService.getOrCreateWallet(v.getUserId(), walletTypeEnum);
             if (ObjectUtil.isEmpty(wallet)) continue;
             Integer price = walletTransactionMapper.getTransactionPriceCount(importTimeStr, wallet.getId(), WalletBizEnum.BATCH.getCode());
             if (ObjectUtil.isNotEmpty(price)) {