|
@@ -377,6 +377,9 @@ public class ZyDailySettlementVo {
|
|
|
//转账=deposit_qt + return_qt + js_bk_qt - js_tk_qt
|
|
|
zzAmount=depositQtAmount.add(returnQtAmount).add(jsbkQtAmount).subtract(jstkQtAmount);
|
|
|
//total_charge- (js_cfbz+js_jz_yb+js_jz_mzyf)-(js_bk_ylk - js_tk_ylk )-( js_bk_cheque - js_tk_cheque )
|
|
|
+ if (totalCharge == null) {
|
|
|
+ totalCharge = BigDecimal.ZERO;
|
|
|
+ }
|
|
|
fpxjAmount=totalCharge.subtract(jsCfbzAmount.add(ybjzAmount).add(jsjzMzyfAmount)).subtract(jsbkYlkAmount.subtract(jstkYlkAmount)).subtract(jsbkYbAmount.subtract(jstkYbAmount));
|
|
|
}
|
|
|
|