Commit ba7de414 authored by tangfang's avatar tangfang

修改余额为0的处理,

添加银行卡空指针问题
parent d92584e4
......@@ -242,7 +242,6 @@ public class CompanyServiceImpl implements CompanyService {
GetEmptyRolesReqVo getEmptyRolesReqVo = new GetEmptyRolesReqVo();
List<RoleVo> roleVoList = roleDao.getEmptyRoles(getEmptyRolesReqVo);
resVo.setRoleVoList(roleVoList);
System.out.println("======1111=====" + JsonHelper.serialize(resVo));
return resVo;
}
......
......@@ -306,6 +306,10 @@ public class FinanceServiceImpl implements FinanceService {
public Double getServiceCharge1(CompanyResVo companyResVo, double money) {
// 提现手续费
double serviceCharge = 0d;
if (0 == companyResVo.getServiceChargeStatus()) {
// 无手续费
return serviceCharge;
}
// 该公司有优惠
switch (companyResVo.getServiceChargePayType()) {
case 1:
......@@ -322,7 +326,7 @@ public class FinanceServiceImpl implements FinanceService {
default:
break;
}
serviceCharge = Math.round(serviceCharge * 100) / 100.0;
serviceCharge = Math.round(serviceCharge * 100) / 100.0;
return serviceCharge;
}
......
eureka:
client:
service-url:
defaultZone: http://192.168.100.2:6800/eureka/
# defaultZone: http://10.150.2.2:6800/eureka/
defaultZone: http://10.151.0.240:6800/eureka/
# defaultZone: http://192.168.100.2:6800/eureka/
yzg:
logAll: true
PrintSql: true
......
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