From 574d45c7f2a7a0f0b3dba5e5a49e5c0adfe3e289 Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 2 Apr 2020 15:10:22 +0800 Subject: [PATCH] fix merge settle total surcharge --- pom.xml | 2 +- .../payment/manage/mappers/payment/TransactionMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 6d3f361c9..f83725f5f 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.4.26 + 1.4.27 UTF-8 1.8.0 diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml index 64d543bf5..d233cad01 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml @@ -562,8 +562,8 @@ SELECT t.client_id,DATE(t.transaction_time) clearing_time, ifnull(cd.report_date,date(t.transaction_time)) report_date, - 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,