From b01f752252eaadd1fa31eda6a9ad43146660b721 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 03 四月 2025 23:42:57 +0800 Subject: [PATCH] bug修改 --- xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWithdrawController.java | 35 +++++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 2 deletions(-) diff --git a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWithdrawController.java b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWithdrawController.java index 1b432ea..3dd8556 100644 --- a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWithdrawController.java +++ b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientAppUserWithdrawController.java @@ -323,21 +323,43 @@ appUserWalletRecord.setReason("提现"); appUserWalletRecord.setAmount(new BigDecimal(money)); BigDecimal bigDecimal1 = new BigDecimal(money).setScale(2, RoundingMode.HALF_DOWN); + String s2 = JuHeFuUtil.queryUserList(byId1.getIdentityCard()); + if (StringUtils.hasLength(s2)){ + byId.setFenzhangId(s2); + }else{ + // 没有开户 + long time = new Date().getTime(); + String s3 = RandomUtil.randomNumbers(4); + String s1 = "FZ" + time + s3; + String user = JuHeFuUtil.createUser(s1, byId1.getCardholder(), "00", + byId1.getIdentityCard(), byId1.getCellPhone(), byId1.getCardNo()); + if (StringUtils.hasLength(user)&&user.equals("success")){ + byId.setFenzhangId(s1); + appUserService.updateById(byId); + }else{ + return R.fail(user); + } + } String s1 = JuHeFuUtil.updateAccount(byId.getFenzhangId(), byId1.getCardholder(), byId1.getCellPhone(), byId1.getCardNo()); - if (s1.contains("false")){ + if (!s1.contains("success")){ // 修改报错 弹出提示 - return R.fail("银行卡信息或持卡人信息有误,请核对后输入"); + return R.fail(s1); } // 从商户余额分账到用户分账接收方 JSONObject jsonObject = JuHeFuUtil.balancePay("CZ"+replace, byId.getFenzhangId(), bigDecimal1 + "" , "https://xq.xqzhihui.com/api/user/client/app-user-withdraw/base/callback"); + if (jsonObject.getString("error_msg")!=null){ + System.err.println("从商户余额分账到用户分账接收方报错异常"+jsonObject.getString("error_msg")); + return R.fail("系统繁忙,5分钟后重试"); // return R.fail(jsonObject.getString("error_msg")); } JSONObject jsonObject2 = JuHeFuUtil.balanceWithdraw("TX"+replace, bigDecimal1+"", byId.getFenzhangId(), "https://xq.xqzhihui.com/api/user/client/app-user-withdraw/base/callbackA"); if (jsonObject2.getString("error_msg")!=null){ + System.err.println("提现异常原因"+jsonObject2.getString("error_msg")); + return R.fail("系统繁忙,5分钟后重试"); } System.err.println("执行完毕====="); @@ -545,6 +567,11 @@ appUserBankService.save(appUserWithdraw); // 查询是否已经开户 AppUser byId = appUserService.getById(userId); + String s2 = JuHeFuUtil.queryUserList(appUserWithdraw.getIdentityCard()); + if (StringUtils.hasLength(s2)){ + byId.setFenzhangId(s2); + appUserService.updateById(byId); + } if (byId.getFenzhangId()==null){ // 开户 long time = new Date().getTime(); @@ -552,9 +579,13 @@ String s1 = "FZ" + time + s; String user = JuHeFuUtil.createUser(s1, appUserWithdraw.getCardholder(), "00", appUserWithdraw.getIdentityCard(), appUserWithdraw.getCellPhone(), appUserWithdraw.getCardNo()); + appUserWithdraw.setFenzhangId(s1); + appUserBankService.updateById(appUserWithdraw); if (user.equals("success")){ byId.setFenzhangId(s1); appUserService.updateById(byId); + }else{ + return R.fail("添加银行卡失败,错误信息:"+user); } } return R.ok(); -- Gitblit v1.7.1