|
|
|
@ -562,8 +562,8 @@
|
|
|
|
|
SELECT t.client_id,DATE(t.transaction_time) clearing_time,
|
|
|
|
|
ifnull(cd.report_date,date(t.transaction_time)) report_date,
|
|
|
|
|
<if test="merge_settle!=null">
|
|
|
|
|
SUM(cd.tax_amount) tax_amount,
|
|
|
|
|
SUM(cd.total_charge) total_charge,
|
|
|
|
|
SUM(cd.tax_amount) /2 as tax_amount,
|
|
|
|
|
SUM(cd.total_charge)/2 as total_charge,
|
|
|
|
|
1 as merge_settle,
|
|
|
|
|
</if>
|
|
|
|
|
<if test="merge_settle==null">
|
|
|
|
|