From d1cc28c9fd86017f4a0a9013554bf1602fef8bc8 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期二, 27 八月 2024 09:15:56 +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, 4 insertions(+), 7 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..d788977 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
@@ -144,26 +144,24 @@
public Object immediately(@RequestParam Integer id,@RequestParam Integer state,@RequestParam String remark) {
TPubWithdrawal tPubWithdrawal = tPubWithdrawalService.selectById(id);
if (SinataUtil.isNotEmpty(tPubWithdrawal)){
+ TDriver tDriver = driverService.selectById(tPubWithdrawal.getUserId());
+ Integer language = tDriver.getLanguage();
tPubWithdrawal.setRemark(remark);
String serviceCode = "";
String phone = "";
- String narration = "";
if(tPubWithdrawal.getUserType() == 1){
TUser tUser = userService.selectById(tPubWithdrawal.getUserId());
serviceCode = tUser.getPhoneOperator();
phone = tUser.getPhone();
- narration = "用户提现";
}else{
- TDriver tDriver = driverService.selectById(tPubWithdrawal.getUserId());
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();
@@ -183,7 +181,6 @@
tUser.setBalance(tUser.getBalance().add(tPubWithdrawal.getMoney()));
userService.updateById(tUser);
}else{
- TDriver tDriver = driverService.selectById(tPubWithdrawal.getUserId());
tDriver.setBalance(tDriver.getBalance().add(tPubWithdrawal.getMoney()));
if(tPubWithdrawal.getType() == 1){//活动提现
tDriver.setLaveActivityMoney(new BigDecimal(tDriver.getLaveActivityMoney()).add(tPubWithdrawal.getMoney()).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
@@ -200,7 +197,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