diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java index e2360fb9b..653ea880a 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java @@ -248,7 +248,7 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT res.put("not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params))); res.put("trade_amount_rise",yes.getBigDecimal("trade_amount").compareTo(BigDecimal.ZERO)>0 ? (today.getBigDecimal("trade_amount").subtract(yes.getBigDecimal("trade_amount"))).divide(yes.getBigDecimal("trade_amount"), 4, BigDecimal.ROUND_HALF_UP):BigDecimal.ZERO); res.put("trade_count_rise", yes.getIntValue("trade_count") > 0 ? (today.getBigDecimal("trade_count").subtract(yes.getBigDecimal("trade_count"))).divide(yes.getBigDecimal("trade_count"), 4, BigDecimal.ROUND_HALF_UP) : 0); - res.put("new_customers_rise", yes.getIntValue("new_customers") > 0 ? (today.getIntValue("new_customers")-yes.getIntValue("new_customers"))/yes.getIntValue("new_customers") : 0); + res.put("new_customers_rise", yes.getIntValue("new_customers") > 0 ? (today.getBigDecimal("new_customers").subtract(yes.getBigDecimal("new_customers"))).divide(yes.getBigDecimal("new_customers"), 4, BigDecimal.ROUND_HALF_UP) : 0); params.remove("begin"); params.remove("end"); List logs = transactionMapper.listSettlementLogTotal(params); diff --git a/src/main/ui/static/dashboard/partner-dashboard.js b/src/main/ui/static/dashboard/partner-dashboard.js index ddd6a1ff4..c2a26c267 100644 --- a/src/main/ui/static/dashboard/partner-dashboard.js +++ b/src/main/ui/static/dashboard/partner-dashboard.js @@ -1096,7 +1096,7 @@ define(['angular','decimal', 'uiRouter', 'uiBootstrap', 'angularEcharts'], funct }]); app.filter('abs', function () { return function (value) { - return Math.abs(value*100); + return Math.abs(value); } }); return app; diff --git a/src/main/ui/static/dashboard/templates/partner_dashboard.html b/src/main/ui/static/dashboard/templates/partner_dashboard.html index 8eb863b0a..384c5545b 100644 --- a/src/main/ui/static/dashboard/templates/partner_dashboard.html +++ b/src/main/ui/static/dashboard/templates/partner_dashboard.html @@ -216,7 +216,7 @@

Yesterday: {{transcommon.yes.trade_amount|currency:'AUD'}} - {{transcommon.trade_amount_rise|abs}}%

+ {{transcommon.trade_amount_rise|abs|percentage:2}}

@@ -229,7 +229,7 @@

Yesterday: {{transcommon.yes.trade_count}} - {{transcommon.trade_count_rise|abs}}%

+ {{transcommon.trade_count_rise|abs|percentage:2}}

@@ -242,7 +242,7 @@

Yesterday: {{transcommon.yes.new_customers}} - {{transcommon.new_customers_rise|abs}}%

+ {{transcommon.new_customers_rise|abs|percentage:2}}

@@ -274,12 +274,12 @@
  • {{wechat_rate}}
    -

    Wechat

    +

    Wechat

  • {{alipay_rate}}
    -

    Alipay

    +

    Alipay