From 4ba65bfad8422385efe0cac3e36b343746123dda Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 23 Jan 2025 17:00:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=81=A2=E5=A4=8D=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WalletRechargeImportController.java       |  8 ++++
 .../service/WalletRechargeImportService.java  |  2 +
 .../WalletRechargeApplyServiceImpl.java       |  2 +-
 .../WalletRechargeImportServiceImpl.java      | 38 ++++++++++++++++++-
 4 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeImportController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeImportController.java
index 44b8526ef..d110e5e36 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeImportController.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeImportController.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
+import com.bsd.pjcloud.common.idempotent.annotation.Idempotent;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.wallet.api.dto.recharge.WalletRechargeImportDto;
 import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeImportEntity;
@@ -39,6 +40,13 @@ public class WalletRechargeImportController {
 
     private final WalletRechargeImportService walletRechargeImportService;
 
+    @Operation(summary = "恢复", description = "恢复")
+    @Idempotent(expireTime = 5, info = "正在处理中，请勿重复操作")
+    @GetMapping("/recover")
+    public R<Boolean> recover(@RequestParam Long id) {
+        return R.ok(walletRechargeImportService.recover(id));
+    }
+
     @Operation(summary = "分页查询", description = "分页查询")
     @GetMapping("/page")
     @PreAuthorize("@pms.hasPermission('wallet_walletRechargeImport_view')")
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRechargeImportService.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRechargeImportService.java
index c3ef45338..49fb414bd 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRechargeImportService.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRechargeImportService.java
@@ -17,4 +17,6 @@ public interface WalletRechargeImportService extends IService<WalletRechargeImpo
     List<WalletRechargeImportVo> listJoin(WalletRechargeImportDto dto);
 
     Page<WalletRechargeImportVo> scopePageList(Page page, WalletRechargeImportDto dto, DataScope dataScope);
+
+    Boolean recover(Long id);
 }
\ No newline at end of file
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 1f5e9a8e8..3bc6b2c0e 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
@@ -312,7 +312,7 @@ public class WalletRechargeApplyServiceImpl extends ServiceImpl<WalletRechargeAp
         );
         if (ObjectUtil.isEmpty(detail)) return;
         if (!ObjectUtil.equals(detail.getProcessStatus(), TaskCheckStatusEnum.PADDING.getCode())) {
-            log.error("|{}|重复的回调,dto:|{}|", TAG);
+            log.error("|{}|重复的回调,dto:|{}|", TAG, JSON.toJSONString(dto));
             return;
         }
         try {
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeImportServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeImportServiceImpl.java
index 4e7a48e1d..522d00b54 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeImportServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeImportServiceImpl.java
@@ -1,6 +1,7 @@
 package com.bsd.pjcloud.wallet.service.impl.recharge;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bsd.pjcloud.admin.api.dto.UserDTO;
@@ -12,20 +13,26 @@ import com.bsd.pjcloud.admin.api.vo.UserVO;
 import com.bsd.pjcloud.common.core.util.CollectionUtils;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
+import com.bsd.pjcloud.wallet.api.constant.WalletBizEnum;
+import com.bsd.pjcloud.wallet.api.constant.WalletTypeEnum;
 import com.bsd.pjcloud.wallet.api.dto.WalletTypeDto;
 import com.bsd.pjcloud.wallet.api.dto.recharge.WalletRechargeImportDto;
+import com.bsd.pjcloud.wallet.api.entity.WalletManageEntity;
+import com.bsd.pjcloud.wallet.api.entity.WalletTransactionEntity;
 import com.bsd.pjcloud.wallet.api.entity.WalletTypeEntity;
+import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeApplyEntity;
 import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeImportEntity;
 import com.bsd.pjcloud.wallet.api.utils.WalletDataUtil;
 import com.bsd.pjcloud.wallet.api.vo.WalletManageVo;
 import com.bsd.pjcloud.wallet.api.vo.recharge.WalletRechargeImportVo;
 import com.bsd.pjcloud.wallet.mapper.WalletTypeMapper;
 import com.bsd.pjcloud.wallet.mapper.recharge.WalletRechargeImportMapper;
-import com.bsd.pjcloud.wallet.service.WalletRechargeImportService;
-import com.bsd.pjcloud.wallet.service.WalletTypeService;
+import com.bsd.pjcloud.wallet.service.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import java.util.ArrayList;
@@ -43,6 +50,11 @@ import java.util.List;
 @Service
 public class WalletRechargeImportServiceImpl extends ServiceImpl<WalletRechargeImportMapper, WalletRechargeImportEntity> implements WalletRechargeImportService {
 
+    @Lazy
+    private final WalletRechargeApplyService walletRechargeApplyService;
+    private final WalletTransactionService walletTransactionService;
+    private final WalletManageService walletManageService;
+
     private final WalletTypeMapper walletTypeMapper;
 
     private final RemoteUserService userService;
@@ -104,4 +116,26 @@ public class WalletRechargeImportServiceImpl extends ServiceImpl<WalletRechargeI
         }
         return list;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean recover(Long id) {
+        WalletRechargeImportEntity rechargeImport = baseMapper.selectById(id);
+        if (ObjectUtil.isEmpty(rechargeImport)) throw new RuntimeException("充值记录不存在");
+        WalletRechargeApplyEntity rechargeApply = walletRechargeApplyService.getById(rechargeImport.getApplyId());
+        if (ObjectUtil.isEmpty(rechargeApply)) throw new RuntimeException("充值申请不存在");
+        WalletTypeEntity walletType = walletTypeMapper.selectById(rechargeApply.getWalletTypeId());
+        WalletTypeEnum walletTypeEnum = WalletTypeEnum.valueOfByCode(walletType.getUniqueCode());
+        if (ObjectUtil.isEmpty(walletType) || ObjectUtil.isEmpty(walletTypeEnum)) {
+            throw new RuntimeException("钱包类型错误");
+        }
+        WalletTransactionEntity walletTransaction = walletTransactionService.getOne(new LambdaQueryWrapper<WalletTransactionEntity>()
+                .eq(WalletTransactionEntity::getBizId, String.valueOf(rechargeImport.getId()))
+        );
+        if (ObjectUtil.isNotEmpty(walletTransaction)) throw new RuntimeException("钱包已经充值过");
+        WalletManageEntity wallet = walletManageService.getOrCreateWallet(rechargeImport.getUserId(), walletTypeEnum);
+        if (ObjectUtil.isEmpty(wallet)) throw new RuntimeException("钱包错误");
+        walletTransactionService.addWalletBalance(wallet.getId(), rechargeImport.getPrice(), String.valueOf(rechargeImport.getId()), WalletBizEnum.BATCH);
+        return true;
+    }
 }
\ No newline at end of file