From 67bfacb03541ef2ee4c1496f4cc7600014cd1005 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 18 四月 2023 17:37:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/CashWithdrawalServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/CashWithdrawalServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/CashWithdrawalServiceImpl.java
index abf2e47..ab14d39 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/CashWithdrawalServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/CashWithdrawalServiceImpl.java
@@ -1,16 +1,21 @@
package com.supersavedriving.driver.modular.system.service.impl;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.supersavedriving.driver.core.util.ToolUtil;
import com.supersavedriving.driver.modular.system.dao.CashWithdrawalMapper;
+import com.supersavedriving.driver.modular.system.model.AccountChangeDetail;
import com.supersavedriving.driver.modular.system.model.CashWithdrawal;
import com.supersavedriving.driver.modular.system.model.Driver;
+import com.supersavedriving.driver.modular.system.service.IAccountChangeDetailService;
import com.supersavedriving.driver.modular.system.service.ICashWithdrawalService;
import com.supersavedriving.driver.modular.system.service.IDriverService;
+import com.supersavedriving.driver.modular.system.util.PayMoneyUtil;
import com.supersavedriving.driver.modular.system.util.ResultUtil;
import com.supersavedriving.driver.modular.system.util.UUIDUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.text.SimpleDateFormat;
import java.util.Date;
/**
@@ -23,8 +28,25 @@
@Autowired
private IDriverService driverService;
+ @Autowired
+ private PayMoneyUtil payMoneyUtil;
+
+ @Autowired
+ private IAccountChangeDetailService accountChangeDetailService;
+
+
+
+
+ /**
+ * 司机提现操作
+ * @param driverId
+ * @param type
+ * @param money
+ * @return
+ * @throws Exception
+ */
@Override
public ResultUtil withdrawCash(Integer driverId, Integer type, Double money) throws Exception {
Driver driver = driverService.selectById(driverId);
@@ -44,13 +66,40 @@
cashWithdrawal.setState(1);
cashWithdrawal.setCreateTime(new Date());
this.insert(cashWithdrawal);
+
+ //增加记录
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver.getId());
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setChangeType(type == 1 ? 4 : 6);
if(type == 1){
+ accountChangeDetail.setOldData(driver.getBalance());
driver.setBalance(driver.getBalance() - money);
+ accountChangeDetail.setNewData(driver.getBalance());
+ accountChangeDetail.setExplain("账户余额提现");
}
if(type == 2){
+ accountChangeDetail.setOldData(driver.getCommission());
driver.setCommission(driver.getCommission() - money);
+ accountChangeDetail.setNewData(driver.getCommission());
+ accountChangeDetail.setExplain("佣金余额提现");
}
driverService.updateById(driver);
+ accountChangeDetailService.saveData(accountChangeDetail);
+
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+ String outDetailNo = sdf.format(new Date()) + cashWithdrawal.getId();
+ String s = payMoneyUtil.weixinTransferMoney(outDetailNo, money, driver.getOpenid(), driver.getName(), "【超省新代驾】提现付款！");
+ if(ToolUtil.isEmpty(s)){
+ return ResultUtil.error("提现异常，请联系管理员");
+ }
+ cashWithdrawal.setState(2);
+ cashWithdrawal.setOrderNumber(s);
+ this.updateById(cashWithdrawal);
return ResultUtil.success();
}
+
}
--
Gitblit v1.7.1