From 380ff8db6b99fae591acf2ab1e0fb2de6f867160 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 26 十一月 2025 18:32:52 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/JiaYiXing2025
---
ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/huifu/biz/DouGongBasicDataBiz.java | 2 +-
UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserBankAccount.java | 8 ++++++++
UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/AccountController.java | 4 +++-
UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/model/TUserBankAccount.java | 6 ++++++
UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WithdrawalController.java | 11 +++++------
5 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/huifu/biz/DouGongBasicDataBiz.java b/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/huifu/biz/DouGongBasicDataBiz.java
index b9e4fcf..cc12dcb 100644
--- a/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/huifu/biz/DouGongBasicDataBiz.java
+++ b/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/huifu/biz/DouGongBasicDataBiz.java
@@ -440,7 +440,7 @@
// 3. 发起API调用
Map<String, Object> response = BasePayRequest.requestBasePay("v2/trade/acctpayment/balance/query", paramsInfo, null, false);
log.info("账户余额信息查询返回参数:{}", response);
- JSONArray accountList = JSONArray.parseArray(JSONObject.toJSONString(response.get("acctInfo_list")));
+ JSONArray accountList = JSONArray.parseArray(response.get("acctInfo_list").toString());
if (accountList != null && !accountList.isEmpty()) {
JSONObject acctInfo = accountList.getJSONObject(0);
log.info("账户余额信息查询返回余额:{}", acctInfo.getString("avail_bal"));
diff --git a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/AccountController.java b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/AccountController.java
index 970e6cd..c2fdd66 100644
--- a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/AccountController.java
+++ b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/AccountController.java
@@ -95,6 +95,8 @@
userBankAccount1.setUserType(1);
userBankAccount1.setOutRequestNo(ToolUtil.getRandomString(32));
userBankAccount1.setBankAcctType("1");
+ userBankAccount1.setBankCardProvinceCode(userBankAccount.getBankCardProvinceCode());
+ userBankAccount1.setBankCardCityCode(userBankAccount.getBankCardCityCode());
bankAccountService.insert(userBankAccount1);
//UserBankAccountReq userBankAccountReq = new UserBankAccountReq();
//BeanUtils.copyProperties(userBankAccount1,userBankAccountReq);
@@ -105,7 +107,7 @@
// userBankAccount1.setAcctValidationFailureMsg(settleAcctResp.getAcctValidationFailureMsg());
// userBankAccount1.setAcctValidationFinishedAt(settleAcctResp.getAcctValidationFinishedAt().toString());
// userBankAccount1.setSettleAcctId(settleAcctResp.getSettleAcctId());
- bankAccountService.updateById(userBankAccount1);
+// bankAccountService.updateById(userBankAccount1);
return ResultUtil.success();
}catch (Exception e){
e.printStackTrace();
diff --git a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/model/TUserBankAccount.java b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/model/TUserBankAccount.java
index 66a5608..45b182c 100644
--- a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/model/TUserBankAccount.java
+++ b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/model/TUserBankAccount.java
@@ -28,4 +28,10 @@
private String code;
@ApiModelProperty(value = "行联号")
private String bankBranchCode;
+
+ @ApiModelProperty(value = "开户行所在省编码")
+ private String bankCardProvinceCode;
+
+ @ApiModelProperty(value = "开户行所在市编码")
+ private String bankCardCityCode;
}
diff --git a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WithdrawalController.java b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WithdrawalController.java
index 9a1b7fa..5c358d7 100644
--- a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WithdrawalController.java
+++ b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WithdrawalController.java
@@ -14,7 +14,6 @@
import com.stylefeng.guns.modular.system.service.IWithdrawalService;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.warpper.WithdrawalWarpper;
-import com.unionpay.upyzt.resp.CusApplicationResp;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -106,19 +105,19 @@
userWithdrawal.setBankCode(bankName1.getDrecCode());
userWithdrawal.setBankBranchCode(bankName1.getBankCode());
userWithdrawal.setCode(smsCode);
- CusApplicationResp renew = CusApplicationExample.renew(userWithdrawal);
- System.err.println("修改个人用户进件信息返回"+renew);
+ //CusApplicationResp renew = CusApplicationExample.renew(userWithdrawal);
+ //System.err.println("修改个人用户进件信息返回"+renew);
if("succeeded".equals(renew.getApplicationStatus())){
// 修改银行卡信息
- bankCard.setSettleAcctId(renew.getSettleAcctId());
+ //bankCard.setSettleAcctId(renew.getSettleAcctId());
bankAccountService.updateById(bankCard);
userWithdrawal.setBankCardCode(code);
userWithdrawal.setBankCode(bankCard.getBankCode());
userWithdrawal.setBankBranchCode(bankCard.getBankBranchCode());
userWithdrawal.setBankName(bankCard.getBankName());
- userWithdrawal.setSettleAcctId(renew.getSettleAcctId());
- userWithdrawal.setBalanceAcctId(renew.getBalanceAcctId());
+ //userWithdrawal.setSettleAcctId(renew.getSettleAcctId());
+ //userWithdrawal.setBalanceAcctId(renew.getBalanceAcctId());
userWithdrawalService.updateById(userWithdrawal);
return withdrawalService.withdrawal(money, bankName, code, name, uid);
}else {
diff --git a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserBankAccount.java b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserBankAccount.java
index 02e0283..d06b7dd 100644
--- a/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserBankAccount.java
+++ b/UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserBankAccount.java
@@ -92,4 +92,12 @@
@ApiModelProperty(value = "验证码")
private String code;
+ @TableField("bankCardProvinceCode")
+ @ApiModelProperty(value = "开户行所在省编码")
+ private String bankCardProvinceCode;
+
+ @TableField("bankCardCityCode")
+ @ApiModelProperty(value = "开户行所在市编码")
+ private String bankCardCityCode;
+
}
--
Gitblit v1.7.1