From c04fea693bdf99ce7a36c54ddecef2116dd31907 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 26 十一月 2025 21:55:25 +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/system/service/impl/TCompanyServiceImpl.java | 2
UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/AccountController.java | 18 ++-------
UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/WithdrawalController.java | 56 +++++++++++++++-------------
3 files changed, 35 insertions(+), 41 deletions(-)
diff --git a/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyServiceImpl.java b/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyServiceImpl.java
index e923ba1..8acbaa5 100644
--- a/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyServiceImpl.java
+++ b/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyServiceImpl.java
@@ -461,7 +461,7 @@
if (income != null) {
Map<String, Object> map = FenZhangUtil.queryFenzhang(income.getReqSeqId(), income.getReqDate());
System.out.println("分账定时查询：" + map.toString());
- if ("S".equals(map.get("map").toString())) {
+ if ("S".equals(map.get("trans_stat").toString())) {
companyMapper.updateState(s);
}
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 c2fdd66..3509d33 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
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.util.ToolUtil;
-import com.stylefeng.guns.modular.CharteredCar.server.IOrderCharteredCarService;
import com.stylefeng.guns.modular.account.model.TBank;
import com.stylefeng.guns.modular.account.model.TBankNext;
import com.stylefeng.guns.modular.account.model.TUserBankAccount;
@@ -11,25 +10,13 @@
import com.stylefeng.guns.modular.account.server.ITBankService;
import com.stylefeng.guns.modular.account.server.UserBankAccountService;
import com.stylefeng.guns.modular.account.server.UserWithdrawalService;
-import com.stylefeng.guns.modular.cloudPayment.example.BalanceAcctExample;
import com.stylefeng.guns.modular.cloudPayment.example.CusApplicationExample;
-import com.stylefeng.guns.modular.cloudPayment.example.SettleAcctExample;
-import com.stylefeng.guns.modular.cloudPayment.example.WithdrawalExample;
-import com.stylefeng.guns.modular.cloudPayment.req.BalanceAcctReq;
-import com.stylefeng.guns.modular.cloudPayment.req.UserBankAccountReq;
-import com.stylefeng.guns.modular.cloudPayment.req.WithdrawalReq;
-import com.stylefeng.guns.modular.system.model.User;
import com.stylefeng.guns.modular.system.model.UserBankAccount;
import com.stylefeng.guns.modular.system.model.UserInfo;
import com.stylefeng.guns.modular.system.model.UserWithdrawal;
import com.stylefeng.guns.modular.system.service.IUserInfoService;
-import com.stylefeng.guns.modular.system.service.IUserService;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.unionpay.upyzt.exception.UpyztException;
-import com.unionpay.upyzt.resp.BalanceAcctListResp;
-import com.unionpay.upyzt.resp.CusApplicationResp;
-import com.unionpay.upyzt.resp.SettleAcctListResp;
-import com.unionpay.upyzt.resp.SettleAcctResp;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -38,7 +25,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
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 8430366..e69c5c7 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
@@ -3,10 +3,9 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.modular.account.dao.TBankNextMapper;
-import com.stylefeng.guns.modular.account.model.TBankNext;
import com.stylefeng.guns.modular.account.server.UserBankAccountService;
import com.stylefeng.guns.modular.account.server.UserWithdrawalService;
-import com.stylefeng.guns.modular.cloudPayment.example.CusApplicationExample;
+import com.stylefeng.guns.modular.huifu.biz.DouGongBasicDataBiz;
import com.stylefeng.guns.modular.system.model.UserBankAccount;
import com.stylefeng.guns.modular.system.model.UserInfo;
import com.stylefeng.guns.modular.system.model.UserWithdrawal;
@@ -14,7 +13,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;
@@ -53,6 +51,8 @@
@Resource
private TBankNextMapper tBankNextMapper;
+ @Autowired
+ private DouGongBasicDataBiz douGongBasicDataBiz;
/**
* 账户余额提现操作
@@ -70,7 +70,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(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
public ResultUtil withdrawal(Double money, String bankName, String code, String name,String smsCode,HttpServletRequest request){
@@ -97,35 +97,39 @@
UserInfo userInfo = userInfoService.selectById(uid);
UserWithdrawal userWithdrawal = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>()
.eq("phone", userInfo.getPhone())
+ .eq("type", 1)
.last("LIMIT 1"));
if(Objects.isNull(userWithdrawal)){
return ResultUtil.error("请先进行个人用户进件信息填写");
}
- TBankNext bankName1 = tBankNextMapper.selectList(new EntityWrapper<TBankNext>().eq("bankName", bankName)).get(0);
+ //TBankNext bankName1 = tBankNextMapper.selectList(new EntityWrapper<TBankNext>().eq("bankName", bankName)).get(0);
userWithdrawal.setBankCardCode(code);
- userWithdrawal.setBankCode(bankName1.getDrecCode());
- userWithdrawal.setBankBranchCode(bankName1.getBankCode());
- userWithdrawal.setCode(smsCode);
- CusApplicationResp renew = CusApplicationExample.renew(userWithdrawal);
+ //userWithdrawal.setBankCode(bankName1.getDrecCode());
+ //userWithdrawal.setBankBranchCode(bankName1.getBankCode());
+ //userWithdrawal.setCode(smsCode);
+ //CusApplicationResp renew = CusApplicationExample.renew(userWithdrawal);
//System.err.println("修改个人用户进件信息返回"+renew);
- if("succeeded".equals(renew.getApplicationStatus())){
- // 修改银行卡信息
- //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());
- userWithdrawalService.updateById(userWithdrawal);
- return withdrawalService.withdrawal(money, bankName, code, name, uid);
- }else {
- return ResultUtil.error(renew.getFailureMsgs().get(0).getReason());
+ userWithdrawal.setBankCardProvinceCode(bankCard.getBankCardProvinceCode());
+ userWithdrawal.setBankCardCityCode(bankCard.getBankCardCityCode());
+ 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"));
+ }
+ userWithdrawal.setBankCardCode(code);
+ userWithdrawal.setBankCode(bankCard.getBankCode());
+ userWithdrawal.setBankBranchCode(bankCard.getBankBranchCode());
+ userWithdrawal.setBankName(bankCard.getBankName());
+ //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);
+ userWithdrawalService.updateById(userWithdrawal);
+ return withdrawalService.withdrawal(money, bankName, code, name, uid);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
--
Gitblit v1.7.1