diff --git a/pom.xml b/pom.xml index ef51f8c0f..882361977 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.3.2 + 1.3.3 UTF-8 1.4.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java index 6e9a570e9..3be3a6e55 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java @@ -18,6 +18,8 @@ import java.util.List; public interface TransactionAnalysisMapper { BigDecimal analysisTotalAmount(JSONObject params); + BigDecimal analysisTotalAmountProvisionService (JSONObject params); + double analysisTotalCount(JSONObject params); double analysisRefundAmount(JSONObject params); diff --git a/src/main/java/au/com/royalpay/payment/manage/dataAnalysis/core/DataAnalysisServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/dataAnalysis/core/DataAnalysisServiceImpl.java index a5331aeb3..96f7ec5ca 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dataAnalysis/core/DataAnalysisServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/dataAnalysis/core/DataAnalysisServiceImpl.java @@ -33,8 +33,8 @@ public class DataAnalysisServiceImpl implements DataAnalysisService { response.put("total_partners", clientAnalysisMapper.countClients(params)); //产生交易的商户数 response.put("traded_partners", clientAnalysisMapper.countTradedPartners(params)); - //交易总额 - response.put("trade_amount", transactionAnalysisMapper.analysisTotalAmount(params)); + //交易总额,该处另外开启新视线接口,专提供pms获取数据 + response.put("trade_amount", transactionAnalysisMapper.analysisTotalAmountProvisionService(params)); return response; } diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml index 5b08eaac6..b6204ac32 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml @@ -64,9 +64,34 @@ = #{begin} AND - o.create_time <= #{end} + INNER JOIN pmt_orders o ON o.order_id = l.order_id AND c.create_time >= #{begin} AND + c.create_time <= #{end} + WHERE (l.transaction_type = 'Credit' or l.refund_id is not null) + ]]> + + AND o.client_id IN + + #{client_id} + + + + and o.client_id=#{client_id} + + and l.org_id=#{org_id} + and l.org_id in + #{org_id} + + + +