From 6dcb9f123ed2bb95a826aedb9b11d174f5eee4d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com>
Date: Fri, 24 May 2024 09:33:41 +0800
Subject: [PATCH] =?UTF-8?q?debug=20=E8=93=9D=E7=89=99=E5=85=85=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/TransactionBillMapper.java                |  5 +++++
 .../transactionBill/mapper/TransactionBillMapper.xml |  6 ++++++
 .../service/TransactionBillService.java              |  8 ++++++++
 .../service/impl/TransactionBillServiceImpl.java     | 12 ++++++++++++
 .../controller/app/AppTransactionBillController.java |  6 ++++++
 5 files changed, 37 insertions(+)

diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/TransactionBillMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/TransactionBillMapper.java
index e76bdfc1..f2f15efb 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/TransactionBillMapper.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/TransactionBillMapper.java
@@ -139,4 +139,9 @@ public interface TransactionBillMapper
      * @param status 修改后的设备充值状态
      */
     int updateDeviceRechargeStatusByIds(@Param("billIds") List<Long> billIds, @Param("status") String status);
+
+    /**
+     * 蓝牙充值成功
+     */
+    int bluetoothRechargeSuccess(String billNo);
 }
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/TransactionBillMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/TransactionBillMapper.xml
index 950ca33e..edc1d9af 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/TransactionBillMapper.xml
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/TransactionBillMapper.xml
@@ -367,4 +367,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{billId}
         </foreach>
     </update>
+
+    <update id="bluetoothRechargeSuccess">
+        update sm_transaction_bill
+        set device_recharge_status = '1'
+        where bill_no = #{billNo} and type = '1' and device_recharge_status = '3'
+    </update>
 </mapper>
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/TransactionBillService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/TransactionBillService.java
index 24c34736..4d59fa5f 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/TransactionBillService.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/TransactionBillService.java
@@ -215,4 +215,12 @@ public interface TransactionBillService
      * @return
      */
     BigDecimal getServiceRate(Long deviceId, Long channelId);
+
+
+    /**
+     * 蓝牙充值成功
+     * @param billNo
+     * @return
+     */
+    boolean bluetoothRechargeSuccess(String billNo);
 }
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 29cbdc36..50626e53 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
@@ -786,4 +786,16 @@ public class TransactionBillServiceImpl implements TransactionBillService {
             wxPayService.closeOrder(billNo);
         }
     }
+
+
+    /**
+     * 蓝牙充值成功
+     *
+     * @param billNo
+     * @return
+     */
+    @Override
+    public boolean bluetoothRechargeSuccess(String billNo) {
+        return transactionBillMapper.bluetoothRechargeSuccess(billNo) == 1;
+    }
 }
diff --git a/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppTransactionBillController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppTransactionBillController.java
index 750fd208..41be74b0 100644
--- a/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppTransactionBillController.java
+++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppTransactionBillController.java
@@ -203,4 +203,10 @@ public class AppTransactionBillController extends BaseController
         return getDataTable(smTransactionBillService.selectSmTransactionBillList(query));
     }
 
+    @ApiOperation("蓝牙充值成功回调")
+    @GetMapping("/recharge/{billNo}/bluetoothSuccess")
+    public AjaxResult bluetoothRechargeSuccess(@PathVariable String billNo) {
+        return success(smTransactionBillService.bluetoothRechargeSuccess(billNo));
+    }
+
 }