From 645c1d015dfbac03927e2b73b99c5615180647f0 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期三, 09 十月 2024 15:44:17 +0800
Subject: [PATCH] 退款金额
---
src/main/java/com/mzl/flower/service/payment/UserPaymentSybService.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/payment/UserPaymentSybService.java b/src/main/java/com/mzl/flower/service/payment/UserPaymentSybService.java
index 83853a9..fc57e18 100644
--- a/src/main/java/com/mzl/flower/service/payment/UserPaymentSybService.java
+++ b/src/main/java/com/mzl/flower/service/payment/UserPaymentSybService.java
@@ -298,7 +298,9 @@
}
}
- return !"1001".equals(trxstatus);
+ return !("1001".equals(trxstatus) || StringUtils.isEmpty(trxstatus)
+ || "2008".equals(trxstatus)
+ || "2000".equals(trxstatus));
}
public boolean checkOrderStatusRefund(String outTradeNo) throws Exception {
@@ -343,8 +345,10 @@
Map<String,String> params = service.query(orderId, up.getTransactionId());
String trxstatus = params.get("trxstatus");//支付状态
- if("1001".equals(trxstatus)){
- //空单 直接取消
+ if("1001".equals(trxstatus) || "3088".equals(trxstatus)){
+ //3088-交易未支付(在查询时间区间内未成功支付,如已影响资金24小时内会做差错退款处理)
+ //1001：交易不存在
+ //直接取消
} else if (StringUtils.isEmpty(trxstatus)
|| "2008".equals(trxstatus)
|| "2000".equals(trxstatus)) {
@@ -438,10 +442,10 @@
throw new ValidationException("订单不可退款");
}
- long trxamt = up.getPaymentAmount().longValue();
+ long trxamt = prepareAmount(up.getPaymentAmount());
String reqsn = orderId;
String oldtrxid = up.getTransactionId();
- String oldreqsn = null;
+ String oldreqsn = orderId;
SybPayService service = new SybPayService();
Map<String,String> map = service.cancel(trxamt, reqsn, oldtrxid, oldreqsn);
@@ -465,10 +469,10 @@
throw new ValidationException("订单不可退款");
}
- long trxamt = up.getPaymentAmount().longValue();
+ long trxamt = prepareAmount(up.getPaymentAmount());
String reqsn = orderId;
String oldtrxid = up.getTransactionId();
- String oldreqsn = null;
+ String oldreqsn = orderId;
SybPayService service = new SybPayService();
Map<String,String> map = service.refund(trxamt, reqsn, oldtrxid, oldreqsn);
--
Gitblit v1.9.3