From 009f795a6e93cbb94e4a316e0efa8cb7124743f5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 十月 2024 19:13:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TPubWithdrawalController.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TPubWithdrawalController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TPubWithdrawalController.java
index 0c9ef16..b46e84d 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TPubWithdrawalController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TPubWithdrawalController.java
@@ -145,25 +145,24 @@
TPubWithdrawal tPubWithdrawal = tPubWithdrawalService.selectById(id);
if (SinataUtil.isNotEmpty(tPubWithdrawal)){
tPubWithdrawal.setRemark(remark);
-
String serviceCode = "";
String phone = "";
- String narration = "";
+ Integer language = null;
if(tPubWithdrawal.getUserType() == 1){
TUser tUser = userService.selectById(tPubWithdrawal.getUserId());
+ language = tUser.getLanguage();
serviceCode = tUser.getPhoneOperator();
phone = tUser.getPhone();
- narration = "用户提现";
}else{
TDriver tDriver = driverService.selectById(tPubWithdrawal.getUserId());
+ language = tDriver.getLanguage();
serviceCode = tDriver.getPhoneOperator();
phone = tDriver.getPhone();
- narration = "司机提现";
}
if(2 == state){
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String payerTransactionID = sdf.format(new Date()) + tPubWithdrawal.getId();
- PayoutResponse payoutResponse = tinggPayoutUtil.sendPayout(serviceCode, "+" + phone, payerTransactionID, tPubWithdrawal.getMoney().doubleValue(), callbackPath + "/base/withdrawalCallback", narration);
+ PayoutResponse payoutResponse = tinggPayoutUtil.sendPayout(serviceCode, phone, payerTransactionID, tPubWithdrawal.getMoney().doubleValue(), callbackPath + "/base/withdrawalCallback", remark);
AuthStatus authStatus = payoutResponse.getAuthStatus();
Results results = payoutResponse.getResults().get(0);
String statusCode = results.getStatusCode();
@@ -200,7 +199,7 @@
TSystemNotice notice = new TSystemNotice();
notice.setType(2);
notice.setUserType(tPubWithdrawal.getUserType());
- notice.setContent("提现处理结果:【"+remark+"】。");
+ notice.setContent((language == 1 ? "提现申请反馈" : language == 2 ? "Feedback on withdrawal requests" : "Réponse à la demande de retrait") + ":【" +remark +"】。");
notice.setUserId(tPubWithdrawal.getUserId());
notice.setInsertTime(new Date());
notice.setRead(1);
--
Gitblit v1.7.1