From 2e91f5c17fb67d24d16365ea4bc91a8d423ce6a0 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 29 六月 2022 14:05:09 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
index 49b621b..c2dee2e 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
@@ -9,6 +9,7 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3HeartbeatReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3mRedisConstant;
import com.sandu.ximon.admin.pay.OrderStatusEnums;
@@ -49,6 +50,7 @@
/**
* 閫�娆�
+ *
* @param outTradeNo
* @param refundAmount
* @return
@@ -241,7 +243,7 @@
*/
public void updateOrderStatusByHeartbeat(A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage dataPackage) {
C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class).eq(C3mOrder::getC3Mac, dataPackage.getC3Mac())
- .eq(C3mOrder::getChargingStates,1).last("limit 1"));
+ .eq(C3mOrder::getChargingStates, 1).last("limit 1"));
if (c3mOrder == null) {
return;
}
@@ -277,4 +279,26 @@
remove(Wrappers.lambdaQuery(C3mOrder.class).lt(C3mOrder::getCreateTimestamp, time).eq(C3mOrder::getOrderStatus, 0));
}
+ /**
+ * 鎭㈠缁х画鍏呯數
+ *
+ * @param c3Mac
+ * @param mcuUdid
+ */
+ public void recoverContinueCharing(String c3Mac, String mcuUdid) {
+ C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class).
+ eq(C3mOrder::getC3Mac, c3Mac).eq(C3mOrder::getC3Udid, mcuUdid).eq(C3mOrder::getChargingStates, 0).last("limit 1"));
+ if (c3mOrder != null) {
+ c3mOrder.setActualChargingCapacity(c3mOrder.getActualChargingCapacityHide());
+ c3mOrder.setActualChargingCapacityHide(0.00);
+
+ //鍐嶆鍏呯數鐢甸噺
+ double electricity = c3mOrder.getSubscribeChargingCapacity() - c3mOrder.getActualChargingCapacity();
+ Integer chargingCapacity = Integer.valueOf(String.valueOf(Math.floor(electricity)));
+ //鍐嶆鍏呯數閲戦
+ double chargeAmount = c3mOrder.getSurplusAmount();
+ SpringContextHolder.getBean(C3ChargingService.class).startCharging(c3Mac, chargingCapacity, chargeAmount);
+ }
+ }
+
}
--
Gitblit v1.9.3