Commit 45eff95a authored by tangfang's avatar tangfang

修改余额为0的处理,

添加银行卡空指针问题
parent c243307f
...@@ -1470,8 +1470,13 @@ public class CompanyServiceImpl implements CompanyService { ...@@ -1470,8 +1470,13 @@ public class CompanyServiceImpl implements CompanyService {
@Override @Override
public CompanyResVo findCompanyById(CompanyReqVo req) { public CompanyResVo findCompanyById(CompanyReqVo req) {
CompanyResVo companyResVo = companyDao.load(req.getId(), CompanyResVo.class); CompanyResVo companyResVo = companyDao.load(req.getId(), CompanyResVo.class);
if (CompanyConstant.EXAMINE_STATUS_STOP == companyResVo.getExamineStatus()) {
// 判断公司审核状态
throw new CodeException("102", "该公司已停用,如有疑问,请联系管理员。");
}
// 来源于扫码牌 // 来源于扫码牌
// if(1 == req.getQuerySource()){
if (StringHelper.isEmpty(req.getTollPoint()) && companyResVo.getScanCodePayStatus() == 1) { if (StringHelper.isEmpty(req.getTollPoint()) && companyResVo.getScanCodePayStatus() == 1) {
// 无消费点 关闭主二维码支付 // 无消费点 关闭主二维码支付
throw new CodeException("100", "该功能已经关闭,如需开通请联系管理员。"); throw new CodeException("100", "该功能已经关闭,如需开通请联系管理员。");
...@@ -1485,11 +1490,7 @@ public class CompanyServiceImpl implements CompanyService { ...@@ -1485,11 +1490,7 @@ public class CompanyServiceImpl implements CompanyService {
throw new CodeException("99", "未获取到收费点,请联系客服人员查询二维码是否正确。"); throw new CodeException("99", "未获取到收费点,请联系客服人员查询二维码是否正确。");
} }
companyResVo.setCompanyTollPointVoList(companyTollPointVos); companyResVo.setCompanyTollPointVoList(companyTollPointVos);
// if(!StringHelper.isEmpty(companyTollPointVos.get(0).getTollPointByname())){
// companyResVo.setCompanyName(companyTollPointVos.get(0).getTollPointByname());
// }
} }
// }
CompanyVo companyVo = new CompanyVo(); CompanyVo companyVo = new CompanyVo();
ObjectHelper.writeWithFromClass(companyVo, companyResVo); ObjectHelper.writeWithFromClass(companyVo, companyResVo);
......
...@@ -437,6 +437,9 @@ public class RegisterServiceImpl implements RegisterService { ...@@ -437,6 +437,9 @@ public class RegisterServiceImpl implements RegisterService {
if (StringHelper.isEmpty(companyVo)) { if (StringHelper.isEmpty(companyVo)) {
throw new CodeException("注册信息有误"); throw new CodeException("注册信息有误");
} }
if(CompanyConstant.EXAMINE_STATUS_STOP == companyVo.getExamineStatus()){
throw new CodeException("公司已停用,如有疑问,请联系管理员。");
}
LoginCompanyResVo loginCompanyResVo = new LoginCompanyResVo(); LoginCompanyResVo loginCompanyResVo = new LoginCompanyResVo();
loginCompanyResVo.setCompanyVo(companyVo); loginCompanyResVo.setCompanyVo(companyVo);
reqVo.setToken(token); reqVo.setToken(token);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment