From 737f2a5843bfafec2ee861f434c2977d1ec21d21 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 15 十月 2024 15:37:31 +0800
Subject: [PATCH] Revert "1.1"
---
src/main/java/com/mzl/flower/service/payment/UserPaymentSybService.java | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 insertions(+), 6 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 fc57e18..e756717 100644
--- a/src/main/java/com/mzl/flower/service/payment/UserPaymentSybService.java
+++ b/src/main/java/com/mzl/flower/service/payment/UserPaymentSybService.java
@@ -343,6 +343,10 @@
SybPayService service = new SybPayService();
Map<String,String> params = service.query(orderId, up.getTransactionId());
+ String retcode = params.get("retcode");
+ if(!"SUCCESS".equals(retcode)){
+ throw new ValidationException("查询订单交易状态失败: " + params.get("retmsg"));
+ }
String trxstatus = params.get("trxstatus");//支付状态
if("1001".equals(trxstatus) || "3088".equals(trxstatus)){
@@ -357,10 +361,15 @@
Map<String,String> map = service.close(trxid, orderId);
log.info("======关闭订单结果" + toJSONString(map));
- String retcode = map.get("retcode");
+ retcode = map.get("retcode");
if(!"SUCCESS".equals(retcode)){
- throw new ValidationException("取消订单失败: " + map.get("retmsg"));
+ throw new ValidationException("调用通联关闭订单失败: " + map.get("retmsg"));
}
+ trxstatus = map.get("trxstatus");
+ if(!"0000".equals(trxstatus)){
+ throw new ValidationException("取消订单失败: " + map.get("errmsg"));
+ }
+
} else {
throw new ValidationException("订单不可取消");
}
@@ -451,7 +460,14 @@
Map<String,String> map = service.cancel(trxamt, reqsn, oldtrxid, oldreqsn);
String retcode = map.get("retcode");
if(!"SUCCESS".equals(retcode)){
- throw new ValidationException("订单退款失败: " + map.get("retmsg"));
+ throw new ValidationException("调用通联撤销接口失败: " + map.get("retmsg"));
+ }
+
+ //这个不是订单状态，是通用的，如果是支付查询，代表就是订单状态，如果是退款代表的是退款状态
+ String trxstatus = map.get("trxstatus");
+ if(!"0000".equals(trxstatus)){
+ log.error("通联撤销交易失败:" + map.get("errmsg"));
+ throw new ValidationException("订单退款交易失败:" + map.get("errmsg"));
}
updateOrderRefund(orderId, oldtrxid);
@@ -478,7 +494,13 @@
Map<String,String> map = service.refund(trxamt, reqsn, oldtrxid, oldreqsn);
String retcode = map.get("retcode");
if(!"SUCCESS".equals(retcode)){
- throw new ValidationException("订单退款失败: " + map.get("retmsg"));
+ throw new ValidationException("调用通联退款失败: " + map.get("retmsg"));
+ }
+
+ //这个不是订单状态，是通用的，如果是支付查询，代表就是订单状态，如果是退款代表的是退款状态
+ String trxstatus = map.get("trxstatus");
+ if(!"0000".equals(trxstatus)){
+ throw new ValidationException("订单退款交易失败:" + map.get("errmsg"));
}
updateOrderRefund(orderId, oldtrxid);
@@ -546,7 +568,7 @@
new QueryWrapper<UserPayment>().eq("order_id", o.getId()));
long trxamt = refund;
- String reqsn = o.getId();
+ String reqsn = re.getId();//退款单的id
String oldtrxid = up.getTransactionId();
String oldreqsn = null;
@@ -554,12 +576,22 @@
Map<String,String> map = service.refund(trxamt, reqsn, oldtrxid, oldreqsn);
String retcode = map.get("retcode");
if(!"SUCCESS".equals(retcode)){
- throw new ValidationException("订单退款失败: " + map.get("retmsg"));
+ throw new ValidationException("调用通联退款失败: " + map.get("retmsg"));
+ }
+
+ //这个不是订单状态，是通用的，如果是支付查询，代表就是订单状态，如果是退款代表的是退款状态
+ String trxstatus = map.get("trxstatus");
+ if(!"0000".equals(trxstatus)){
+ throw new ValidationException("订单退款交易失败:" + map.get("errmsg"));
}
re.setRequest(toJSONString(map));
re.create(SecurityUtils.getUserId());
+ re.setStatus(retcode);
+ re.setNotification(retcode);
+ re.setNotifyTime(LocalDateTime.now());
+
orderRefundMapper.insert(re);
return re.getId();
--
Gitblit v1.9.3