From ea1d0dcf654b3963e976ad011b4e0d8960bdbe23 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 19 十一月 2025 09:46:30 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/JiaYiXing2025
---
UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/ElectronicLedgerController.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/ElectronicLedgerController.java b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/ElectronicLedgerController.java
index e4a6c9f..c1a5c07 100644
--- a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/ElectronicLedgerController.java
+++ b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/ElectronicLedgerController.java
@@ -80,7 +80,7 @@
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
@Transactional(rollbackFor = UpyztException.class,propagation = Propagation.REQUIRES_NEW)
- public ResultUtil addElectronicLedger( UserWithdrawalReq userWithdrawalReq,HttpServletRequest request) throws UnsupportedEncodingException {
+ public ResultUtil addElectronicLedger( UserWithdrawalReq userWithdrawalReq,HttpServletRequest request) {
System.out.println("进件信息："+userWithdrawalReq);
// TODO 用户有无提现密码，无则设置开户密码
if(StringUtils.hasLength(userWithdrawalReq.getBankName())){
@@ -103,7 +103,7 @@
UserWithdrawal userWithdrawal = new UserWithdrawal();
BeanUtils.copyProperties(userWithdrawalReq,userWithdrawal);
try {
- String password=userWithdrawal.getTransactionAuthorizationCode();
+ //String password=userWithdrawal.getTransactionAuthorizationCode();
Integer id = userInfoService.getUserIdFormRedis(request);
if(null == id){
return ResultUtil.tokenErr();
@@ -112,13 +112,13 @@
userWithdrawalReq.setCopy1(userWithdrawalReq.getCopy1().replaceAll(" ","+"));
userWithdrawalReq.setCopy2(userWithdrawalReq.getCopy2().replaceAll(" ","+"));
// 用户进件
- Map<String, Object> resultMap = douGongBasicDataBiz.userBasicDataIndv(userWithdrawalReq);
+ Map<String, Object> resultMap = douGongBasicDataBiz.userBasicDataIndv(userWithdrawal);
String respCode = (String) resultMap.get("resp_code");
//CusApplicationResp cusApplicationResp = CusApplicationExample.create(userWithdrawalReq);
- if(!"200".equals(respCode)) {
+ if(!"00000000".equals(respCode)) {
return ResultUtil.error((String) resultMap.get("resp_desc"));
}
- userWithdrawal.setTransactionAuthorizationCode(Base64Util.encode(password));
+ //userWithdrawal.setTransactionAuthorizationCode(Base64Util.encode(password));
userWithdrawal.setUserType(1);
userWithdrawal.setUserId(id);
userWithdrawal.setImgUrl(userWithdrawalReq.getIdCardFrontPicture());
@@ -128,11 +128,12 @@
userWithdrawal.setHuiFuId((String) resultMap.get("huifu_id"));
//调用汇付业务入驻接口
Map<String, Object> map = douGongBasicDataBiz.userBusinessOpen(userWithdrawal);
- if (!"200".equals(map.get("resp_code"))){
+ if (!"00000000".equals(map.get("resp_code"))){
return ResultUtil.error((String) map.get("resp_desc"));
}
String tokenNo = (String) map.get("token_no");
userWithdrawal.setTokenNo(tokenNo);
+ userWithdrawal.setType(1);
userWithdrawalService.insert(userWithdrawal);
// 开通电子账簿
/* BalanceAcctReq balanceAcctReq = new BalanceAcctReq();
@@ -229,9 +230,9 @@
}
UserInfo userInfo = userInfoService.selectById(driverId);
UserWithdrawal userWithdrawal1 = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>()
- .eq("phone", userInfo.getPhone())
+ .eq("phone", userInfo.getPhone()).eq("type", 1)
.last("LIMIT 1"));
- if(userWithdrawal1==null|| userWithdrawal1.getCusId()==null){
+ if(userWithdrawal1==null|| userWithdrawal1.getHuiFuId()==null){
return ResultUtil.runErr();
}
UserWithdrawal userWithdrawal = new UserWithdrawal();
@@ -252,12 +253,12 @@
userWithdrawal.setBankCardCityCode(bankCardCityCode);
//CusApplicationResp renew = CusApplicationExample.renew(userWithdrawal);
Map<String, Object> resultMap = douGongBasicDataBiz.userBasicDataIndvModify(userWithdrawal);
- if (!"200".equals(resultMap.get("resp_code"))){
+ if (!"00000000".equals(resultMap.get("resp_code"))){
return ResultUtil.error((String) resultMap.get("resp_desc"));
}
//调用用户业务入驻修改
Map<String, Object> map = douGongBasicDataBiz.userBusinessOpenModify(userWithdrawal);
- if (!"200".equals(map.get("resp_code"))){
+ if (!"00000000".equals(map.get("resp_code"))){
return ResultUtil.error((String) map.get("resp_desc"));
}
userWithdrawal1.setIdCardFrontPicture(copy1);
--
Gitblit v1.7.1