From e0026a211d5e0004f8b769a47796cffafb87e479 Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期六, 26 八月 2023 15:42:16 +0800
Subject: [PATCH] 支付调整
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index 0971266..0997bda 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -4166,9 +4166,11 @@
remoteActivityService.changeActivityTotal(activityTotalChangeDto);
}
+ log.info("用户取消订单退款, 检查退款");
// 用户取消订单退款
BigDecimal onlinePayMoney = order.getOnlinePayMoney();
if(BigDecimal.ZERO.compareTo(onlinePayMoney) < 0){
+ log.info("订单支付金额大于0，可发起退款");
// 订单支付金额大于0，可发起退款
orderWxApplyRefund(orderId, refundId, onlinePayMoney, orderRefund);
}
@@ -4187,6 +4189,9 @@
if (null == orderPayment) {
return;
}
+
+ log.info("调用微信退款---发起退款");
+
String subMchId = orderPayment.getSubMchId();
WxPayConfig config = wxService.getConfig();
@@ -4197,7 +4202,8 @@
request.setOutRefundNo(outRefundNo);
request.setReason("用户取消订单");
// 订单金额
- int total = payMoney.multiply(new BigDecimal(100)).intValue();
+ int total = orderPayment.getPayMoney().multiply(new BigDecimal(100)).intValue();
+
RefundsRequest.Amount amount = RefundsRequest.Amount.builder().refund(total).total(total).currency("CNY").build();
request.setAmount(amount);
request.setNotifyUrl(config.getNotifyUrl());
@@ -4213,6 +4219,8 @@
// 返回参数
String refundResponseJson = gson.toJson(result);
+ log.info("调用微信退款返回参数---{}", refundResponseJson);
+
// 保存支付订单统一下单日志
paymentMessageService.savePaymentMessage("3", orderId, refundRequestJson, refundResponseJson);
--
Gitblit v1.7.1