From ef066727a9ffd4ad8f9723d0b858e382c48567b9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 26 十一月 2025 08:59:22 +0800
Subject: [PATCH] update
---
UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/ElectronicLedgerController.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 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 7f8ad54..848c9a4 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
@@ -21,10 +21,8 @@
import com.stylefeng.guns.modular.cloudPayment.req.UserBankAccountReq;
import com.stylefeng.guns.modular.huifu.biz.DouGongBasicDataBiz;
import com.stylefeng.guns.modular.system.model.*;
-import com.stylefeng.guns.modular.system.service.IBankCardService;
-import com.stylefeng.guns.modular.system.service.ICompanyService;
-import com.stylefeng.guns.modular.system.service.IUserInfoService;
-import com.stylefeng.guns.modular.system.service.IUserService;
+import com.stylefeng.guns.modular.system.service.*;
+import com.stylefeng.guns.modular.system.service.impl.RegionServiceImpl;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.unionpay.upyzt.exception.UpyztException;
import com.unionpay.upyzt.param.FailureMsgParam;
@@ -72,6 +70,9 @@
private IBankCardService bankCardService;
@Autowired
private DouGongBasicDataBiz douGongBasicDataBiz;
+ @Autowired
+ private IRegionService regionService;
+
@ResponseBody
@RequestMapping(value = "/addElectronicLedger", method = RequestMethod.POST)
@@ -201,6 +202,9 @@
}
+ @Autowired
+ private IUserInfoService userInfoService;
+
@ResponseBody
@RequestMapping(value = "/updateElectronicLedgerInfo", method = RequestMethod.POST)
@ApiOperation(value = "用户修改进件信息", tags = {"用户端-用户修改进件信息"}, notes = "")
@@ -319,10 +323,6 @@
}
}
-
- @Autowired
- private IUserInfoService userInfoService;
-
@ResponseBody
@RequestMapping(value = "/isElectronicLedger", method = RequestMethod.POST)
@ApiOperation(value = "用户是否需要创建电子账簿", tags = {"用户端-用户是否需要创建电子账簿"}, notes = "")
@@ -359,7 +359,11 @@
return ResultUtil.tokenErr();
}
UserInfo userInfo = userInfoService.selectById(id);
- UserWithdrawal userWithdrawal = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>().eq("phone", userInfo.getPhone()));
+ UserWithdrawal userWithdrawal = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>().eq("phone", userInfo.getPhone()).eq("type",1));
+ 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==null?new UserWithdrawal():userWithdrawal);
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1