master
yuan 7 years ago
parent dba05af35c
commit 025d24c358

@ -248,7 +248,7 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
res.put("not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params))); 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_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("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("begin");
params.remove("end"); params.remove("end");
List<JSONObject> logs = transactionMapper.listSettlementLogTotal(params); List<JSONObject> logs = transactionMapper.listSettlementLogTotal(params);

@ -1096,7 +1096,7 @@ define(['angular','decimal', 'uiRouter', 'uiBootstrap', 'angularEcharts'], funct
}]); }]);
app.filter('abs', function () { app.filter('abs', function () {
return function (value) { return function (value) {
return Math.abs(value*100); return Math.abs(value);
} }
}); });
return app; return app;

@ -216,7 +216,7 @@
<p class="mb-0 m-t-20 text-muted">Yesterday: {{transcommon.yes.trade_amount|currency:'AUD'}} <span class="pull-right" ng-class="{'text-red':transcommon.today.trade_amount<transcommon.yes.trade_amount}"> <p class="mb-0 m-t-20 text-muted">Yesterday: {{transcommon.yes.trade_amount|currency:'AUD'}} <span class="pull-right" ng-class="{'text-red':transcommon.today.trade_amount<transcommon.yes.trade_amount}">
<i class="fa fa-caret-up m-r-5" ng-if="transcommon.today.trade_amount >=transcommon.yes.trade_amount"></i> <i class="fa fa-caret-up m-r-5" ng-if="transcommon.today.trade_amount >=transcommon.yes.trade_amount"></i>
<i class="fa fa-caret-down m-r-5" ng-if="transcommon.today.trade_amount<transcommon.yes.trade_amount"></i> <i class="fa fa-caret-down m-r-5" ng-if="transcommon.today.trade_amount<transcommon.yes.trade_amount"></i>
{{transcommon.trade_amount_rise|abs}}%</span></p> {{transcommon.trade_amount_rise|abs|percentage:2}}</span></p>
</div> </div>
</div> </div>
<div class="col-md-3 col-sm-6 col-xs-12"> <div class="col-md-3 col-sm-6 col-xs-12">
@ -229,7 +229,7 @@
<p class="mb-0 m-t-20 text-light">Yesterday: {{transcommon.yes.trade_count}} <span class="pull-right" ng-class="{'text-red':transcommon.today.trade_count<transcommon.yes.trade_count}"> <p class="mb-0 m-t-20 text-light">Yesterday: {{transcommon.yes.trade_count}} <span class="pull-right" ng-class="{'text-red':transcommon.today.trade_count<transcommon.yes.trade_count}">
<i class="fa fa-caret-up m-r-5" ng-if="transcommon.today.trade_count >=transcommon.yes.trade_count"></i> <i class="fa fa-caret-up m-r-5" ng-if="transcommon.today.trade_count >=transcommon.yes.trade_count"></i>
<i class="fa fa-caret-down m-r-5 " ng-if="transcommon.today.trade_count<transcommon.yes.trade_count"></i> <i class="fa fa-caret-down m-r-5 " ng-if="transcommon.today.trade_count<transcommon.yes.trade_count"></i>
{{transcommon.trade_count_rise|abs}}%</span></p> {{transcommon.trade_count_rise|abs|percentage:2}}</span></p>
</div> </div>
</div> </div>
<div class="col-md-3 col-sm-6 col-xs-12"> <div class="col-md-3 col-sm-6 col-xs-12">
@ -242,7 +242,7 @@
<p class="mb-0 m-t-20 text-muted">Yesterday: {{transcommon.yes.new_customers}} <span class="pull-right" ng-class="{'text-red':transcommon.today.new_customers<transcommon.yes.new_customers}"> <p class="mb-0 m-t-20 text-muted">Yesterday: {{transcommon.yes.new_customers}} <span class="pull-right" ng-class="{'text-red':transcommon.today.new_customers<transcommon.yes.new_customers}">
<i class="fa fa-caret-up m-r-5" ng-if="transcommon.today.new_customers >=transcommon.yes.new_customers"></i> <i class="fa fa-caret-up m-r-5" ng-if="transcommon.today.new_customers >=transcommon.yes.new_customers"></i>
<i class="fa fa-caret-down m-r-5" ng-if="transcommon.today.new_customers<transcommon.yes.new_customers"></i> <i class="fa fa-caret-down m-r-5" ng-if="transcommon.today.new_customers<transcommon.yes.new_customers"></i>
{{transcommon.new_customers_rise|abs}}%</span></p> {{transcommon.new_customers_rise|abs|percentage:2}}</span></p>
</div> </div>
</div> </div>
<div class="col-md-3 col-sm-6 col-xs-12"> <div class="col-md-3 col-sm-6 col-xs-12">
@ -274,12 +274,12 @@
</li> </li>
<li> <li>
<h6 class=""><b>{{wechat_rate}}</b></h6> <h6 class=""><b>{{wechat_rate}}</b></h6>
<p class="text-muted m-b-0"><img src="/static/images/wechatpay_sign.png"/> Wechat</p> <p class="text-muted m-b-0"><img src="/static/images/wechatpay_sign.png"/> <b>Wechat</b></p>
</li> </li>
<li> <li>
<h6 class=""><b>{{alipay_rate}}</b></h6> <h6 class=""><b>{{alipay_rate}}</b></h6>
<p class="text-muted m-b-0"> <img src="/static/images/alipay_sign.png"/> Alipay</p> <p class="text-muted m-b-0"> <img src="/static/images/alipay_sign.png"/> <b>Alipay</b></p>
</li> </li>
</ul> </ul>
<div class="box-body"> <div class="box-body">

Loading…
Cancel
Save