Merge remote-tracking branch 'origin/develop' into develop

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.3.43</version>
+    <version>2.3.45</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>

src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml

@@ -290,7 +290,7 @@
 
     <select id="analysisTransFlow" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-        count(DISTINCT o.order_id) order_count,
+        count(t.transaction_id) order_count,
         ifnull(sum(if(t.transaction_type='Credit' and t.refund_id is null and t.system_generate=0 and
         o.currency!='CNY',o.display_amount,0)),0)
         display_amount,

src/main/ui/static/config/platformrevenue/platformrevenue.js

@@ -142,8 +142,11 @@ define(['angular', 'decimal', 'uiRouter', 'angularEcharts', '../../analysis/repo
     }]);
     app.controller('platformRevenueRootCtrl', ['$scope', '$http', '$filter', 'chartParser', function ($scope, $http, $filter, chartParser) {
         $scope.params = {year: new Date().getFullYear()};
-
+        $scope.availableYears = [];
-        $scope.availableYears = [new Date().getFullYear() - 1, new Date().getFullYear()];
+        var years = new Date().getFullYear() - 2016;
+        for( var i = years ; i>=0 ; i-- ){
+            $scope.availableYears.push(new Date().getFullYear() - i) ;
+        }
         $scope.initMonth = function (year) {
             $scope.months = [];
             for (var i = 1; i < 13; i++) {