diff --git a/pom.xml b/pom.xml
index 0882f06da..5c69a347d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
4.0.0manage
- 1.1.23
+ 1.1.24UTF-8
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/OrgAnalysisServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/OrgAnalysisServiceImp.java
index 0d72739be..39c91dcae 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/OrgAnalysisServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/OrgAnalysisServiceImp.java
@@ -64,6 +64,7 @@ public class OrgAnalysisServiceImp implements OrgAnalysisService {
}
}
if (!flag) {
+ todayOrgTransactionItem.put("amount",todayOrgTransactionItem.getString("clearing_amount"));
newOrgTransaction.add(todayOrgTransactionItem);
}
}
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.xml
index f8b574cb2..f92f48fae 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.xml
@@ -42,7 +42,7 @@
SUM(pay_amount) AS total,
SUM(refund_amount) AS refund_fee
FROM statistics_bd_sales
- WHERE isOrg = 1
+ WHERE isOrg = 1 AND org_id!=1
AND org_id = #{org_id}
@@ -59,8 +59,8 @@
AND org_id in
#{org_id}
- GROUP BY bd_id
- ORDER BY total DESC
+ GROUP BY org_id
+ ORDER BY clearing_amount DESC