From 736ab0090700c75af37b8a3456b01609e4e2d329 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 17 七月 2024 11:09:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 8c11139..a2e6cc0 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;
@@ -33,6 +34,9 @@
@Autowired
private IDriverService driverService;
+
+ @Resource
+ private IBalanceUsageRecordService balanceUsageRecordService;
@@ -107,10 +111,12 @@
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);
}
driverService.updateById(driver);
return ResultUtil.success();
@@ -126,9 +132,9 @@
* @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) {
if(null != map.get("insertTime")){
String insertTime = map.get("insertTime").toString();
@@ -268,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