From a18692a66b2dfe2d07c1c47361c806e9dac3786f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com>
Date: Wed, 18 Sep 2024 09:07:30 +0800
Subject: [PATCH] =?UTF-8?q?debug:=E5=BD=92=E9=9B=B6=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TransactionBillServiceImpl.java           | 7 ++++---
 1 file changed, 4 insertions(+), 3 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 c9647833..47fbc77d 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
@@ -974,14 +974,14 @@ public class TransactionBillServiceImpl implements TransactionBillService, After
             data.setSuitEndEle(totalEle);
             TransactionBillQuery query = new TransactionBillQuery();
             query.setBillId(order.getBillId());
-
+            query.setStatus(TransactionBillStatus.SUCCESS.getStatus());
             if (SuitFeeType.TIME.getType().equals(order.getSuitFeeType())) {
                 query.setStartSuitEndTime(endTime); // 计时的话，需要结束时间在这之后的订单
             } else if (SuitFeeType.COUNT.getType().equals(order.getSuitFeeType())) {
                 query.setStartSuitEndEle(totalEle); // 计量的话，需要结束电量比这个大的订单
             }
             int update = this.updateByQuery(data, query);
-            ServiceUtil.assertion(update != 1, "修改订单信息失败");
+            ServiceUtil.assertion(update != 1, "修改订单信息失败，请重试：" + order.getBillNo());
 
             // 若金额 > 0.01 则申请退款
             if (BigDecimal.valueOf(0.01).compareTo(refundAmount) < 0) {
@@ -1070,13 +1070,14 @@ public class TransactionBillServiceImpl implements TransactionBillService, After
             data.setSuitEndEle(totalEle);
             TransactionBillQuery query = new TransactionBillQuery();
             query.setBillId(order.getBillId());
+            query.setStatus(TransactionBillStatus.SUCCESS.getStatus());
             if (SuitFeeType.TIME.getType().equals(order.getSuitFeeType())) {
                 query.setStartSuitEndTime(endTime); // 计时的话，需要结束时间在这之后的订单
             } else if (SuitFeeType.COUNT.getType().equals(order.getSuitFeeType())) {
                 query.setStartSuitEndEle(totalEle); // 计量的话，需要结束电量比这个大的订单
             }
             int update = this.updateByQuery(data, query);
-            ServiceUtil.assertion(update != 1, "修改订单信息失败");
+            ServiceUtil.assertion(update != 1, "修改订单信息失败，请重试：" + order.getBillNo());
 
             return update;
         });