DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/UserWithdrawalController.java
@@ -16,6 +16,7 @@ import com.stylefeng.guns.modular.system.service.IBankCardService; import com.stylefeng.guns.modular.system.service.ICompanyService; import com.stylefeng.guns.modular.system.service.IDriverService; import com.stylefeng.guns.modular.system.service.IRegionService; import com.stylefeng.guns.modular.system.util.ResultUtil; import com.unionpay.upyzt.exception.InvalidRequestException; import com.unionpay.upyzt.exception.UpyztException; @@ -59,9 +60,13 @@ private final ICompanyService companyService; private final ITBankNextService bankNextService; private final DouGongBasicDataBiz douGongBasicDataBiz; private final IRegionService regionService; @Autowired public UserWithdrawalController(ElectronicLedgerService electronicLedgerService, UserWithdrawalService userWithdrawalService, UserBankAccountService userBankAccountService, IBankCardService bankCardService, IDriverService driverService, ICompanyService companyService, ITBankNextService bankNextService, DouGongBasicDataBiz douGongBasicDataBiz) { public UserWithdrawalController(ElectronicLedgerService electronicLedgerService, UserWithdrawalService userWithdrawalService, UserBankAccountService userBankAccountService, IBankCardService bankCardService, IDriverService driverService, ICompanyService companyService, ITBankNextService bankNextService, DouGongBasicDataBiz douGongBasicDataBiz,IRegionService regionService) { this.electronicLedgerService = electronicLedgerService; this.userWithdrawalService = userWithdrawalService; this.userBankAccountService = userBankAccountService; @@ -70,6 +75,7 @@ this.companyService = companyService; this.bankNextService = bankNextService; this.douGongBasicDataBiz = douGongBasicDataBiz; this.regionService = regionService; } @@ -346,6 +352,10 @@ 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()); return ResultUtil.success(userWithdrawal); }catch (Exception e){ e.printStackTrace(); DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserWithdrawal.java
@@ -164,6 +164,14 @@ @ApiModelProperty(value = "银行所在市编码") private String bankCardCityCode; @ApiModelProperty(value = "开户行所在省") @TableField(exist = false) private String bankCardProvince; @ApiModelProperty(value = "开户行所在市") @TableField(exist = false) private String bankCardCity; @ApiModelProperty(value = "进件类型 0-江苏银行；1-汇付") private Integer type;
@@ -4,4 +4,5 @@ import com.stylefeng.guns.modular.system.model.Region; public interface IRegionService extends IService<Region> { Region getRegionByCode(String code); } DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RegionServiceImpl.java
@@ -1,5 +1,6 @@ package com.stylefeng.guns.modular.system.service.impl; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.stylefeng.guns.modular.system.dao.RegionMapper; import com.stylefeng.guns.modular.system.model.Region; @@ -8,4 +9,9 @@ @Service public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> implements IRegionService { @Override public Region getRegionByCode(String code) { return selectOne(new EntityWrapper<Region>().eq("code",code).last("limit 1")); } }
@@ -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(); UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserWithdrawal.java
@@ -157,6 +157,15 @@ @ApiModelProperty(value = "开户行所在市编码") private String bankCardCityCode; @ApiModelProperty(value = "开户行所在省") @TableField(exist = false) private String bankCardProvince; @ApiModelProperty(value = "开户行所在市") @TableField(exist = false) private String bankCardCity; @ApiModelProperty(value = "进件类型 0-江苏银行；1-汇付") private Integer type;
@@ -4,4 +4,5 @@ import com.stylefeng.guns.modular.system.model.Region; public interface IRegionService extends IService<Region> { Region getRegionByCode(String code); } UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RegionServiceImpl.java
@@ -1,5 +1,6 @@ package com.stylefeng.guns.modular.system.service.impl; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.stylefeng.guns.modular.system.dao.RegionMapper; import com.stylefeng.guns.modular.system.model.Region; @@ -8,4 +9,8 @@ @Service public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> implements IRegionService { @Override public Region getRegionByCode(String code) { return selectOne(new EntityWrapper<Region>().eq("code",code).last("limit 1")); } }
