fix 后付费手续费前端显示、冲正金额

master
luoyang 5 years ago
parent 87c53b77ee
commit e4fee67e64

@ -125,7 +125,7 @@ public class SurchargeAccountServiceImpl implements SurchargeAccountService {
transaction.put("bill_id", detailId); transaction.put("bill_id", detailId);
transaction.put("total_surcharge", BigDecimal.ZERO); transaction.put("total_surcharge", BigDecimal.ZERO);
transaction.put("tax_amount", BigDecimal.ZERO); transaction.put("tax_amount", BigDecimal.ZERO);
transaction.put("amount", detail.getBigDecimal("debit_amount").negate()); transaction.put("amount", (detail.getBigDecimal("debit_amount").add(detail.getBigDecimal("credit_amount"))).negate());
transaction.put("post_balance", surchargeAccount.getBigDecimal("balance").add(transaction.getBigDecimal("amount"))); transaction.put("post_balance", surchargeAccount.getBigDecimal("balance").add(transaction.getBigDecimal("amount")));
transaction.put("operation", manager.getString("manager_id")); transaction.put("operation", manager.getString("manager_id"));
transaction.put("create_time", new Date()); transaction.put("create_time", new Date());

@ -17,6 +17,7 @@
fsad.total_surcharge, fsad.total_surcharge,
fsad.credit_amount, fsad.credit_amount,
fsad.debit_amount, fsad.debit_amount,
fsad.checkout,
sc.client_moniker, sc.client_moniker,
sc.short_name, sc.short_name,
sc.company_name sc.company_name

Loading…
Cancel
Save