From f34a6ce23b5eb7ba4aaaceac432d532b59ace8e5 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 8 Jul 2025 16:13:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E5=8F=91=E7=A5=A8=E4=BD=9C=E5=BA=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/constant/WalletRechargeInvoiceStatusEnum.java      | 3 ++-
 .../impl/recharge/WalletRechargeApplyServiceImpl.java      | 7 +++++--
 .../impl/recharge/WalletRechargeInvoiceServiceImpl.java    | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletRechargeInvoiceStatusEnum.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletRechargeInvoiceStatusEnum.java
index 943e10f07..89fc939ed 100644
--- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletRechargeInvoiceStatusEnum.java
+++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletRechargeInvoiceStatusEnum.java
@@ -17,7 +17,8 @@ public enum WalletRechargeInvoiceStatusEnum {
     BINDED("2", "已绑定充值"),
     UNCHECKED("3", "未审核"),
     CHECKED("4", "审核成功"),
-    CANCELLATION("5", "作废"),
+    FINANCE_CANCELLATION("5", "财务管理员作废"),
+    DEPT_CANCELLATION("6", "部门管理员作废"),
     ;
     private final String code;
 
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 cd4140ef7..638fdf59a 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
@@ -193,9 +193,12 @@ public class WalletRechargeApplyServiceImpl extends ServiceImpl<WalletRechargeAp
                 dto.setProcessInstanceIdList(List.of(detail.getProcessId()));
                 flowEngineService.stopProcessInstance(dto).getData();
             }
-            // 如果有发票要删除一下
+            // 如果有发票要改一下状态
             if (ObjectUtil.isNotEmpty(detail.getInvoiceId())) {
-                walletRechargeInvoiceService.removeById(detail.getInvoiceId());
+                WalletRechargeInvoiceEntity updateObj = new WalletRechargeInvoiceEntity();
+                updateObj.setId(detail.getInvoiceId());
+                updateObj.setStatus(WalletRechargeInvoiceStatusEnum.DEPT_CANCELLATION.getCode());
+                walletRechargeInvoiceService.updateById(updateObj);
             }
             // 删除申请记录
             baseMapper.deleteById(v);
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeInvoiceServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeInvoiceServiceImpl.java
index 8e92b3803..0541e2a3b 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeInvoiceServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeInvoiceServiceImpl.java
@@ -103,6 +103,7 @@ public class WalletRechargeInvoiceServiceImpl extends ServiceImpl<WalletRecharge
                 .set(WalletRechargeInvoiceEntity::getProcessStatus, null)
                 .set(WalletRechargeInvoiceEntity::getProcessTime, null)
                 .set(WalletRechargeInvoiceEntity::getStampPicUrl, null)
+                .set(WalletRechargeInvoiceEntity::getStatus, WalletRechargeInvoiceStatusEnum.FINANCE_CANCELLATION.getCode())
                 .eq(WalletRechargeInvoiceEntity::getId, id)
         );
     }