Commit e70ce48b authored by tangfang's avatar tangfang

修改公司查询审核信息问题

parent 4b6012c0
...@@ -261,7 +261,7 @@ public class FinanceServiceImpl implements FinanceService { ...@@ -261,7 +261,7 @@ public class FinanceServiceImpl implements FinanceService {
ObjectHelper.writeWithFrom(cashWithdrawalReqVo, capitalFlowVo); ObjectHelper.writeWithFrom(cashWithdrawalReqVo, capitalFlowVo);
cashWithdrawalReqVo.setActualType(companyResVo.getWithdrawType()); cashWithdrawalReqVo.setActualType(companyResVo.getWithdrawType());
cashWithdrawalReqVo.setBankCardType(companyBankCardVo.getType()); cashWithdrawalReqVo.setBankCardType(companyBankCardVo.getType());
cashWithdrawalReqVo.setOrderFee(CalcHelper.sub(capitalFlowVo.getOrderFee(), capitalFlowVo.getServiceCharge())); cashWithdrawalReqVo.setOrderFee(CalcHelper.add(capitalFlowVo.getOrderFee(), capitalFlowVo.getServiceCharge()));
companyConsumer.cashWithdrawal(cashWithdrawalReqVo); companyConsumer.cashWithdrawal(cashWithdrawalReqVo);
ResponseResult<CapitalFlowReqVo> responseResult = new ResponseResult<>(); ResponseResult<CapitalFlowReqVo> responseResult = new ResponseResult<>();
responseResult.setData(req); responseResult.setData(req);
......
...@@ -478,30 +478,6 @@ public class RegisterServiceImpl implements RegisterService { ...@@ -478,30 +478,6 @@ public class RegisterServiceImpl implements RegisterService {
resVo.setMsg("公司基本信息未完善,跳转公司完善页面"); resVo.setMsg("公司基本信息未完善,跳转公司完善页面");
return resVo; return resVo;
} }
/*判断电子签约状态,若不等于1,则跳转签约页面*/
/*else if (companyVo.getSigningStatus() != CompanyConstant.COMPANY_STATUS_SIGN_success){
CompanySaveReqVo companyReqVo = new CompanySaveReqVo();
companyReqVo.setId(companyVo.getId());
ResponseResult result1 = new ResponseResult();
try {
result1 = payFeign.sign(companyReqVo);
}catch (Exception e){
e.printStackTrace();
throw new CodeException("跳转签约页面失败,请重试");
}
CompanySaveReqVo companyReqVo1 = (CompanySaveReqVo) result1.getData();
resVo.setCode("04");
resVo.setMsg("未签约,跳转签约页面");
resVo.setUrl(companyReqVo1.getSignUrl());
return resVo;
}*/
// if (companyBankCardVoList == null || companyBankCardVoList.isEmpty()) {
// /*该公司没有银行卡,需要跳转添加银行卡*/
// resVo.setCode("03");
// resVo.setMsg("还未添加银行卡,跳转添加银行卡页面");
// return resVo;
// }
/*获取用户权限列表*/ /*获取用户权限列表*/
RoleAuthorityGetReqVo roleAuthorityGetReqVo = new RoleAuthorityGetReqVo(); RoleAuthorityGetReqVo roleAuthorityGetReqVo = new RoleAuthorityGetReqVo();
roleAuthorityGetReqVo.setUserId(userVo.getId()); roleAuthorityGetReqVo.setUserId(userVo.getId());
......
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