From 585c9d5dcd914d518a00041317b900da526f65d2 Mon Sep 17 00:00:00 2001 From: duLingLing Date: Wed, 4 Sep 2019 16:14:22 +0800 Subject: [PATCH] =?UTF-8?q?UPD:=E4=BF=AE=E5=A4=8D=E5=90=88=E4=BC=99?= =?UTF-8?q?=E4=BA=BA=E4=BA=A4=E6=98=93=E9=87=91=E9=A2=9D=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=B1=87=E6=80=BB=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/analysis/core/impls/BDAnalysisServiceImpl.java | 4 ++-- .../manage/mappers/log/StatisticsBDSalesReportMapper.java | 2 +- .../manage/analysis/mappers/TransactionAnalysisMapper.xml | 4 ++-- .../manage/mappers/log/StatisticsBDSalesReportMapper.xml | 5 ++++- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 6c433ce11..b56a3a2be 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.2.2 + 1.2.3 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 9fadea1d5..7780b2e72 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 @@ -198,7 +198,7 @@ public class BDAnalysisServiceImpl implements BDAnalysisService { List bdSaleList = bdAnalysisMapper.getOneDayBDSaleList(params); if (bdSaleList.size() != 0) { for (JSONObject item : bdSaleList) { - JSONObject existBDSalesReport = bdSalesReportMapper.findByBDIdAndLogDate(item.getString("bd_id"),beginTime,0); + JSONObject existBDSalesReport = bdSalesReportMapper.findByBDIdAndLogDate(item.getString("org_id"),item.getString("bd_id"),beginTime,0); if(existBDSalesReport==null){ JSONObject object = new JSONObject(item); object.put("log_id", UUID.randomUUID().toString()); @@ -216,7 +216,7 @@ public class BDAnalysisServiceImpl implements BDAnalysisService { List orgSaleList= transactionAnalysisMapper.getOneDayOrgMerchantSaleList(params); if (orgSaleList.size() != 0) { for (JSONObject item : orgSaleList) { - JSONObject existOrgSalesReport = bdSalesReportMapper.findByBDIdAndLogDate(item.getString("bd_id"),beginTime,1); + JSONObject existOrgSalesReport = bdSalesReportMapper.findByBDIdAndLogDate(item.getString("org_id"),item.getString("bd_id"),beginTime,1); if(existOrgSalesReport==null){ JSONObject object = new JSONObject(item); object.put("log_id", UUID.randomUUID().toString()); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.java index 35b7c4693..8c268d83c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.java @@ -22,7 +22,7 @@ public interface StatisticsBDSalesReportMapper { List getPartnerAmountList(JSONObject params); - JSONObject findByBDIdAndLogDate(@Param("bd_id") String bd_id, @Param("log_date")Date beginTime,@Param("isOrg") int isOrg); + JSONObject findByBDIdAndLogDate(@Param("org_id") String org_id,@Param("bd_id") String bd_id, @Param("log_date")Date beginTime,@Param("isOrg") int isOrg); @AutoSql(type = SqlType.UPDATE) void update(JSONObject existBDSalesReport); 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 5dd530b90..5b08eaac6 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 @@ -1044,10 +1044,10 @@ AND org.org_id = #{org_id} - AND trans.create_time >= #{begin} + AND trans.transaction_time >= #{begin} - AND trans.create_time < #{end} + AND trans.transaction_time < #{end} 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 f92f48fae..62c910a28 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 @@ -79,7 +79,10 @@ create_time, clearing_amount FROM statistics_bd_sales - WHERE bd_id = #{bd_id} AND log_date = #{log_date} AND isOrg = #{isOrg} + WHERE org_id = #{org_id} + AND log_date = #{log_date} + AND isOrg = #{isOrg} + AND bd_id = #{bd_id} \ No newline at end of file