From 6a90f2d1feaf583c211d5f9fe95dff7f7c748ed3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 06 九月 2024 17:42:20 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TPubWithdrawalController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 d788977..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
@@ -144,17 +144,18 @@
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 = "";
+ Integer language = null;
if(tPubWithdrawal.getUserType() == 1){
TUser tUser = userService.selectById(tPubWithdrawal.getUserId());
+ language = tUser.getLanguage();
serviceCode = tUser.getPhoneOperator();
phone = tUser.getPhone();
}else{
+ TDriver tDriver = driverService.selectById(tPubWithdrawal.getUserId());
+ language = tDriver.getLanguage();
serviceCode = tDriver.getPhoneOperator();
phone = tDriver.getPhone();
}
@@ -181,6 +182,7 @@
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());
--
Gitblit v1.7.1