ufo / ufo-platform · Commits

Go to a project

Authored by caoyan
Commit 45e40b4b576ada907615fa73ad1ef342d24f5261 2 parents a59abab5 b7470a75

Merge branch 'test6.8.3' of http://git.yoho.cn/ufo/ufo-platform into test6.8.3

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
... ... @@ -345,9 +345,9 @@ public class MerchantServiceImpl {
BigDecimal amount = sellerWallet.getAmount();
BigDecimal lockMoney = sellerWallet.getLockAmount();
info.setId(sellerWallet.getId());
info.setAccountAmount(null == amount?null:amount.toString());
info.setAccountAmount(null == amount?null == lockMoney?null:lockMoney.toString():amount.add(sellerWallet.getLockAmount()).toString());
info.setLockEarnestMoney(null == lockMoney?null:lockMoney.toString());
info.setAvailEarnestMoney(null == amount?null:null == lockMoney?amount.toString():amount.subtract(sellerWallet.getLockAmount()).toString());
info.setAvailEarnestMoney(null == amount?null:amount.toString());
info.setUid(sellerWallet.getUid());
info.setMerchantName((String)storedSellerMap.get(sellerWallet.getUid()).get("cert_name"));
infos.add(info);
... ...