fix pom.xml

master
luoyang 5 years ago
parent a561db26cf
commit 7851c9f922

@ -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.25</version> <version>1.4.26</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>

@ -561,9 +561,15 @@
<select id="listSettlementLog" resultType="com.alibaba.fastjson.JSONObject"> <select id="listSettlementLog" resultType="com.alibaba.fastjson.JSONObject">
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">1 as merge_settle,</if> <if test="merge_settle!=null">
SUM(cd.tax_amount) tax_amount, SUM(cd.tax_amount) tax_amount,
SUM(cd.total_charge) total_charge, SUM(cd.total_charge) total_charge,
1 as merge_settle,
</if>
<if test="merge_settle==null">
cd.tax_amount,
cd.total_charge,
</if>
SUM(t.clearing_amount) total, SUM(t.clearing_amount) total,
sum(if(LOCATE('MERCHANT',t.system_transaction_id),t.clearing_amount,0)) income, sum(if(LOCATE('MERCHANT',t.system_transaction_id),t.clearing_amount,0)) income,
sum(if(LOCATE('SURCHARGE',t.system_transaction_id),t.clearing_amount,0)) fee, sum(if(LOCATE('SURCHARGE',t.system_transaction_id),t.clearing_amount,0)) fee,

Loading…
Cancel
Save