From df3671f2dd278f828468defab36e3021027d3fe4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 25 十月 2024 19:09:57 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 638f31c..77aca09 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();
@@ -792,6 +793,12 @@
one.setRefundStatus(2);
one.setRefundTime(LocalDateTime.now());
chargingOrderRefundService.updateById(one);
+
+ TChargingOrder chargingOrder = this.getById(one.getChargingOrderId());
+ chargingOrder.setRefundStatus(2);
+ chargingOrder.setRefundSerialNumber(refund_id);
+ chargingOrder.setRefundTime(LocalDateTime.now());
+ this.updateById(chargingOrder);
return AjaxResult.success();
}
@@ -833,6 +840,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();
@@ -1862,7 +1870,7 @@
//开始将优惠券优惠的金额添加到明细中
BigDecimal couponDiscountAmount = order.getCouponDiscountAmount();
- if(couponDiscountAmount.compareTo(BigDecimal.ZERO) > 0){
+ if(null != couponDiscountAmount && couponDiscountAmount.compareTo(BigDecimal.ZERO) > 0){
List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.list(new LambdaQueryWrapper<TChargingOrderAccountingStrategy>().eq(TChargingOrderAccountingStrategy::getChargingOrderId, order.getId()));
for (TChargingOrderAccountingStrategy chargingOrderAccountingStrategy : list) {
BigDecimal periodServicePrice = chargingOrderAccountingStrategy.getPeriodServicePrice();
@@ -1930,7 +1938,7 @@
chargingOrderRefund.setRefundTitle("充电完成退款");
chargingOrderRefund.setRefundContent("充电完成退款");
chargingOrderRefund.setRefundReason("充电完成退款");
- chargingOrderRefund.setRefundRemark("充电完成退款");
+ chargingOrderRefund.setRefundRemark("实际充电消费金额：" + refundAmount);
chargingOrderRefund.setRefundTotalAmount(refundAmount);
chargingOrderRefund.setPayAmount(rechargeAmount);
if(1 == rechargePaymentType){
--
Gitblit v1.7.1