From 00caef45a8833dc58919e23eb88a3484cfacdaa4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 22 八月 2023 17:53:25 +0800
Subject: [PATCH] 更新
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java
index 31430ea..53cb8fd 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java
@@ -8,6 +8,10 @@
import com.stylefeng.guns.modular.system.service.IUserInfoService;
import com.stylefeng.guns.modular.system.service.IWithdrawalService;
import com.stylefeng.guns.modular.system.util.ResultUtil;
+import com.stylefeng.guns.modular.system.util.Tingg.TinggPayoutUtil;
+import com.stylefeng.guns.modular.system.util.Tingg.model.AuthStatus;
+import com.stylefeng.guns.modular.system.util.Tingg.model.PayoutResponse;
+import com.stylefeng.guns.modular.system.util.Tingg.model.Results;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Isolation;
@@ -29,8 +33,8 @@
@Autowired
private IUserInfoService userInfoService;
- /* @Autowired
- private ICBCPayUtil icbcPayUtil;*/
+ @Autowired
+ private TinggPayoutUtil tinggPayoutUtil;
private Map<String, Timer> timerMap = new HashMap<>();
@@ -40,13 +44,11 @@
/**
* 提现操作
* @param money
- * @param code
- * @param name
* @param uid
* @throws Exception
*/
@Override
- public ResultUtil withdrawal(Double money, String code, String name, Integer uid, Integer language) throws Exception {
+ public ResultUtil withdrawal(Double money, Integer uid, String remark, Integer language) throws Exception {
language = userInfoService.queryLanguage(uid, language);
if(money.compareTo(0D) <= 0){
return ResultUtil.error(language == 1 ? "提现金额必须大于0" : language == 2 ? "Withdrawal amount must be greater than 0" : "Le montant du retrait doit être supérieur à 0");
@@ -61,17 +63,16 @@
Withdrawal withdrawal = new Withdrawal();
withdrawal.setBalance(userInfo.getBalance());
- withdrawal.setCode(code);
+ withdrawal.setCode(userInfo.getPhone());// TODO: 2023/7/5 第三方支支持手机号提现
+ withdrawal.setBankName(userInfo.getPhoneOperator());
withdrawal.setFlag(1);
withdrawal.setInsertTime(new Date());
+ withdrawal.setRemark(remark);
withdrawal.setMoney(money);
- withdrawal.setName(name);
+ withdrawal.setName(userInfo.getFirstName() + " " + userInfo.getLastName());
withdrawal.setState(1);
withdrawal.setUserId(uid);
withdrawal.setUserType(1);
-
- /*ResultUtil<String> transfer = icbcPayUtil.transfer(Double.valueOf(withdrawal.getMoney() * 100).longValue(), withdrawal.getCode(), withdrawal.getName());
- withdrawal.setSerialNo(transfer.getData());*/
this.insert(withdrawal);
double v = new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
@@ -90,9 +91,14 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryWithdrawal(Integer uid, Integer pageNum, Integer size) throws Exception {
+ public List<Map<String, Object>> queryWithdrawal(Integer uid, Integer pageNum, Integer size, Integer language) throws Exception {
pageNum = (pageNum - 1) * size;
- return withdrawalMapper.queryWithdrawal(uid, 1, pageNum, size);
+ String name = language == 1 ? "手机号:" : language == 2 ? "Phone number:" : "Numéro de portable:";
+ List<Map<String, Object>> list = withdrawalMapper.queryWithdrawal(uid, 1, pageNum, size);
+ for (Map<String, Object> map : list) {
+ map.put("name", name + map.get("code"));
+ }
+ return list;
}
--
Gitblit v1.7.1