From 430ec88e92370b785fbed7d0243ba22a6aabf2ce Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 29 六月 2022 15:37:21 +0800
Subject: [PATCH] 充电桩
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 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 321c4a4..4244faf 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
@@ -55,13 +55,13 @@
* 閫�娆�
*
* @param outTradeNo
- * @param refundAmount
* @return
*/
- public boolean orderRefund(String outTradeNo, Double refundAmount/*, Long userId, String username*/) {
+ public boolean orderRefund(String outTradeNo,Double amt) {
Long userId = SecurityUtils.getUserId();
String username = SecurityUtils.getUsername();
C3mOrder orderByOutTradeNo = c3mOrderMapper.getOrderByOutTradeNo(outTradeNo);
+ Double refundAmount=orderByOutTradeNo.getSurplusAmount();
if (orderByOutTradeNo.getTotalAmount() < refundAmount) {
throw new BusinessException("閫�娆鹃噾棰濋敊璇�,涓嶈兘澶т簬浠樻閲戦");
}
@@ -258,16 +258,19 @@
* 鏍规嵁蹇冭烦鍖呮洿鏂拌鍗曠姸鎬�
*/
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"));
- if (c3mOrder == null) {
- return;
+ //鍏呯數涓殑蹇冭烦鍖呴渶瑕佸幓鏇存柊璁㈠崟鏁版嵁锛屽惁鍒欎笉澶勭悊锛�
+ if(dataPackage.getStatusBit().equals("02")){
+ C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class).eq(C3mOrder::getC3Mac, dataPackage.getC3Mac())
+ .eq(C3mOrder::getChargingStates, 1).last("limit 1"));
+ if (c3mOrder == null) {
+ return;
+ }
+ //鏇存柊鍏呯數鎬婚噺
+ c3mOrder.setActualChargingCapacityHide(Double.parseDouble(dataPackage.getChargedCapacity()));
+ //鏇存柊鍓╀綑閲戦
+ c3mOrder.setSurplusAmount(Double.parseDouble(dataPackage.getRemainingAmount()));
+ updateById(c3mOrder);
}
- //鏇存柊鍏呯數鎬婚噺
- c3mOrder.setActualChargingCapacityHide(Double.parseDouble(dataPackage.getChargedCapacity()));
- //鏇存柊鍓╀綑閲戦
- c3mOrder.setSurplusAmount(Double.parseDouble(dataPackage.getRemainingAmount()));
- updateById(c3mOrder);
}
--
Gitblit v1.9.3