From 8b0cf2731d2b61999fdd1aeee91567dc47d67e14 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 11 七月 2025 14:26:08 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 3bff3ab..a2db0c8 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
@@ -1040,7 +1040,7 @@
dto.setRefundAmount(rechargeAmount.toString());
dto.setRefundReason("充电失败，取消充电订单");
RefundResp resp = h5AliPaymentClient.refund(dto).getData();
- if(null != resp){
+ if(null != resp && "10000".equals(resp.getCode())){
chargingOrderRefundService.save(chargingOrderRefund);
//回退会员折扣次数
if(chargingOrder.getVipDiscountAmount().compareTo(BigDecimal.ZERO) > 0){
@@ -1137,7 +1137,7 @@
dto.setRefundAmount(money.toString());
dto.setRefundReason("充电完成退款");
RefundResp resp = h5AliPaymentClient.refund(dto).getData();
- if(null != resp){
+ if(null != resp && "10000".equals(resp.getCode())){
chargingOrderRefundService.save(chargingOrderRefund);
try {
Thread.sleep(1000);
@@ -2737,7 +2737,7 @@
dto.setRefundAmount(refundAmount.toString());
dto.setRefundReason("充电完成退款");
RefundResp resp = h5AliPaymentClient.refund(dto).getData();
- if(null != resp){
+ if(null != resp && "10000".equals(resp.getCode())){
chargingOrderRefundService.save(chargingOrderRefund);
this.chargingOrderStartupFailureWxRefund(chargingOrderRefund.getRefundCode(), resp.getTradeNo(), "SUCCESS", null);
}
@@ -2954,7 +2954,7 @@
dto.setRefundAmount(payOrderQueryDto.getRefundAmount().toString());
dto.setRefundReason("取消订单");
RefundResp resp = h5AliPaymentClient.refund(dto).getData();
- if(null != resp){
+ if(null != resp && "10000".equals(resp.getCode())){
chargingOrderRefund.setRefundStatus(2);
chargingOrderRefund.setRefundAmount((tChargingOrder.getRefundAmount()==null? BigDecimal.valueOf(0) :tChargingOrder.getRefundAmount()).add(payOrderQueryDto.getRefundAmount()));
this.baseMapper.updateById(tChargingOrder);
--
Gitblit v1.7.1