fix merge settle total surcharge

master
luoyang 5 years ago
parent 7851c9f922
commit 574d45c7f2

@ -9,7 +9,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId> <artifactId>manage</artifactId>
<version>1.4.26</version> <version>1.4.27</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>1.8.0</jib-maven-plugin.version> <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>

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

Loading…
Cancel
Save