From c560f1a14ae1fc468d90e50e6a32d805295875da Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 15:35:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/AliPayMsgConfig.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/AliPayMsgConfig.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/AliPayMsgConfig.java
index e1dfd0d..00bc4f7 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/AliPayMsgConfig.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/AliPayMsgConfig.java
@@ -56,12 +56,15 @@
OperatorAuthAlipay orderNo = operatorAuthService.getOne(new QueryWrapper<OperatorAuthAlipay>()
.eq("orderNo", order_id));
if (orderNo!=null){
+ orderNo.setRefuseReason(null);
+ operatorAuthService.updateById(orderNo);
Integer operatorId = orderNo.getOperatorId();
OperatorUser operatorId1 = operatorUserService.getOne(new QueryWrapper<OperatorUser>()
.eq("operatorId", operatorId));
if (operatorId1!=null){
operatorId1.setAlipayNum(smid);
operatorId1.setAlipayAudit(2);
+ operatorUserService.updateById(operatorId1);
}
}
}else if (msgApi.equals("ant.merchant.expand.indirect.zft.rejected")){
@@ -71,6 +74,7 @@
String order_id = json.getString("order_id");
OperatorAuthAlipay orderNo = operatorAuthService.getOne(new QueryWrapper<OperatorAuthAlipay>()
.eq("orderNo", order_id));
+
if (orderNo!=null){
orderNo.setRefuseReason(reason);
operatorAuthService.updateById(orderNo);
--
Gitblit v1.7.1