From c86ed59bbb89f1a83425a380735a2c788e45d054 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 26 八月 2022 10:47:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 55 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 13 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 dacb543..8ce4eab 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
@@ -71,18 +71,18 @@
* @param outTradeNo
* @return
*/
- public boolean orderRefund(String outTradeNo, Double amt) {
+ public boolean orderRefund(String outTradeNo) {
Long userId = SecurityUtils.getUserId();
String username = SecurityUtils.getUsername();
C3mOrder orderByOutTradeNo = c3mOrderMapper.getOrderByOutTradeNo(outTradeNo);
- Double refundAmount = orderByOutTradeNo.getSurplusAmount();
- if (orderByOutTradeNo.getTotalAmount() < refundAmount) {
- throw new BusinessException("閫�娆鹃噾棰濋敊璇�,涓嶈兘澶т簬浠樻閲戦");
- }
+
if (orderByOutTradeNo == null) {
throw new BusinessException("鏈壘鍒拌鍗�");
} else {
- orderByOutTradeNo.setRefundAmount(refundAmount);
+ if (orderByOutTradeNo.getTotalAmount() < orderByOutTradeNo.getRefundAmount()) {
+ throw new BusinessException("閫�娆鹃噾棰濋敊璇�,涓嶈兘澶т簬浠樻閲戦");
+ }
+ orderByOutTradeNo.setRefundAmount(orderByOutTradeNo.getSurplusAmount());
return c3mOrderRefund(orderByOutTradeNo, "鍏呯數妗╅��娆�", userId, username);
}
@@ -110,12 +110,7 @@
C3mOrder.getRefundAmount());
} else if (C3mOrder.getOrderType().equals(OrderType.WXPAY.getCode())) {
// 杩涜寰俊閫�娆�
- b = fastPayService.refund(
- C3mOrder.getTotalAmount(),
- C3mOrder.getRefundAmount(),
- C3mOrder.getOutTradeNo(),
- C3mOrder.getPoleId()
- );
+ b = fastPayService.refund(C3mOrder);
}
C3mOrder.setRefundTimestamp(System.currentTimeMillis());
C3mOrder.setRefundMsg(msg);
@@ -189,7 +184,8 @@
c3mOrderEntity.setOrderStatus(0);
c3mOrderEntity.setUserCode(wxCode);
c3mOrderEntity.setC3Udid(c3m.getMcuUdid());
-
+ c3mOrderEntity.setRefundAmount(totalAmount);
+ c3mOrderEntity.setSurplusAmount(totalAmount);
if (save(c3mOrderEntity)) {
@@ -260,6 +256,7 @@
}
//寮�鍚厖鐢垫垚鍔熷悗锛屾洿鏂拌鍗曠姸鎬佷负鍏呯數涓�
userOrder.setChargingStates(0);
+ userOrder.setStartChargingTimestamp(System.currentTimeMillis());
log.error("[-----------------寰俊鏀粯鍥炶皟缁撴潫-----------------]");
if (!updateById(userOrder)) {
return WxPayNotifyResponse.fail("鏇存柊鏁版嵁宸插け鏁�");
@@ -387,4 +384,36 @@
}
}
+
+ /**
+ * 鍏呯數妗╂晠闅滄儏鍐典笅,缁撴灉鏁呴殰鍓嶆鍦ㄨ繘琛屼腑鐨勮鍗�
+ *
+ * @param dataPackage
+ */
+ public void stopCharingOrder(String c3Mac, A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage dataPackage) {
+ if (c3Mac.isEmpty() || c3Mac == null || dataPackage == null) {
+ return;
+ }
+ //鑾峰彇姝ｅ湪杩涜涓殑璁㈠崟
+ C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class)
+ .eq(C3mOrder::getC3Mac, c3Mac).eq(C3mOrder::getChargingStates, 0)
+ .eq(C3mOrder::getOrderStatus, OrderStatus.PAYED.getStatus()).last("limit 1"));
+ //璁㈠崟鏈粨鏉�,浣嗘槸鍏呯數妗╀负绌洪棽鐘舵��(鍗冲厖鐢垫々鏂數/鏁呴殰鎯呭喌) 缁撴潫璇ヨ鍗�
+ if ("1".equals(dataPackage.getStatusBit()) && c3mOrder != null) {
+ //璁剧疆璁㈠崟涓哄凡瀹屾垚
+ c3mOrder.setOrderStatus(OrderStatus.COMPLETE.getStatus());
+ //璁剧疆鍏呯數鐘舵�佷负宸茬粨鏉�
+ c3mOrder.setChargingStates(1);
+ //璁剧疆鍏呯數鐢甸噺
+ c3mOrder.setActualChargingCapacity(Double.parseDouble(dataPackage.getChargedCapacity()));
+ //璁剧疆閫�娆鹃噾棰�
+ c3mOrder.setRefundAmount(Double.parseDouble(dataPackage.getRemainingAmount()));
+ //璁剧疆鍓╀綑閲戦
+ c3mOrder.setSurplusAmount(Double.parseDouble(dataPackage.getRemainingAmount()));
+ //缁撴潫鍏呯數(璁㈠崟)鏃堕棿
+ c3mOrder.setStopChargingTimestamp(System.currentTimeMillis());
+ updateById(c3mOrder);
+ }
+ }
+
}
--
Gitblit v1.9.3