From e0ca7fc7ac4bd51ebf43328948cfba28b3f15e8a Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 01 七月 2022 11:14:27 +0800
Subject: [PATCH] fix

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
index eb6b176..6ae4861 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
@@ -349,7 +349,21 @@
      * @param c3Mac
      */
     @Transactional(rollbackFor = Exception.class)
-    public String finishCharging(String c3Mac) {
+    public String finishCharging(String c3Mac, String openId) {
+        //鏌ヨ
+        if (openId.isEmpty()) {
+            throw new BusinessException("openId涓嶈兘涓虹┖");
+        }
+        //鏌ヨ璇ュ厖鐢垫々鏈�杩戠殑璁㈠崟
+        C3mOrder order = SpringContextHolder.getBean(C3mOrderService.class).getOne(Wrappers.lambdaQuery(C3mOrder.class)
+                .eq(C3mOrder::getC3Mac, c3Mac).eq(C3mOrder::getChargingStates, 0).last("limit 1"));
+
+        if (order == null) {
+            throw new BusinessException("鍏呯數妗╂病鏈夎繘琛屼腑鐨勮鍗�");
+        }
+        if (!openId.equals(order.getOrderId())) {
+            throw new BusinessException("涓嶈兘鎿嶄綔涓嶅睘浜庢偍鐨勮鍗�");
+        }
 
         C3FinishChargingReqInnerFrame c3FinishChargingReqInnerFrame =
                 new C3FinishChargingReqInnerFrame(c3Mac);

--
Gitblit v1.9.3