From 1045d8a4913ae1a4f91b14089afe0520c98e529c Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 26 十一月 2025 21:23:04 +0800
Subject: [PATCH] 司机端提现修改
---
DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WithdrawalController.java | 61 +++++++++++++++++++-----------
1 files changed, 38 insertions(+), 23 deletions(-)
diff --git a/DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WithdrawalController.java b/DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WithdrawalController.java
index 7c5392e..4d3f4dc 100644
--- a/DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WithdrawalController.java
+++ b/DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WithdrawalController.java
@@ -6,6 +6,8 @@
import com.stylefeng.guns.modular.account.service.ITBankNextService;
import com.stylefeng.guns.modular.account.service.UserWithdrawalService;
import com.stylefeng.guns.modular.cloudPayment.example.CusApplicationExample;
+import com.stylefeng.guns.modular.huifu.biz.DouGongBasicDataBiz;
+import com.stylefeng.guns.modular.huifu.biz.FenZhangUtil;
import com.stylefeng.guns.modular.system.model.BankCard;
import com.stylefeng.guns.modular.system.model.Driver;
import com.stylefeng.guns.modular.system.model.UserWithdrawal;
@@ -55,6 +57,8 @@
private IBankCardService bankCardService;
@Autowired
private ITBankNextService bankNextService;
+ @Autowired
+ private DouGongBasicDataBiz douGongBasicDataBiz;
/**
@@ -74,7 +78,7 @@
@ApiImplicitParam(value = "银行名称", name = "bankName", required = true, dataType = "string"),
@ApiImplicitParam(value = "银行卡号", name = "code", required = true, dataType = "string"),
@ApiImplicitParam(value = "银行卡持有人姓名", name = "name", required = true, dataType = "string"),
- @ApiImplicitParam(value = "验证码", name = "smsCode", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "验证码-废弃", name = "smsCode", required = true, dataType = "string"),
@ApiImplicitParam(value = "提现类型（1=活动收入提现，2=业务收入提现）", name = "type", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
@@ -104,37 +108,48 @@
}
UserWithdrawal userWithdrawal = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>()
.eq("userId", driver.getId())
- .eq("userType", 2)
+ .eq("type", 1)
.last("LIMIT 1"));
if (Objects.isNull(userWithdrawal)) {
return ResultUtil.error("请先进行个人用户进件信息填写");
}
- TBankNext bankNext = bankNextService.selectOne(new EntityWrapper<TBankNext>()
- .eq("bankName", bankName)
- .last("LIMIT 1"));
+ //TBankNext bankNext = bankNextService.selectOne(new EntityWrapper<TBankNext>()
+ // .eq("bankName", bankName)
+ // .last("LIMIT 1"));
userWithdrawal.setBankName(bankName);
- userWithdrawal.setBankCode(bankNext.getDrecCode());
- userWithdrawal.setBankBranchCode(bankNext.getBankCode());
+ //userWithdrawal.setBankCode(bankNext.getDrecCode());
+ //userWithdrawal.setBankBranchCode(bankNext.getBankCode());
+ userWithdrawal.setBankCardProvinceCode(bankCard.getBankCardProvinceCode());
+ userWithdrawal.setBankCardCityCode(bankCard.getBankCardCityCode());
userWithdrawal.setBankCardCode(code);
- userWithdrawal.setCode(smsCode);
- CusApplicationResp renew = CusApplicationExample.renew(userWithdrawal);
- System.err.println("修改个人用户进件信息返回" + renew);
- if ("succeeded".equals(renew.getApplicationStatus())) {
- // 修改银行卡信息
- bankCard.setVerifyStatus("succeeded");
- bankCard.setSettleAcctId(renew.getSettleAcctId());
- bankCardService.updateById(bankCard);
-
- userWithdrawal.setBankCardCode(code);
- userWithdrawal.setBankName(bankCard.getBank());
- userWithdrawal.setSettleAcctId(renew.getSettleAcctId());
- userWithdrawal.setBalanceAcctId(renew.getBalanceAcctId());
- userWithdrawal.setBankCode(bankCard.getBankCode());
- userWithdrawal.setBankBranchCode(bankCard.getBankBranchCode());
- userWithdrawalService.updateById(userWithdrawal);
+ //userWithdrawal.setCode(smsCode);
+ Map<String, Object> map = douGongBasicDataBiz.userBasicDataIndvModify(userWithdrawal);
+ if (!"00000000".equals(map.get("resp_code"))) {
+ return ResultUtil.error("修改个人用户进件信息失败，原因：" + map.get("resp_desc"));
}
+ Map<String, Object> res = douGongBasicDataBiz.userBusinessOpenModify(userWithdrawal);
+ if (!"00000000".equals(res.get("resp_code"))) {
+ return ResultUtil.error("修改个人用户进件信息失败，原因：" + res.get("resp_desc"));
+ }
+ //CusApplicationResp renew = CusApplicationExample.renew(userWithdrawal);
+ //System.err.println("修改个人用户进件信息返回" + renew);
+ // 修改银行卡信息
+ bankCard.setVerifyStatus("succeeded");
+ //bankCard.setSettleAcctId(renew.getSettleAcctId());
+ bankCardService.updateById(bankCard);
+
+ userWithdrawal.setBankCardCode(code);
+ userWithdrawal.setBankName(bankCard.getBank());
+ //userWithdrawal.setSettleAcctId(renew.getSettleAcctId());
+ //userWithdrawal.setBalanceAcctId(renew.getBalanceAcctId());
+ userWithdrawal.setHuifuId((String) map.get("huifu_id"));
+ String tokenNo = (String) res.get("token_no");
+ userWithdrawal.setTokenNo(tokenNo);
+ userWithdrawal.setBankCode(bankCard.getBankCode());
+ userWithdrawal.setBankBranchCode(bankCard.getBankBranchCode());
+ userWithdrawalService.updateById(userWithdrawal);
return withdrawalService.withdrawal(money, bankName, code, name, uid, type);
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.7.1