From 7ee9bc8fb2e42ce2e82cd1eacb57ba584611dfc5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 23 六月 2023 11:04:32 +0800
Subject: [PATCH] 修改bug
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/CashWithdrawalServiceImpl.java | 162 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 134 insertions(+), 28 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 5d425b6..618cbaf 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
@@ -61,10 +61,10 @@
@Override
public ResultUtil withdrawCash(Integer driverId, Integer type, Integer bankId, Double money) throws Exception {
Driver driver = driverService.selectById(driverId);
- if(type == 1 && null == driver.getBalance() || driver.getBalance() < money){
+ if(type == 1 && (null == driver.getBalance() || driver.getBalance().compareTo(money) < 0)){
return ResultUtil.error("余额不足");
}
- if(type == 2 && null == driver.getCommission() || driver.getCommission() < money){
+ if(type == 2 && (null == driver.getCommission() || driver.getCommission().compareTo(money) < 0)){
return ResultUtil.error("收入余额不足");
}
if(ToolUtil.isEmpty(driver.getMerchantNumber())){
@@ -89,36 +89,77 @@
accountChangeDetail.setUserId(driver.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(type == 1 ? 4 : 6);
- accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
if(type == 1){
+ accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance());
driver.setBalance(driver.getBalance() - money);
+ accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance());
}else{
+ accountChangeDetail.setOldData(driver.getCommission() + driver.getCouponBalance());
driver.setCommission(driver.getCommission() - money);
+ accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
}
- accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
accountChangeDetail.setExplain(type == 1 ? "账户余额提现" : "佣金余额提现");
driverService.updateById(driver);
accountChangeDetailService.saveData(accountChangeDetail);
if(type == 1){//余额提现，调用分账接口 -->确认收货--->提现
- fenzhang(driver, money, cashWithdrawal, 1);
- }else{//佣金提现，调用充值接口数据进行分账
- fenzhang(driver, money, cashWithdrawal, 2);
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2)
+ .eq("userId", driver.getId()).eq("payType", 1).eq("payStatus", 2).gt("surplusDividedAmount", 0));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(money) >= 0){//够分账
+ ResultUtil fenzhang = fenzhang(driver, rechargeRecord, cashWithdrawal, 3, money);
+ if(fenzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - money);
+ rechargeRecordService.updateById(rechargeRecord);
+ break;
+ }else{
+ return fenzhang;
+ }
+ }else{
+ ResultUtil fenzhang = fenzhang(driver, rechargeRecord, cashWithdrawal, 3, surplusDividedAmount);
+ if(fenzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ money -= surplusDividedAmount;
+ }else{
+ return fenzhang;
+ }
+ }
+ }
+ }else{//佣金提现，直接提现到银行卡
+ Withdraw withdraw = new Withdraw();
+ withdraw.setUserId(driver.getMerchantNumber());
+ withdraw.setAmount(String.valueOf(Double.valueOf(money * 100).intValue()));
+ withdraw.setOrderName("账户余额提现");
+ withdraw.setRemark("账户余额提现");
+ withdraw.setNotifyUrl(callbackPath + "/base/driver/withdrawCashCallback");
+ withdraw.setParameter1(cashWithdrawal.getId().toString());
+ TrhRequest<Withdraw> request1 = new TrhRequest();
+ InterfaceResponse execute = request1.execute(withdraw, Withdraw.SERVICE_CODE);//结算（提现）
+ if("0000".equals(execute.getCode())){
+ JSONObject jsonObject1 = JSON.parseObject(execute.getResult());
+ String merOrderId1 = jsonObject1.getString("merOrderId");
+ Integer status = jsonObject1.getInteger("status");//0：待处理；1：成功；2：失败
+ if(1 == status){
+ cashWithdrawal.setOrderNumber(merOrderId1);
+ cashWithdrawal.setState(2);
+ this.updateById(cashWithdrawal);
+ }
+ if(2 == status){
+ System.err.println("结算接口异常【提现】：" + jsonObject1.getString("statusMsg"));
+ }
+ }else{
+ System.err.println("结算接口异常【提现】：" + execute.getMsg());
+ }
}
-
-// 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();
}
+
+
+
+
/**
@@ -146,11 +187,14 @@
divisionRecord.setUserId(driver.getId());
divisionRecord.setOrderId(rechargeRecord.getId().longValue());
divisionRecord.setSourceType(payType == 1 ? 3 : 2);
- divisionRecord.setAmount(surplusDividedAmount);
+ divisionRecord.setAmount(amount);
divisionRecord.setMerchantNumber(driver.getMerchantNumber());
divisionRecord.setState(1);
divisionRecord.setCreateTime(new Date());
divisionRecordService.insert(divisionRecord);
+
+ rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - amount);
+ rechargeRecordService.updateById(rechargeRecord);
Complete complete = new Complete();
complete.setOriginalMerOrderId(rechargeRecord.getOrderNumber());
@@ -161,7 +205,7 @@
List<PamentOrderUser> splitList = new ArrayList<>();
PamentOrderUser pamentOrderUser = new PamentOrderUser();
pamentOrderUser.setSplitUserId(driver.getMerchantNumber());
- pamentOrderUser.setSplitAmount(amount.toString());
+ pamentOrderUser.setSplitAmount(String.valueOf(Double.valueOf(amount * 100).intValue()));
pamentOrderUser.setSplitType("1");
splitList.add(pamentOrderUser);
complete.setSplitList(splitList);
@@ -190,9 +234,9 @@
}, 15000);
}
}else{
- System.err.println("司机提现分账异常：" + execute.getMsg());
+ System.err.println("司机提现分账处理异常 ：" + execute.getMsg());
+ return ResultUtil.error("司机提现分账处理异常 ：" + execute.getMsg());
}
- break;
}else{//不够分账
DivisionRecord divisionRecord = new DivisionRecord();
divisionRecord.setUserType(1);
@@ -205,6 +249,9 @@
divisionRecord.setCreateTime(new Date());
divisionRecordService.insert(divisionRecord);
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+
Complete complete = new Complete();
complete.setOriginalMerOrderId(rechargeRecord.getOrderNumber());
complete.setNotifyUrl(callbackPath + "/base/driver/withdrawCashFZCallback");
@@ -213,7 +260,7 @@
List<PamentOrderUser> splitList = new ArrayList<>();
PamentOrderUser pamentOrderUser = new PamentOrderUser();
pamentOrderUser.setSplitUserId(driver.getMerchantNumber());
- pamentOrderUser.setSplitAmount(surplusDividedAmount.toString());
+ pamentOrderUser.setSplitAmount(String.valueOf(Double.valueOf(surplusDividedAmount * 100).intValue()));
pamentOrderUser.setSplitType("1");
splitList.add(pamentOrderUser);
complete.setSplitList(splitList);
@@ -242,14 +289,73 @@
}, 15000);
}
}else{
- System.err.println("司机提现分账异常：" + execute.getMsg());
- break;
+ System.err.println("司机提现分账处理异常 ：" + execute.getMsg());
+ return ResultUtil.error("司机提现分账处理异常 ：" + execute.getMsg());
}
amount -= surplusDividedAmount;
}
}
return ResultUtil.success();
}
+
+
+
+ public ResultUtil fenzhang(Driver driver, RechargeRecord rechargeRecord, CashWithdrawal cashWithdrawal, Integer sourceType, Double amount){
+ DivisionRecord divisionRecord = new DivisionRecord();
+ divisionRecord.setUserType(1);
+ divisionRecord.setUserId(driver.getId());
+ divisionRecord.setOrderId(rechargeRecord.getId().longValue());
+ divisionRecord.setSourceType(sourceType);
+ divisionRecord.setAmount(amount);
+ divisionRecord.setMerchantNumber(driver.getMerchantNumber());
+ divisionRecord.setState(1);
+ divisionRecord.setCreateTime(new Date());
+ divisionRecordService.insert(divisionRecord);
+
+ Complete complete = new Complete();
+ complete.setOriginalMerOrderId(rechargeRecord.getOrderNumber());
+ complete.setNotifyUrl(callbackPath + "/base/driver/withdrawCashFZCallback");
+ complete.setParameter1(divisionRecord.getId().toString());
+ //分账方列表
+ List<PamentOrderUser> splitList = new ArrayList<>();
+ PamentOrderUser pamentOrderUser = new PamentOrderUser();
+ pamentOrderUser.setSplitUserId(driver.getMerchantNumber());
+ pamentOrderUser.setSplitAmount(String.valueOf(Double.valueOf(amount * 100).intValue()));
+ pamentOrderUser.setSplitType("1");
+ splitList.add(pamentOrderUser);
+ complete.setSplitList(splitList);
+ TrhRequest<Complete> request = new TrhRequest();
+ InterfaceResponse execute = request.execute(complete, Complete.SERVICE_CODE);//分账操作
+ if("0000".equals(execute.getCode())){
+ JSONObject jsonObject = JSON.parseObject(execute.getResult());
+ Integer status = jsonObject.getInteger("status");//0：待处理 1：成功 2：失败
+ String merOrderId = jsonObject.getString("merOrderId");
+ if(2 == status){
+ System.err.println("司机提现分账失败：" + execute.getMsg());
+ return ResultUtil.error("司机提现分账失败 ：" + execute.getMsg());
+ }
+ if(1 == status){
+ divisionRecord.setMerOrderId(merOrderId);
+ divisionRecord.setPayTime(new Date());
+ divisionRecord.setState(2);
+ divisionRecordService.updateById(divisionRecord);
+
+ //间隔10秒开始调用确认收货后开始提现
+ new Timer().schedule(new TimerTask() {//确认收货和提现
+ @Override
+ public void run() {
+ confirmReceipt(driver, rechargeRecord, divisionRecord, cashWithdrawal);
+ }
+ }, 15000);
+ }
+ }else{
+ System.err.println("司机提现分账处理异常 ：" + execute.getMsg());
+ return ResultUtil.error("司机提现分账处理异常 ：" + execute.getMsg());
+ }
+ return ResultUtil.success();
+ }
+
+
/**
@@ -263,11 +369,11 @@
Receive receive = new Receive();
receive.setOriginalMerOrderId(rechargeRecord.getOrderNumber());
receive.setAsynMerOrderId(divisionRecord.getMerOrderId());
- receive.setRcvAmount(divisionRecord.getAmount().toString());
+ receive.setRcvAmount(String.valueOf(Double.valueOf(divisionRecord.getAmount() * 100).intValue()));
List<ReceiveUser> splitList = new ArrayList<>();
ReceiveUser receiveUser = new ReceiveUser();
receiveUser.setSplitUserId(driver.getMerchantNumber());
- receiveUser.setRcvSplitAmount(divisionRecord.getAmount().toString());
+ receiveUser.setRcvSplitAmount(String.valueOf(Double.valueOf(divisionRecord.getAmount() * 100).intValue()));
splitList.add(receiveUser);
receive.setSplitList(splitList);
TrhRequest<Receive> request = new TrhRequest();
@@ -278,7 +384,7 @@
if(ToolUtil.isNotEmpty(merOrderId)){
Withdraw withdraw = new Withdraw();
withdraw.setUserId(driver.getMerchantNumber());
- withdraw.setAmount(divisionRecord.getAmount().toString());
+ withdraw.setAmount(String.valueOf(Double.valueOf(divisionRecord.getAmount() * 100).intValue()));
withdraw.setOrderName("账户余额提现");
withdraw.setRemark("账户余额提现");
withdraw.setNotifyUrl(callbackPath + "/base/driver/withdrawCashCallback");
--
Gitblit v1.7.1