From 11ade824e0abb0c42d6346c9b808666aaff99c9a Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 26 十一月 2025 21:26:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/UserWithdrawalController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/UserWithdrawalController.java b/DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/UserWithdrawalController.java
index 46dc03d..40af75a 100644
--- a/DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/UserWithdrawalController.java
+++ b/DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/UserWithdrawalController.java
@@ -164,6 +164,7 @@
}
String tokenNo = (String) map.get("token_no");
userWithdrawal.setTokenNo(tokenNo);
+ userWithdrawal.setType(1);
userWithdrawalService.insert(userWithdrawal);
// 通过司机进件信息封装银行卡信息进行数据库存储
@@ -265,6 +266,7 @@
userWithdrawal.setBankCode(bankCode);
userWithdrawal.setBankBranchCode(bankBranchCode);
userWithdrawal.setCode(code);
+ userWithdrawal.setType(1);
System.out.println(userWithdrawal);
Map<String, Object> resultMap = douGongBasicDataBiz.userBasicDataIndvModify(userWithdrawal);
//CusApplicationResp renew = CusApplicationExample.renew(userWithdrawal);
@@ -371,10 +373,13 @@
if(Objects.isNull(userWithdrawal)){
return ResultUtil.success(new Object());
}
- Region province = regionService.getRegionByCode(userWithdrawal.getBankCardProvinceCode());
- Region city = regionService.getRegionByCode(userWithdrawal.getBankCardCityCode());
- userWithdrawal.setBankCardProvince(province == null ? "" : province.getName());
- userWithdrawal.setBankCardCity(city == null ? "" : city.getName());
+ if(userWithdrawal!=null){
+ Region province = regionService.getRegionByCode(userWithdrawal.getBankCardProvinceCode());
+ Region city = regionService.getRegionByCode(userWithdrawal.getBankCardCityCode());
+ userWithdrawal.setBankCardProvince(province == null ? "" : province.getName());
+ userWithdrawal.setBankCardCity(city == null ? "" : city.getName());
+ }
+
return ResultUtil.success(userWithdrawal);
}catch (Exception e){
e.printStackTrace();
@@ -434,7 +439,8 @@
// 查询当前操作电子用户
// 司机进件信息
UserWithdrawal userWithdrawal = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>()
- .eq("phone",driver.getPhone()).eq("type", 1)
+ .eq("phone",driver.getPhone())
+ .eq("type", 1)
//.eq("applicationStatus","succeeded")
.last("LIMIT 1"));
@@ -529,7 +535,7 @@
// .eq("userType", 2));
userWithdrawal = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>()
.eq("phone", driver.getPhone())
- .eq("type", 1)
+ .eq("type", 1)
.last("LIMIT 1"));
if(Objects.isNull(userWithdrawal)){
return ResultUtil.error("该司机开户信息为空");
--
Gitblit v1.7.1