|
|
@ -987,7 +987,7 @@ public class TradeLogServiceImpl implements TradeLogService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
BigDecimal transactionFee = item.getBigDecimal("transaction_fee");
|
|
|
|
BigDecimal transactionFee = item.getBigDecimal("transaction_fee");
|
|
|
|
BigDecimal royalpaySvcFee = (item.containsKey("total_surcharge") ? item.getBigDecimal("total_surcharge") : BigDecimal.ZERO)
|
|
|
|
BigDecimal royalpaySvcFee = (item.containsKey("total_surcharge") ? item.getBigDecimal("total_surcharge") : BigDecimal.ZERO)
|
|
|
|
.add(taxAmount).subtract(transactionFee).subtract(incrementalSurcharge).subtract(incrementalTax);
|
|
|
|
.add(taxAmount).subtract(incrementalSurcharge).subtract(incrementalTax).subtract(transactionFee);
|
|
|
|
item.put("incremental_surcharge", incrementalSurcharge.add(incrementalTax).setScale(2, RoundingMode.HALF_UP));
|
|
|
|
item.put("incremental_surcharge", incrementalSurcharge.add(incrementalTax).setScale(2, RoundingMode.HALF_UP));
|
|
|
|
item.put("total_surcharge_intax", royalpaySvcFee.setScale(2, RoundingMode.HALF_UP));
|
|
|
|
item.put("total_surcharge_intax", royalpaySvcFee.setScale(2, RoundingMode.HALF_UP));
|
|
|
|
item.put("transaction_fee_intax", transactionFee.setScale(2, RoundingMode.HALF_UP));
|
|
|
|
item.put("transaction_fee_intax", transactionFee.setScale(2, RoundingMode.HALF_UP));
|
|
|
|