Merge branch 'fix1' into develop

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

@@ -100,14 +100,14 @@
 
     <select id="analysisTransFlow" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-        count(t.transaction_id) order_count,
-        ifnull(sum(if(t.transaction_type='Credit' and t.refund_id is null and o.currency!='CNY',o.display_amount,0)),0)
+        count(DISTINCT o.order_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,
-        ifnull(sum(if(t.transaction_type='Credit' and t.refund_id is null and o.currency!='CNY' and
+        ifnull(sum(if(t.transaction_type='Credit' and t.refund_id is null and t.system_generate=0 and o.currency!='CNY' and
         o.pre_authorization=1,o.display_amount,0)),0) pre_display_amount,
-        ifnull(sum(if(t.transaction_type='Credit' and t.refund_id is null and o.currency='CNY',o.display_amount,0)),0)
+        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)
         cny_display_amount,
-        ifnull(sum(if(t.transaction_type='Credit' and t.refund_id is null and o.currency='CNY' and
+        ifnull(sum(if(t.transaction_type='Credit' and t.refund_id is null and t.system_generate=0 and o.currency='CNY' and
         o.pre_authorization=1,o.display_amount,0)),0) pre_cny_display_amount,
         ifnull(sum(if(t.transaction_type='Credit',t.clearing_amount,0)),0) paid_fee,
         sum(if(t.transaction_type='Debit' AND t.refund_id is NOT NULL,t.clearing_amount,0))*-1

src/main/ui/static/payment/partner/partner-manage.js

@@ -1167,7 +1167,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 });
                 return;
             }
-            if (cofig > 2 || cofig < parseFloat(Decimal.add($scope.paymentInfo.rate_value, 0.1).toFixed(2))) {
+            if (cofig > 2.5 || cofig < parseFloat(Decimal.add($scope.paymentInfo.rate_value, 0.1).toFixed(2))) {
                 commonDialog.alert({title: 'Error', content: 'Not in the valid range', type: 'error'});
                 return;
             }