From 2f03f2328802b6bcc4b0d7f4a5875e8f949b5805 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Thu, 17 Oct 2024 10:31:45 +0800
Subject: [PATCH] =?UTF-8?q?debug:=E7=94=B5=E9=87=8F=E5=8F=98=E5=8C=96?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/TransactionBillServiceImpl.java      | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
index 272e6124..469693e0 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
@@ -1222,31 +1222,31 @@ public class TransactionBillServiceImpl implements TransactionBillService, After
                     ServiceUtil.assertion(refund != 1, "申请退款失败");
                 }, 0, TimeUnit.SECONDS);
             }
-        }
 
-        // 清零设备
-        try {
-            transactionTemplate.execute(status -> {
-                // 记录设备关闭状态：成功
-                int update = this.updateCloseStatus(order.getBillId(), RechargeCloseStatus.SUCCESS, "成功");
-                ServiceUtil.assertion(update != 1, "更新设备关闭状态失败");
+            // 清零设备
+            try {
+                transactionTemplate.execute(status -> {
+                    // 记录设备关闭状态：成功
+                    int update = this.updateCloseStatus(order.getBillId(), RechargeCloseStatus.SUCCESS, "成功");
+                    ServiceUtil.assertion(update != 1, "更新设备关闭状态失败");
 
-                // 尝试设备清零时长、电量
-                if (withDevice) {
-                    if (SuitFeeType.TIME.getType().equals(order.getSuitFeeType())) {
-                        deviceService.resetTime(device, true);
-                    } else if (SuitFeeType.COUNT.getType().equals(order.getSuitFeeType())) {
-                        deviceService.resetEle(device, true);
+                    // 尝试设备清零时长、电量
+                    if (withDevice) {
+                        if (SuitFeeType.TIME.getType().equals(order.getSuitFeeType())) {
+                            deviceService.resetTime(device, true);
+                        } else if (SuitFeeType.COUNT.getType().equals(order.getSuitFeeType())) {
+                            deviceService.resetEle(device, true);
+                        }
                     }
-                }
 
-                return update;
-            });
-        } catch (Exception e) {
-            log.warn("设备归零失败: {}", e.getMessage());
-            // 记录设备关闭状态
-            this.updateCloseStatus(order.getBillId(), RechargeCloseStatus.FAIL, e.getMessage());
-            return EndUseVO.toResult(result, false, e.getMessage());
+                    return update;
+                });
+            } catch (Exception e) {
+                log.warn("设备归零失败: {}", e.getMessage());
+                // 记录设备关闭状态
+                this.updateCloseStatus(order.getBillId(), RechargeCloseStatus.FAIL, e.getMessage());
+                return EndUseVO.toResult(result, false, e.getMessage());
+            }
         }
 
         return EndUseVO.toResult(result, true, null);