ufo / ufo-platform · Commits

Go to a project

Authored by csgyoho
Commit f1dff63a6b027422a45c8c814eb848971567db2e 1 parent 45e40b4b

商家管理

Inline Side-by-side
Showing 1 changed file with 3 additions and 5 deletions
... ... @@ -287,11 +287,9 @@ public class MerchantServiceImpl {
info.setLockEarnestMoney("/");
info.setAvailEarnestMoney(detail.getAmount()==null?null:detail.getAmount().toString());
}
if(detail.getAvailAmount()!=null){
info.setAccountAllAmount(detail.getLockAmount()==null?
detail.getAvailAmount().toString():detail.getAvailAmount().add(detail.getLockAmount()).toString());
info.setAvailAllEarnestMoney(detail.getAvailAmount().toString());
}
info.setAccountAllAmount(detail.getAvailAmount() == null?detail.getLockAmount()==null?
null:detail.getLockAmount().toString():detail.getAvailAmount().add(detail.getLockAmount()).toString());
info.setAvailAllEarnestMoney(detail.getAvailAmount() == null?null:detail.getAvailAmount().toString());
info.setLockAllEarnestMoney(detail.getLockAmount()==null?null:detail.getLockAmount().toString());
return info;
}
... ...