From 2182fb521701539d4327d18105c7e5b6e9fd42f6 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期四, 07 五月 2026 14:28:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java
index 85d8976..4ac4e4a 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java
@@ -172,7 +172,7 @@
refundDTO.setRefundNo(refundNo);
R<ExchangeCodeConsumeResultVO> result = otherClient.refundExchangeCodeBalance(refundDTO);
if (result == null || result.getCode() != 200) {
- throw new RuntimeException("??????????");
+ throw new RuntimeException("退还兑换码余额失败");
}
}
@@ -681,7 +681,7 @@
//用户推荐奖励
chargingOrderService.referralReward(order);
- //????????
+ //开始构建退款费用
refundAmount = refundAmount.setScale(2, RoundingMode.HALF_EVEN);
if (refundAmount.compareTo(BigDecimal.ZERO) > 0) {
Integer rechargePaymentType = order.getRechargePaymentType();
@@ -693,7 +693,7 @@
order.setRefundAmount(refundAmount);
order.setRefundStatus(refundAmount.compareTo(BigDecimal.ZERO) > 0 ? 1 : 2);
chargingOrderService.updateById(order);
- //??????
+ //构建退款明细
TChargingOrderRefund chargingOrderRefund = new TChargingOrderRefund();
chargingOrderRefund.setChargingOrderId(order.getId());
SimpleDateFormat sdfaa = new SimpleDateFormat("yyyyMMddHHmmssSSS");
@@ -702,17 +702,17 @@
chargingOrderRefund.setRefundStatus(1);
chargingOrderRefund.setPayType(rechargePaymentType);
chargingOrderRefund.setCode(order.getCode());
- chargingOrderRefund.setRefundTitle("??????");
- chargingOrderRefund.setRefundContent("??????");
- chargingOrderRefund.setRefundReason("??????");
- chargingOrderRefund.setRefundRemark("?????????" + order.getPaymentAmount());
+ chargingOrderRefund.setRefundTitle("充电完成退款");
+ chargingOrderRefund.setRefundContent("充电完成退款");
+ chargingOrderRefund.setRefundReason("充电完成退款");
+ chargingOrderRefund.setRefundRemark("实际充电消费金额：" + order.getPaymentAmount());
chargingOrderRefund.setRefundTotalAmount(refundAmount);
chargingOrderRefund.setPayAmount(rechargeAmount);
if (thirdRefundAmount.compareTo(BigDecimal.ZERO) > 0 && 1 == rechargePaymentType) {
WxPaymentRefundModel model = new WxPaymentRefundModel();
model.setOut_trade_no(order.getCode());
model.setOut_refund_no(chargingOrderRefund.getRefundCode());
- model.setReason("??????");
+ model.setReason("充电完成退款");
model.setNotify_url("/payment/wx/refund/notify");
WxPaymentRefundModel.RefundAmount amount = new WxPaymentRefundModel.RefundAmount();
amount.setRefund(thirdRefundAmount.multiply(new BigDecimal(100)).intValue());
@@ -735,7 +735,7 @@
dto.setOutTradeNo(order.getCode());
dto.setOutRequestNo(chargingOrderRefund.getRefundCode());
dto.setRefundAmount(thirdRefundAmount.toString());
- dto.setRefundReason("??????");
+ dto.setRefundReason("充电完成退款");
RefundResp resp = aliPaymentClient.refund(dto).getData();
if (null != resp) {
chargingOrderRefundService.save(chargingOrderRefund);
@@ -747,7 +747,7 @@
dto.setOutTradeNo(order.getRechargeSerialNumber());
dto.setOutRequestNo(chargingOrderRefund.getRefundCode());
dto.setRefundAmount(thirdRefundAmount.toString());
- dto.setRefundReason("??????");
+ dto.setRefundReason("充电完成退款");
RefundResp resp = h5AliPaymentClient.refund(dto).getData();
if (null != resp && "10000".equals(resp.getCode())) {
chargingOrderRefundService.save(chargingOrderRefund);
--
Gitblit v1.7.1