From 0001861cc63fc670646a103284b9eaefb193e91f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 10 八月 2024 17:31:48 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 e99ce56..d3e9327 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
@@ -49,7 +49,7 @@
* @throws Exception
*/
@Override
- public ResultUtil withdrawal(Double money, Integer uid, String remark, Integer language) throws Exception {
+ public synchronized 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 zero." : "Le montant du retrait doit être supérieur à zéro.");
@@ -92,10 +92,10 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryWithdrawal(Integer uid, Integer pageNum, Integer size, Integer language) throws Exception {
+ public List<Map<String, Object>> queryWithdrawal(Integer uid, Integer pageNum, Integer size, Integer state, Integer language) throws Exception {
pageNum = (pageNum - 1) * size;
String name = language == 1 ? "手机号:" : language == 2 ? "Phone number:" : "Numéro de portable:";
- List<Map<String, Object>> list = withdrawalMapper.queryWithdrawal(uid, 1, pageNum, size);
+ List<Map<String, Object>> list = withdrawalMapper.queryWithdrawal(uid, 1, state, pageNum, size);
for (Map<String, Object> map : list) {
map.put("name", name + map.get("code"));
if(null != map.get("insertTime")){
--
Gitblit v1.7.1