From 9999f0de439a36da958600b9dcfe19a8fe7be0d1 Mon Sep 17 00:00:00 2001
From: eason <eason.qian@royalpay.com.au>
Date: Thu, 19 Jul 2018 15:05:39 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix=20=E8=87=AA=E5=AE=9A=E4=B9=89=E5=95=86?=
 =?UTF-8?q?=E6=88=B7=E8=B4=B9=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/static/payment/partner/partner-manage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index c64e6f703..09e331a58 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/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;
             }

From f7c0f165cde428d9e453f2c16259c5985dc9d106 Mon Sep 17 00:00:00 2001
From: eason <eason.qian@royalpay.com.au>
Date: Thu, 19 Jul 2018 15:08:52 +0800
Subject: [PATCH 2/4] fix encourage css

---
 src/main/ui/static/templates/payment/success.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/ui/static/templates/payment/success.css b/src/main/ui/static/templates/payment/success.css
index 7f09f7bad..48a74b1e4 100644
--- a/src/main/ui/static/templates/payment/success.css
+++ b/src/main/ui/static/templates/payment/success.css
@@ -96,7 +96,7 @@
     padding-top: 25px;
     padding-bottom: 19px;
     border-radius: 5px;
-    background: -webkit-linear-gradient(top, rgb(48, 175, 153), rgb(48, 175, 105));
+    background: -webkit-linear-gradient(top, rgb(253, 99, 1), rgb(251, 120, 4));
     box-shadow: rgba(0,0,0,.3) 5px 5px 10px;
     animation:0.5s showDialog;
 }

From 76f0cec66d48f329ca8e38101df19274980d301b Mon Sep 17 00:00:00 2001
From: eason <eason.qian@royalpay.com.au>
Date: Fri, 20 Jul 2018 22:35:25 +0800
Subject: [PATCH 3/4] fix transaction

---
 .../manage/mappers/payment/TransactionMapper.xml       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
index 0d527bf43..c6911c549 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
+++ b/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

From 1050937afcfa5be5de941dbdb10ae8ac79cf34e1 Mon Sep 17 00:00:00 2001
From: eason <eason.qian@royalpay.com.au>
Date: Mon, 23 Jul 2018 09:56:50 +0800
Subject: [PATCH 4/4] fix hf channel show

---
 .../manage/appclient/core/impls/RetailAppServiceImp.java      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
index 5a1c6d6ec..96315216e 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
@@ -1269,6 +1269,10 @@ public class RetailAppServiceImp implements RetailAppService {
         if (AlipayOnline.containsKey("channel")) {
             channels.add(AlipayOnline);
         }
+        JSONObject Hf = getChannel(clientId,now,"hf");
+        if (Hf.containsKey("channel")){
+            channels.add(Hf);
+        }
         res.put("channels", channels);
         return res;
     }