diff --git a/pom.xml b/pom.xml index a07438a41..ed8df5983 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.2.28 + 1.2.29 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/BDAnalysisServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/BDAnalysisServiceImpl.java index 6750378d3..65f971984 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/BDAnalysisServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/BDAnalysisServiceImpl.java @@ -51,7 +51,7 @@ public class BDAnalysisServiceImpl implements BDAnalysisService { } private List listSalesAnalysis(JSONObject jsonObject) { - List listCountApproved = bdAnalysisMapper.countApproved(jsonObject); + List listCountApproved = bdAnalysisMapper.queryBDNewMerchants(jsonObject); List bdSaleList = bdSalesReportMapper.getBDSaleList(jsonObject); for (JSONObject countApproved : listCountApproved) { for (JSONObject saleList : bdSaleList) { diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.java b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.java index c3cc1400c..b705509f5 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.java @@ -29,4 +29,7 @@ public interface BDAnalysisMapper { //获取指定一天销售数据 List getOneDayBDSaleList(JSONObject params); + + //查询时间段范围BD新增商户 + List queryBDNewMerchants(JSONObject params); } diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml index 24e059359..2efa2d358 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml @@ -249,4 +249,27 @@ ORDER BY pay_amount DESC + + + diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml index 7fcb9c768..e0f0e01d3 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml @@ -675,24 +675,43 @@ + + +