From 57e9879945e30efbd62d8d47755c9b4ead2f8645 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 25 十月 2024 19:11:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index c41c544..923d807 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -539,6 +539,7 @@
chargingOrder.setRechargePaymentStatus(2);
chargingOrder.setRechargeSerialNumber(transaction_id);
chargingOrder.setStatus(2);
+ chargingOrder.setPayTime(LocalDateTime.now());
//添加安全检测数据到缓存中，每步安全检测完成后需要更新缓存数据
PreChargeCheck preChargeCheck = new PreChargeCheck();
@@ -796,8 +797,11 @@
one.setRefundStatus(2);
one.setRefundTime(LocalDateTime.now());
chargingOrderRefundService.updateById(one);
+
TChargingOrder chargingOrder = this.getById(one.getChargingOrderId());
- chargingOrder.setPayTime(LocalDateTime.now());
+ chargingOrder.setRefundStatus(2);
+ chargingOrder.setRefundSerialNumber(refund_id);
+ chargingOrder.setRefundTime(LocalDateTime.now());
this.updateById(chargingOrder);
return AjaxResult.success();
}
@@ -840,6 +844,7 @@
Integer m = Integer.valueOf(data.getCumulative_charging_time() % 60);
chargingDetails.setChargedTime(String.format("%02d", h) + ":" + String.format("%02d", m));
}
+ //转换成UTC时间
ChargingHandshake chargingHandshake = chargingHandshakeClient.getDataByOrderCode(one.getCode()).getData();
if(null != chargingHandshake && null != data && null != one.getAppUserCarId()){
BigDecimal bms_battery_capacity = chargingHandshake.getBms_battery_capacity();
@@ -1967,8 +1972,6 @@
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-DDTHH:mm:ss+TIMEZONE");
AjaxResult success = chargingOrderStartupFailureWxRefund(resp.getOutTradeNo(), resp.getTradeNo(), "SUCCESS", sdf1.format(new Date()));
if(success.isSuccess()){
- chargingOrder.setPayTime(LocalDateTime.now());
- this.updateById(chargingOrder);
chargingOrderRefundService.save(chargingOrderRefund);
}
}
--
Gitblit v1.7.1