From 8b09fbc19a96b57bf1d0e4d7c79b51a76aeca554 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 28 三月 2025 19:57:56 +0800
Subject: [PATCH] 修改bug
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java
index caf7789..f3dba7d 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java
@@ -7,6 +7,7 @@
import com.stylefeng.guns.modular.system.model.Driver;
import com.stylefeng.guns.modular.system.model.UserInfo;
import com.stylefeng.guns.modular.system.model.Withdrawal;
+import com.stylefeng.guns.modular.system.service.IBalanceUsageRecordService;
import com.stylefeng.guns.modular.system.service.IDriverService;
import com.stylefeng.guns.modular.system.service.IWithdrawalService;
import com.stylefeng.guns.modular.system.util.ResultUtil;
@@ -15,7 +16,6 @@
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -34,16 +34,9 @@
@Autowired
private IDriverService driverService;
-
- /*@Autowired
- private ICBCPayUtil icbcPayUtil;*/
-
- @Autowired
- private RestTemplate internalRestTemplate;
-
-
-
- private Map<String, Timer> timerMap = new HashMap<>();
+
+ @Resource
+ private IBalanceUsageRecordService balanceUsageRecordService;
@@ -54,7 +47,7 @@
* @throws Exception
*/
@Override
- public ResultUtil withdrawal(Double money, Integer uid, Integer type, String remark, Integer language) throws Exception {
+ public synchronized ResultUtil withdrawal(Double money, Integer uid, Integer type, String remark, Integer language) throws Exception {
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.");
}
@@ -118,12 +111,13 @@
driver.setLaveActivityMoney(v);
v = new BigDecimal(driver.getBalance()).subtract(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
driver.setBalance(v);
+ balanceUsageRecordService.saveBalanceUsageRecord(driver.getId(), 1, money, 6);
}
if(type == 2){
double v = new BigDecimal(driver.getLaveBusinessMoney()).subtract(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
driver.setLaveBusinessMoney(v);
+ balanceUsageRecordService.saveBalanceUsageRecord(driver.getId(), 2, money, 6);
}
- this.insert(withdrawal);
driverService.updateById(driver);
return ResultUtil.success();
}
@@ -138,12 +132,14 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryWithdrawal(Integer language, Integer uid, Integer type, Integer pageNum, Integer size) throws Exception {
+ public List<Map<String, Object>> queryWithdrawal(Integer language, Integer uid, Integer type, Integer state, Integer pageNum, Integer size) throws Exception {
pageNum = (pageNum - 1) * size;
- List<Map<String, Object>> list = withdrawalMapper.queryWithdrawal(uid, 2, type, pageNum, size);
+ List<Map<String, Object>> list = withdrawalMapper.queryWithdrawal(uid, 2, type, state, pageNum, size);
for (Map<String, Object> map : list) {
- String insertTime = map.get("insertTime").toString();
- map.put("insertTime", com.stylefeng.guns.modular.system.util.DateUtil.conversionFormat(language, insertTime));
+ if(null != map.get("insertTime")){
+ String insertTime = map.get("insertTime").toString();
+ map.put("insertTime", com.stylefeng.guns.modular.system.util.DateUtil.conversionFormat(language, insertTime));
+ }
}
return list;
}
@@ -278,4 +274,15 @@
}
return ResultUtil.success();
}
+
+ /**
+ * 获取提现总额
+ * @param uid
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public Double queryWithdrawalSum(Integer uid, Integer type) throws Exception {
+ return this.baseMapper.queryWithdrawalSum(uid, 2, type);
+ }
}
--
Gitblit v1.7.1