|
@@ -51,7 +51,6 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
|
|
|
private SysAgencyLeaderService sysAgencyLeaderService;
|
|
private SysAgencyLeaderService sysAgencyLeaderService;
|
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public BasePageResult<SysUserBankCard> queryByVo(SysUserBankCardVO sysUserBankCardVO) {
|
|
public BasePageResult<SysUserBankCard> queryByVo(SysUserBankCardVO sysUserBankCardVO) {
|
|
|
Page<SysUserBankCard> page = new Page<>(sysUserBankCardVO.getPageNum(), sysUserBankCardVO.getPageSize());
|
|
Page<SysUserBankCard> page = new Page<>(sysUserBankCardVO.getPageNum(), sysUserBankCardVO.getPageSize());
|
|
@@ -149,11 +148,21 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
@Transactional
|
|
@Transactional
|
|
|
- public HttpResult<Object> insertByBankNumber(SysUserBankCardVO sysUserBankCardVO) {
|
|
|
|
|
|
|
+ public HttpResult<Object> insertByBankNumber(SysUserBankCardVO sysUserBankCardVO) {
|
|
|
//个贷验证银行卡
|
|
//个贷验证银行卡
|
|
|
- SysUser sysUser = sysUserService.getByUserId(StpUtil.getLoginId().toString());
|
|
|
|
|
|
|
+ SysUser sysUser;
|
|
|
|
|
+ String userId = sysUserBankCardVO.getUserId();
|
|
|
|
|
+
|
|
|
|
|
+ // 传入userid为后台绑定
|
|
|
|
|
+ if (StringUtils.isNotEmpty(userId)) {
|
|
|
|
|
+ sysUser = sysUserService.getByUserId(userId);
|
|
|
|
|
+ //不传为应用绑定
|
|
|
|
|
+ } else {
|
|
|
|
|
+ sysUser = sysUserService.getByUserId(StpUtil.getLoginId().toString());
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
UnionPayResponse response = new UnionPayResponse();
|
|
UnionPayResponse response = new UnionPayResponse();
|
|
|
- if ("2".equals(sysUser.getManagementSource())){
|
|
|
|
|
|
|
+ if ("2".equals(sysUser.getManagementSource())) {
|
|
|
UnionPayRequest request = new UnionPayRequest();
|
|
UnionPayRequest request = new UnionPayRequest();
|
|
|
request.setCardNo(sysUserBankCardVO.getBankNumber());
|
|
request.setCardNo(sysUserBankCardVO.getBankNumber());
|
|
|
request.setPhoneNo(sysUserBankCardVO.getPhoneNo());
|
|
request.setPhoneNo(sysUserBankCardVO.getPhoneNo());
|
|
@@ -161,7 +170,7 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
|
|
|
request.setCertNo(sysUser.getIdentity());
|
|
request.setCertNo(sysUser.getIdentity());
|
|
|
response = unionPayRequestApiComponent.bankCardVerifyRequest(request);
|
|
response = unionPayRequestApiComponent.bankCardVerifyRequest(request);
|
|
|
if (response != null && !"00".equals(response.getRespCode())) {
|
|
if (response != null && !"00".equals(response.getRespCode())) {
|
|
|
- return HttpResult.error("未通过银行卡认证:"+response.getDetailRespMsg());
|
|
|
|
|
|
|
+ return HttpResult.error("未通过银行卡认证:" + response.getDetailRespMsg());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
SysUserBankCard findSysUserBankCard = sysUserBankCardService.getOne(new LambdaQueryWrapper<SysUserBankCard>()
|
|
SysUserBankCard findSysUserBankCard = sysUserBankCardService.getOne(new LambdaQueryWrapper<SysUserBankCard>()
|
|
@@ -177,7 +186,7 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
|
|
|
findSysUserBankCard.setBankAddress(sysUserBankCardVO.getBankAddress());
|
|
findSysUserBankCard.setBankAddress(sysUserBankCardVO.getBankAddress());
|
|
|
findSysUserBankCard.setBankAccount(sysUserBankCardVO.getBankAccount());
|
|
findSysUserBankCard.setBankAccount(sysUserBankCardVO.getBankAccount());
|
|
|
findSysUserBankCard.setRealUserName(sysUserBankCardVO.getRealUserName());
|
|
findSysUserBankCard.setRealUserName(sysUserBankCardVO.getRealUserName());
|
|
|
- findSysUserBankCard.setBankVerify(response != null && "00".equals(response.getRespCode())?1:0);
|
|
|
|
|
|
|
+ findSysUserBankCard.setBankVerify(response != null && "00".equals(response.getRespCode()) ? 1 : 0);
|
|
|
sysUserBankCardService.updateById(findSysUserBankCard);
|
|
sysUserBankCardService.updateById(findSysUserBankCard);
|
|
|
SysUserBankCardHistory sysUserBankCardHistory = new SysUserBankCardHistory();
|
|
SysUserBankCardHistory sysUserBankCardHistory = new SysUserBankCardHistory();
|
|
|
sysUserBankCardHistory.setBankNumber(sysUserBankCardVO.getBankNumber());
|
|
sysUserBankCardHistory.setBankNumber(sysUserBankCardVO.getBankNumber());
|
|
@@ -186,7 +195,7 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
|
|
|
sysUserBankCardHistory.setCreator(BaseController.getUser().getId());
|
|
sysUserBankCardHistory.setCreator(BaseController.getUser().getId());
|
|
|
sysUserBankCardHistory.setBankNumberUserId(findSysUserBankCard.getUserId());
|
|
sysUserBankCardHistory.setBankNumberUserId(findSysUserBankCard.getUserId());
|
|
|
sysUserBankCardHistoryService.save(sysUserBankCardHistory);
|
|
sysUserBankCardHistoryService.save(sysUserBankCardHistory);
|
|
|
- }else {
|
|
|
|
|
|
|
+ } else {
|
|
|
SysUserBankCard sysUserBankCard = new SysUserBankCard();
|
|
SysUserBankCard sysUserBankCard = new SysUserBankCard();
|
|
|
BeanUtils.copyProperties(sysUserBankCardVO, sysUserBankCard);
|
|
BeanUtils.copyProperties(sysUserBankCardVO, sysUserBankCard);
|
|
|
sysUserBankCard.setDelFlag("0");
|
|
sysUserBankCard.setDelFlag("0");
|
|
@@ -196,17 +205,17 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
|
|
|
sysUserBankCard.setBankNumber(sysUserBankCardVO.getBankNumber().replaceAll("\\s+", ""));
|
|
sysUserBankCard.setBankNumber(sysUserBankCardVO.getBankNumber().replaceAll("\\s+", ""));
|
|
|
sysUserBankCard.setUserName(sysUserBankCardVO.getUserName());
|
|
sysUserBankCard.setUserName(sysUserBankCardVO.getUserName());
|
|
|
sysUserBankCard.setUserId(sysUserBankCardVO.getUserId());
|
|
sysUserBankCard.setUserId(sysUserBankCardVO.getUserId());
|
|
|
- sysUserBankCard.setBankVerify(response != null && "00".equals(response.getRespCode())?1:0);
|
|
|
|
|
|
|
+ sysUserBankCard.setBankVerify(response != null && "00".equals(response.getRespCode()) ? 1 : 0);
|
|
|
//校验登录用户是否为合伙人或者是机构负责人
|
|
//校验登录用户是否为合伙人或者是机构负责人
|
|
|
boolean a = sysPartnerService.checkPartner(BaseController.getUserId());
|
|
boolean a = sysPartnerService.checkPartner(BaseController.getUserId());
|
|
|
boolean b = sysAgencyLeaderService.checkUserId(BaseController.getUserId());
|
|
boolean b = sysAgencyLeaderService.checkUserId(BaseController.getUserId());
|
|
|
if (a) {
|
|
if (a) {
|
|
|
//a:合伙人绑卡
|
|
//a:合伙人绑卡
|
|
|
sysUserBankCard.setAscription("a");
|
|
sysUserBankCard.setAscription("a");
|
|
|
- }else if (b) {
|
|
|
|
|
|
|
+ } else if (b) {
|
|
|
//b:机构负责人绑卡
|
|
//b:机构负责人绑卡
|
|
|
sysUserBankCard.setAscription("b");
|
|
sysUserBankCard.setAscription("b");
|
|
|
- }else {
|
|
|
|
|
|
|
+ } else {
|
|
|
sysUserBankCard.setAscription(sysUser.getManagementSource());
|
|
sysUserBankCard.setAscription(sysUser.getManagementSource());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -225,8 +234,8 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
|
|
|
@Override
|
|
@Override
|
|
|
@Transactional
|
|
@Transactional
|
|
|
public void auditByBankNumber(SysUserBankCardVO sysUserBankCardVO) {
|
|
public void auditByBankNumber(SysUserBankCardVO sysUserBankCardVO) {
|
|
|
- SysUserBankCard sysUserBankCard = sysUserBankCardService.getById(sysUserBankCardVO.getId());
|
|
|
|
|
- if(sysUserBankCard != null && StringUtils.isNotBlank(sysUserBankCard.getAuditStatus()) && !"0".equals(sysUserBankCard.getAuditStatus())){
|
|
|
|
|
|
|
+ SysUserBankCard sysUserBankCard = sysUserBankCardService.getById(sysUserBankCardVO.getId());
|
|
|
|
|
+ if (sysUserBankCard != null && StringUtils.isNotBlank(sysUserBankCard.getAuditStatus()) && !"0".equals(sysUserBankCard.getAuditStatus())) {
|
|
|
throw new SystemException("账户已审核不能重复审核");
|
|
throw new SystemException("账户已审核不能重复审核");
|
|
|
}
|
|
}
|
|
|
sysUserBankCard.setAuditStatus(sysUserBankCardVO.getAuditStatus());
|
|
sysUserBankCard.setAuditStatus(sysUserBankCardVO.getAuditStatus());
|
|
@@ -254,6 +263,7 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
|
|
|
sysUserBankCardHistoryService.save(sysUserBankCardHistory);
|
|
sysUserBankCardHistoryService.save(sysUserBankCardHistory);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public List<SysUserBankCard> queryUsableCard(SysUserBankCard sysUserBankCard) {
|
|
public List<SysUserBankCard> queryUsableCard(SysUserBankCard sysUserBankCard) {
|
|
|
return baseMapper.queryUsableCard(sysUserBankCard);
|
|
return baseMapper.queryUsableCard(sysUserBankCard);
|