From 11ade824e0abb0c42d6346c9b808666aaff99c9a Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 26 十一月 2025 21:26:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserCallbackController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserCallbackController.java b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserCallbackController.java
index 8fac660..46f1495 100644
--- a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserCallbackController.java
+++ b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserCallbackController.java
@@ -83,8 +83,8 @@
String trans_stat = jsonObject.get("trans_stat").toString();
if ("S".equals(trans_stat)) {
String[] split = out_trade_no.split("_");
- Integer uid = Integer.valueOf(split[0]);
- Integer id = Integer.valueOf(split[1]);
+ Integer uid = Integer.valueOf(split[1]);
+ Integer id = Integer.valueOf(split[0]);
String payAmt = jsonObject.get("pay_amt").toString();
userInfoService.payCancelUserBalance(Integer.valueOf(uid), order_id, Integer.valueOf(id), 1);
// appOrderController.createAllocationReqUser(1, Integer.valueOf(uid), 1, new BigDecimal(payAmt).divide(new BigDecimal(100)).doubleValue());
@@ -127,8 +127,8 @@
String trans_stat = jsonObject.get("trans_stat").toString();
if ("S".equals(trans_stat)) {
String[] split = out_trade_no.split("_");
- Integer uid = Integer.valueOf(split[0]);
- Integer id = Integer.valueOf(split[1]);
+ Integer uid = Integer.valueOf(split[1]);
+ Integer id = Integer.valueOf(split[0]);
String payAmt = jsonObject.get("pay_amt").toString();
userInfoService.payCancelUserBalance(Integer.valueOf(uid), order_id, Integer.valueOf(id), 2);
--
Gitblit v1.7.1