From f437c871d584e291b200d168e45d11e0ccf5ab24 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 30 Jun 2025 20:04:33 +0800
Subject: [PATCH 1/3] 11

---
 .../controller/recharge/WalletRechargeInvoiceController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeInvoiceController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeInvoiceController.java
index 0262da38e..04adc6bf4 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeInvoiceController.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeInvoiceController.java
@@ -44,7 +44,7 @@ public class WalletRechargeInvoiceController {
 
     @GetMapping("/back")
     @Operation(summary = "退回作废发票")
-    public R backInvoice(@RequestParam Long id) {
+    public R backInvoice(@RequestParam("id") Long id) {
         walletRechargeInvoiceService.backInvoice(id);
         return R.ok();
     }

From c26234710664c2c0661fd948ab73f80f68d4d913 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 1 Jul 2025 10:05:32 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=E5=88=A0=E9=99=A4=E5=BC=80=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/recharge/WalletRechargeInvoiceServiceImpl.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 93d8d175c..2c8b711ba 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
@@ -217,7 +217,7 @@ public class WalletRechargeInvoiceServiceImpl extends ServiceImpl<WalletRecharge
         if (ObjectUtil.isEmpty(list)) return;
         for (Long v : list) {
             WalletRechargeInvoiceEntity detail = baseMapper.selectById(v);
-            if (ObjectUtil.isEmpty(detail) || ObjectUtil.isEmpty(detail.getApplyId())) continue;
+            if (ObjectUtil.isEmpty(detail)) continue;
             if (ObjectUtil.isNotEmpty(detail.getStatus()) && ObjectUtil.notEqual(detail.getStatus(), WalletRechargeInvoiceStatusEnum.UNBIND.getCode())) {
                 UserInfo userInfo = remoteUserService.getByUserId(detail.getApplyUserId()).getData();
                 throw new RuntimeException("用户<" + userInfo.getSysUser().getName() + ">创建的发票已经" + WalletRechargeInvoiceStatusEnum.codeOf(detail.getStatus()).getDesc() + "不能删除");
@@ -225,7 +225,7 @@ public class WalletRechargeInvoiceServiceImpl extends ServiceImpl<WalletRecharge
             // 删除申请记录
             baseMapper.deleteById(v);
             // 删除申请记录条目
-            importMapper.delete(new LambdaQueryWrapper<WalletRechargeImportEntity>().eq(WalletRechargeImportEntity::getApplyId, v));
+            importMapper.delete(new LambdaQueryWrapper<WalletRechargeImportEntity>().eq(WalletRechargeImportEntity::getInvoiceId, v));
         }
     }
 

From 5e8fae6d20dc2e48900a2323c69d7368f7118c3e Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 1 Jul 2025 10:10:57 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=E6=9C=AA=E6=8F=90=E4=BA=A4=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/recharge/WalletRechargeApplyMapper.xml  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeApplyMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeApplyMapper.xml
index ecf85e886..0ba2c157d 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeApplyMapper.xml
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeApplyMapper.xml
@@ -27,9 +27,12 @@
 
     <sql id="whereA">
         a.del_flag = '0'
-        <if test="dto.processStatus != null and dto.processStatus != '' ">
+        <if test="dto.processStatus != null and dto.processStatus != '' and dto.processStatus != 99 ">
             and a.process_status = #{dto.processStatus}
         </if>
+        <if test="dto.processStatus != null and dto.processStatus != '' and dto.processStatus == 99 ">
+            and a.process_id is null
+        </if>
         <if test="dto.userId != null">
             and a.user_id = #{dto.userId}
         </if>