From eba63ac626ea54ae9110f57bac36925d12b2fff5 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 25 Jun 2019 16:07:36 +0800
Subject: [PATCH 1/8] =?UTF-8?q?add=20yeepay=20product=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/templates/cbpay/yeepay/v1/gateway_jsapi_phone.js  | 4 ++++
 .../static/templates/cbpay/yeepay/v2/gateway_jsapi_phone.js  | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/src/main/ui/static/templates/cbpay/yeepay/v1/gateway_jsapi_phone.js b/src/main/ui/static/templates/cbpay/yeepay/v1/gateway_jsapi_phone.js
index 5da9823f0..75284216c 100644
--- a/src/main/ui/static/templates/cbpay/yeepay/v1/gateway_jsapi_phone.js
+++ b/src/main/ui/static/templates/cbpay/yeepay/v1/gateway_jsapi_phone.js
@@ -44,6 +44,10 @@ $(document).ready(function () {
             alert('金额不能为0');
             return;
         }
+        if (product == null || product.length === 0) {
+            alert('请填写真实的商品名称');
+            return;
+        }
 
         $('#commit-btn').addClass('hidden');
         $('#commit-btn-loading').removeClass('hidden');
diff --git a/src/main/ui/static/templates/cbpay/yeepay/v2/gateway_jsapi_phone.js b/src/main/ui/static/templates/cbpay/yeepay/v2/gateway_jsapi_phone.js
index cca183ee6..493a36560 100644
--- a/src/main/ui/static/templates/cbpay/yeepay/v2/gateway_jsapi_phone.js
+++ b/src/main/ui/static/templates/cbpay/yeepay/v2/gateway_jsapi_phone.js
@@ -79,6 +79,11 @@ $(document).ready(function () {
             return;
         }
 
+        if (product == null || product.length === 0) {
+            alert('请填写真实的商品名称');
+            return;
+        }
+
         $('#commit-btn').addClass('hidden');
         $('#commit-btn-loading').removeClass('hidden');
 

From 4cd4ed85b96969ef84cc26d238bcb64fac8f56db Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 25 Jun 2019 16:23:06 +0800
Subject: [PATCH 2/8] =?UTF-8?q?add=20=E6=94=AF=E4=BB=98=E9=A1=B5cache?=
 =?UTF-8?q?=E6=B8=85=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment/manage/merchants/core/impls/ClientManagerImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
index e4f595761..e27db5253 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
@@ -3218,6 +3218,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         }
         checkOrgPermission(manager, client);
         clientModifySupport.processClientConfigModify(new PaypadVersionModify(manager, clientMoniker, paypad_version));
+        clientInfoCacheSupport.clearClientMonikerConfigCache(client.getString("client_moniker"));
     }
 
     @Override
@@ -3338,7 +3339,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             throw new InvalidShortIdException();
         }
         clientModifySupport.processClientConfigModify(new PaypadVersionModify(account, client.getString("client_moniker"), paypad_version));
-
+        clientInfoCacheSupport.clearClientMonikerConfigCache(client.getString("client_moniker"));
     }
 
     @Override

From 72b505ee673084e9b49958584878f8fc1e9b2243 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 25 Jun 2019 16:53:29 +0800
Subject: [PATCH 3/8] fix

---
 .../payment/manage/merchants/core/impls/ClientManagerImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
index e27db5253..5e1e71643 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
@@ -3218,7 +3218,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         }
         checkOrgPermission(manager, client);
         clientModifySupport.processClientConfigModify(new PaypadVersionModify(manager, clientMoniker, paypad_version));
-        clientInfoCacheSupport.clearClientMonikerConfigCache(client.getString("client_moniker"));
+        clientInfoCacheSupport.clearClientMonikerConfigCache(clientMoniker);
     }
 
     @Override

From 877e057d38906794092bba7a8594656edc8b971f Mon Sep 17 00:00:00 2001
From: "james.zhao" <james.zhao@globalfreepay.com>
Date: Wed, 26 Jun 2019 09:19:59 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E6=97=A5=E6=8A=A5=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=B1=8F=E8=94=BD=E6=94=AF=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/reports/daily_report.html       | 82 +++++++++----------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/src/main/resources/templates/reports/daily_report.html b/src/main/resources/templates/reports/daily_report.html
index 1cbb05e2c..b04ca4c48 100644
--- a/src/main/resources/templates/reports/daily_report.html
+++ b/src/main/resources/templates/reports/daily_report.html
@@ -29,8 +29,8 @@
 <body>
 <div class="weui-tab">
     <div class="weui-navbar">
-        <a class="weui-navbar__item weui-bar__item_on">收入</a>
-        <a class="weui-navbar__item">支出</a>
+        <a class="weui-navbar__item weui-bar__item_on">交易</a>
+        <!--<a class="weui-navbar__item">支出</a>-->
         <a class="weui-navbar__item">KPI</a>
     </div>
     <div class="weui-tab__panel">
@@ -94,46 +94,46 @@
 
 
         </div>
-        <div class="tabcontent" style="display: none;">
-            <div class="weui-panel">
-                <div class="weui-panel__hd">运营支出</div>
-                <div class="weui-panel__ft">
-                    <div class="weui-cell">
-                        <div class="weui-cell__bd weui-cell_primary">红包(¥)</div>
-                        <div class="weui-cell__ft" th:text="${report.debit.redpack.value}"></div>
-                    </div>
-                    <div class="weui-cell">
-                        <div class="weui-cell__bd weui-cell_primary">较昨天比较</div>
-                        <div class="weui-cell__ft">
-                            <span style="color: green" th:if="${report.debit.redpack.compare>0}"
-                                  th:text="'↑'+${report.debit.redpack.compare_value}"></span>
-                            <span style="color: red" th:if="${report.debit.redpack.compare<0}"
-                                  th:text="'↓'+${report.debit.redpack.compare_value}"></span>
-                            <span th:if="${report.debit.redpack.compare==0}"
-                                  th:text="${report.debit.redpack.compare_value}"></span>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="weui-panel">
-                <div class="weui-panel__hd">周末费率优惠</div>
-                <div class="weui-panel__ft">
-                    <div class="weui-cell">
-                        <div class="weui-cell__bd weui-cell_primary">返现（A$）</div>
-                        <div class="weui-cell__ft" th:text="${report.debit.cashback.value}"></div>
-                    </div>
-                    <div class="weui-cell">
-                        <div class="weui-cell__bd weui-cell_primary">较昨天比较</div>
-                        <div class="weui-cell__ft">
-                            <span style="color: green" th:if="${report.debit.cashback.compare>0}" th:text="'↑'+${report.debit.cashback.compare_value}"></span>
-                            <span style="color: red" th:if="${report.debit.cashback.compare<0}" th:text="'↓'+${report.debit.cashback.compare_value}"></span>
-                            <span th:if="${report.debit.cashback.compare==0}" th:text="${report.debit.cashback.compare_value}"></span>
-                        </div>
-                    </div>
-                </div>
-            </div>
+        <!--<div class="tabcontent" style="display: none;">-->
+            <!--<div class="weui-panel">-->
+                <!--<div class="weui-panel__hd">运营支出</div>-->
+                <!--<div class="weui-panel__ft">-->
+                    <!--<div class="weui-cell">-->
+                        <!--<div class="weui-cell__bd weui-cell_primary">红包(¥)</div>-->
+                        <!--<div class="weui-cell__ft" th:text="${report.debit.redpack.value}"></div>-->
+                    <!--</div>-->
+                    <!--<div class="weui-cell">-->
+                        <!--<div class="weui-cell__bd weui-cell_primary">较昨天比较</div>-->
+                        <!--<div class="weui-cell__ft">-->
+                            <!--<span style="color: green" th:if="${report.debit.redpack.compare>0}"-->
+                                  <!--th:text="'↑'+${report.debit.redpack.compare_value}"></span>-->
+                            <!--<span style="color: red" th:if="${report.debit.redpack.compare<0}"-->
+                                  <!--th:text="'↓'+${report.debit.redpack.compare_value}"></span>-->
+                            <!--<span th:if="${report.debit.redpack.compare==0}"-->
+                                  <!--th:text="${report.debit.redpack.compare_value}"></span>-->
+                        <!--</div>-->
+                    <!--</div>-->
+                <!--</div>-->
+            <!--</div>-->
+            <!--<div class="weui-panel">-->
+                <!--<div class="weui-panel__hd">周末费率优惠</div>-->
+                <!--<div class="weui-panel__ft">-->
+                    <!--<div class="weui-cell">-->
+                        <!--<div class="weui-cell__bd weui-cell_primary">返现（A$）</div>-->
+                        <!--<div class="weui-cell__ft" th:text="${report.debit.cashback.value}"></div>-->
+                    <!--</div>-->
+                    <!--<div class="weui-cell">-->
+                        <!--<div class="weui-cell__bd weui-cell_primary">较昨天比较</div>-->
+                        <!--<div class="weui-cell__ft">-->
+                            <!--<span style="color: green" th:if="${report.debit.cashback.compare>0}" th:text="'↑'+${report.debit.cashback.compare_value}"></span>-->
+                            <!--<span style="color: red" th:if="${report.debit.cashback.compare<0}" th:text="'↓'+${report.debit.cashback.compare_value}"></span>-->
+                            <!--<span th:if="${report.debit.cashback.compare==0}" th:text="${report.debit.cashback.compare_value}"></span>-->
+                        <!--</div>-->
+                    <!--</div>-->
+                <!--</div>-->
+            <!--</div>-->
 
-        </div>
+        <!--</div>-->
         <div class="tabcontent"  style="display: none;">
             <div class="weui-panel">
                 <div class="weui-panel__hd">KPI进度</div>

From 6b7e764a70e9fe0f83c9637ab48354ce98125111 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 26 Jun 2019 16:24:03 +0800
Subject: [PATCH 5/8] =?UTF-8?q?fix=20=E5=90=88=E4=BC=99=E4=BA=BA=E6=8F=90?=
 =?UTF-8?q?=E6=88=90=20=E4=BF=AE=E5=A4=8Dsurcharge=5Fcashback?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impls/CityPartnerPrizeServiceImpl.java    | 28 +++++++++++++------
 .../mappers/payment/TransactionMapper.xml     |  4 ++-
 src/main/ui/MP_verify_8lb7qo78Ssfr5yBD.txt    |  1 +
 3 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 src/main/ui/MP_verify_8lb7qo78Ssfr5yBD.txt

diff --git a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java
index 0e2c3bf07..1ea8bf8fd 100644
--- a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java
@@ -23,6 +23,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.swing.plaf.basic.BasicScrollPaneUI;
 
 import au.com.royalpay.payment.manage.mappers.system.ClientBankAccountMapper;
+import au.com.royalpay.payment.manage.mappers.system.ClientRateMapper;
 import au.com.royalpay.payment.tools.CommonConsts;
 import au.com.royalpay.payment.tools.merchants.core.MerchantInfoProvider;
 import org.apache.commons.collections.CollectionUtils;
@@ -499,9 +500,9 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
             }
 
             for (JSONObject params : oneChannel.getValue()) {
-                BigDecimal tmpClearingAmount = params.getBigDecimal("clearing_amount").subtract(params.getBigDecimal("surcharge_cashback"));
+                BigDecimal tmpClearingAmount = params.getBigDecimal("clearing_amount");
                 BigDecimal channelRate = params.get("org_rate") != null ? params.getBigDecimal("org_rate") : (orgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value").divide(CommonConsts.HUNDRED, 4, RoundingMode.DOWN));
-                BigDecimal tmpTotalSurcharge = tmpClearingAmount.multiply(params.getBigDecimal("surcharge_rate")).setScale(2, RoundingMode.HALF_UP);
+                BigDecimal tmpTotalSurcharge = params.getBigDecimal("total_surcharge").subtract(params.getBigDecimal("surcharge_cashback"));
                 //增加货币判断
                 int i = currencyScale(params.getString("clearing_currency"));
                 total = total.add(tmpClearingAmount);
@@ -542,9 +543,9 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
                 channel = "cb_bankpay";
             }
             for (JSONObject params : oneChannel.getValue()) {
-                BigDecimal tmpClearingAmount = params.getBigDecimal("clearing_amount").subtract(params.getBigDecimal("surcharge_cashback"));
+                BigDecimal tmpClearingAmount = params.getBigDecimal("clearing_amount");
                 BigDecimal channelRate = params.get("org_rate") != null ? params.getBigDecimal("org_rate") : (orgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value").divide(CommonConsts.HUNDRED, 4, RoundingMode.DOWN));
-                BigDecimal tmpTotalSurcharge = tmpClearingAmount.multiply(params.getBigDecimal("surcharge_rate")).setScale(2, RoundingMode.HALF_UP);
+                BigDecimal tmpTotalSurcharge = params.getBigDecimal("total_surcharge").subtract(params.getBigDecimal("surcharge_cashback"));
                 //增加货币判断
                 int i = currencyScale(params.getString("clearing_currency"));
                 BigDecimal parent_surage = tmpClearingAmount.multiply(parentOrgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value").divide(CommonConsts.HUNDRED, 4, RoundingMode.DOWN)).setScale(i, RoundingMode.HALF_UP);
@@ -594,14 +595,21 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
             Date dateto = new Date();
             JSONObject json = new JSONObject();
             String channel = oneChannel.getKey();
+            String rateChannel = oneChannel.getKey();
             if ("hf".equals(oneChannel.getKey().toLowerCase()) || "yeepay".equals(oneChannel.getKey().toLowerCase()) || "lakalapay".equals(oneChannel.getKey().toLowerCase())) {
                 channel = "cb_bankpay";
+                rateChannel = "CB_BankPay";
+            }
+            JSONObject clientRate = null;
+            try {
+                clientRate = merchantInfoProvider.clientCurrentRate(clientId, oneChannel.getValue().get(0).getDate("transaction_time"),
+                        rateChannel);
+            } catch (Exception e) {
             }
-
             for (JSONObject params : oneChannel.getValue()) {
-                BigDecimal tmpClearingAmount = params.getBigDecimal("clearing_amount").subtract(params.getBigDecimal("surcharge_cashback"));
+                BigDecimal tmpClearingAmount = params.getBigDecimal("clearing_amount");
                 BigDecimal channelRate = params.get("org_rate") != null ? params.getBigDecimal("org_rate") : (orgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value").divide(CommonConsts.HUNDRED, 4, RoundingMode.DOWN));
-                BigDecimal tmpTotalSurcharge = tmpClearingAmount.multiply(params.getBigDecimal("surcharge_rate")).setScale(2, RoundingMode.HALF_UP);
+                BigDecimal tmpTotalSurcharge = params.getBigDecimal("total_surcharge").subtract(params.getBigDecimal("surcharge_cashback"));
                 //增加货币判断
                 int i = currencyScale(params.getString("clearing_currency"));
                 if (total.compareTo(BigDecimal.ZERO) == 0) {
@@ -630,7 +638,11 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
 
             json.put("record_id", recordId);
             json.put("client_id", clientId);
-            json.put("client_rate", oneChannel.getValue().get(0).getBigDecimal("surcharge_rate").multiply(CommonConsts.HUNDRED));
+            if (clientRate != null) {
+                json.put("client_rate", clientRate.getBigDecimal("rate_value"));
+            }else {
+                json.put("client_rate", oneChannel.getValue().get(0).getBigDecimal("surcharge_rate").multiply(CommonConsts.HUNDRED));
+            }
             json.put("gross_amount", total);
             json.put("total_charge", total_surage);
             json.put("org_rate", orgInfo.getBigDecimal(channel.toLowerCase() + "_rate_value"));
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 c0f206355..23ae1f780 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
@@ -766,7 +766,9 @@
                if(t.transaction_type = 'Credit', t.clearing_amount, -t.clearing_amount)     clearing_amount,
                if(t.transaction_type = 'Credit', t.total_surcharge, -t.total_surcharge)     total_surcharge,
                if(t.transaction_type = 'Credit', t.channel_surcharge, -t.channel_surcharge) channel_surcharge,
-               t.order_id
+               t.order_id,
+               t.org_rate,
+               t.surcharge_cashback
         from pmt_transactions t
                  INNER JOIN sys_org so ON t.org_id = so.org_id AND so.is_valid = 1
             AND so.type = 0
diff --git a/src/main/ui/MP_verify_8lb7qo78Ssfr5yBD.txt b/src/main/ui/MP_verify_8lb7qo78Ssfr5yBD.txt
new file mode 100644
index 000000000..702b1ac18
--- /dev/null
+++ b/src/main/ui/MP_verify_8lb7qo78Ssfr5yBD.txt
@@ -0,0 +1 @@
+8lb7qo78Ssfr5yBD
\ No newline at end of file

From f23daac4d7c6dc815b12a5a0975196fbf7aa3d44 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 27 Jun 2019 11:16:39 +0800
Subject: [PATCH 6/8] =?UTF-8?q?fix=20=E5=90=88=E4=BC=99=E4=BA=BA=E6=8F=90?=
 =?UTF-8?q?=E6=88=90=20=E4=BF=AE=E5=A4=8Dsurcharge=5Fcashback?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/static/payment/partner/partner-manage.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index 75885e2bf..9e43f403d 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -398,6 +398,9 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             }
         }
         $scope.toggleClientPayType = function (type) {
+            if ($scope.partner.client_pay_type==null || $scope.partner.client_pay_type==undefined){
+                $scope.partner.client_pay_type = [];
+            }
             var $idx = $scope.partner.client_pay_type.indexOf(type);
             if ($idx >= 0) {
                 $scope.partner.client_pay_type.splice($idx, 1);
@@ -408,6 +411,9 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             }
         };
         $scope.toggleClientPayDesc = function (type) {
+            if ($scope.partner.client_pay_desc==null || $scope.partner.client_pay_desc==undefined){
+                $scope.partner.client_pay_desc = [];
+            }
             var $idx = $scope.partner.client_pay_desc.indexOf(type);
             if ($idx >= 0) {
                 $scope.partner.client_pay_desc.splice($idx, 1);

From 8ab0b4f67fbdc7e9265c2f80e74b2e128042c153 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 27 Jun 2019 13:58:58 +0800
Subject: [PATCH 7/8] =?UTF-8?q?fix=20=E5=90=88=E4=BC=99=E4=BA=BA=E6=8F=90?=
 =?UTF-8?q?=E6=88=90=E8=B4=9F=E6=95=B0=E6=8A=B9=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/impls/CityPartnerPrizeServiceImpl.java            | 6 +++++-
 .../orgcommission/templates/org_commission_month.html      | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java
index 1ea8bf8fd..f645150be 100644
--- a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java
@@ -1298,7 +1298,11 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
                 row.createCell(2, Cell.CELL_TYPE_STRING).setCellValue(log.getBigDecimal("total_charge") == null ? BigDecimal.ZERO.toPlainString() : log.getBigDecimal("total_charge").toPlainString());
                 row.createCell(3, Cell.CELL_TYPE_STRING).setCellValue(log.getBigDecimal("royalpay_charge") == null ? BigDecimal.ZERO.toPlainString() : log.getBigDecimal("royalpay_charge").toPlainString());
                 row.createCell(4, Cell.CELL_TYPE_STRING).setCellValue(log.getBigDecimal("net_charge") == null ? BigDecimal.ZERO.toPlainString() : log.getBigDecimal("net_charge").toPlainString());
-                row.createCell(5, Cell.CELL_TYPE_STRING).setCellValue(log.getBigDecimal("org_charge") == null ? BigDecimal.ZERO.toPlainString() : log.getBigDecimal("org_charge").toPlainString());
+                if (log.getBigDecimal("org_charge").compareTo(BigDecimal.ZERO) == 1) {
+                    row.createCell(5, Cell.CELL_TYPE_STRING).setCellValue(log.getBigDecimal("org_charge").toPlainString());
+                }else {
+                    row.createCell(5, Cell.CELL_TYPE_STRING).setCellValue(BigDecimal.ZERO.toPlainString());
+                }
                 row.createCell(6, Cell.CELL_TYPE_STRING).setCellValue(log.getBigDecimal("share_charge") == null ? BigDecimal.ZERO.toPlainString() : log.getBigDecimal("share_charge").toPlainString());
                 row.createCell(7, Cell.CELL_TYPE_STRING).setCellValue(type);
             }
diff --git a/src/main/ui/static/config/orgcommission/templates/org_commission_month.html b/src/main/ui/static/config/orgcommission/templates/org_commission_month.html
index fd06dda12..09c798787 100644
--- a/src/main/ui/static/config/orgcommission/templates/org_commission_month.html
+++ b/src/main/ui/static/config/orgcommission/templates/org_commission_month.html
@@ -77,7 +77,12 @@
                         </span>
                     </td>
                     <td ng-if="log.org_type=='agent' || log.share_charge ==0">
-                            {{log.org_charge}}
+                        <span ng-if="log.org_charge>0">
+                            {{log.org_charge|currency:'AUD'}}
+                        </span>
+                        <span ng-if="log.org_charge<=0">
+                            {{0|currency:'AUD'}}
+                        </span>
                     </td>
 
                     <td ng-bind="log.share_charge"></td>

From d9de74472f1c512e7296542902d71cc2e24b92b6 Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Thu, 27 Jun 2019 16:56:21 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E7=BB=99datav=E6=8F=90=E4=BE=9B=E9=A3=9E?=
 =?UTF-8?q?=E7=BA=BF=E5=B1=82=E6=95=B0=E6=8D=AE=E3=80=81=E5=95=86=E5=AE=B6?=
 =?UTF-8?q?=E5=88=86=E5=B8=83=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/datav/core/DatavService.java       |  12 ++
 .../datav/core/Impl/DatavServiceImpl.java     | 119 ++++++++++++++++++
 .../manage/datav/web/DatavController.java     |  36 ++++++
 .../manage/mappers/payment/OrderMapper.java   |   2 +
 .../system/ClientAndCustomerLocation.java     |  17 +++
 .../manage/task/OrderIpAnalysisTask.java      |  25 ++++
 .../manage/mappers/payment/OrderMapper.xml    |  18 +++
 7 files changed, 229 insertions(+)
 create mode 100644 src/main/java/au/com/royalpay/payment/manage/datav/core/DatavService.java
 create mode 100644 src/main/java/au/com/royalpay/payment/manage/datav/core/Impl/DatavServiceImpl.java
 create mode 100644 src/main/java/au/com/royalpay/payment/manage/datav/web/DatavController.java
 create mode 100644 src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAndCustomerLocation.java
 create mode 100644 src/main/java/au/com/royalpay/payment/manage/task/OrderIpAnalysisTask.java

diff --git a/src/main/java/au/com/royalpay/payment/manage/datav/core/DatavService.java b/src/main/java/au/com/royalpay/payment/manage/datav/core/DatavService.java
new file mode 100644
index 000000000..394fe9c0a
--- /dev/null
+++ b/src/main/java/au/com/royalpay/payment/manage/datav/core/DatavService.java
@@ -0,0 +1,12 @@
+package au.com.royalpay.payment.manage.datav.core;
+
+
+import com.alibaba.fastjson.JSONObject;
+
+import java.util.List;
+
+public interface DatavService {
+    List<JSONObject> merchantByIndustry();
+
+    void transactionLoc();
+}
diff --git a/src/main/java/au/com/royalpay/payment/manage/datav/core/Impl/DatavServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/datav/core/Impl/DatavServiceImpl.java
new file mode 100644
index 000000000..ae4015685
--- /dev/null
+++ b/src/main/java/au/com/royalpay/payment/manage/datav/core/Impl/DatavServiceImpl.java
@@ -0,0 +1,119 @@
+package au.com.royalpay.payment.manage.datav.core.Impl;
+
+import au.com.royalpay.payment.manage.analysis.core.PartnersAnalysisService;
+import au.com.royalpay.payment.manage.datav.core.DatavService;
+import au.com.royalpay.payment.manage.mappers.payment.OrderMapper;
+import au.com.royalpay.payment.manage.mappers.system.ClientAndCustomerLocation;
+import au.com.royalpay.payment.tools.env.PlatformEnvironment;
+import cn.yixblog.platform.http.HttpRequestGenerator;
+import cn.yixblog.platform.http.HttpRequestResult;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.time.DateUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class DatavServiceImpl implements DatavService {
+
+    @Resource
+    private PartnersAnalysisService partnersAnalysisService;
+    @Resource
+    private OrderMapper orderMapper;
+    @Resource
+    private ClientAndCustomerLocation clientAndCustomerLocation;
+    @Override
+    public List<JSONObject> merchantByIndustry() {
+        List<JSONObject> partnersTypesAnalysis =  partnersAnalysisService.getPartnersTypesAnalysis(new JSONObject());
+        List<JSONObject> analysis = new ArrayList<>();
+        JSONObject result;
+        for(JSONObject partner : partnersTypesAnalysis) {
+            result = new JSONObject();
+            result.put("value", partner.getIntValue("count_value"));
+            switch (partner.getIntValue("mccCode")){
+                case 1:
+                    result.put("type", "旅游出行");
+                    break;
+                case 2:
+                    result.put("type", "餐饮");
+                    break;
+                case 3:
+                    result.put("type", "教育");
+                    break;
+                case 4:
+                    result.put("type", "商务咨询");
+                    break;
+                case 5:
+                    result.put("type", "传媒");
+                    break;
+                case 6:
+                    result.put("type", "医美");
+                    break;
+                case 7:
+                    result.put("type", "零售");
+                    break;
+                case 8:
+                    result.put("type", "休闲娱乐");
+                    break;
+                case 9:
+                    result.put("type", "其他服务类");
+                    break;
+                case 10:
+                    result.put("type", "酒店");
+                    break;
+                case 11:
+                    result.put("type", "出口贸易");
+                    break;
+                case 12:
+                    result.put("type", "家居建材");
+                    break;
+            }
+            analysis.add(result);
+        }
+        return analysis;
+    }
+
+    @Override
+    public void transactionLoc() {
+        JSONObject params = new JSONObject();
+        long time = 60*60*1000;//60分钟
+        Date now = new Date();
+        Date beforeDate = new Date(now .getTime() - time);//60分钟前的时间
+        params.put("begin", beforeDate);
+        params.put("end", now);
+        params.put("limit", 40);
+        List<JSONObject> customerLoc = orderMapper.getClientAndCustomerLoc(params);
+        JSONObject obj;
+        for (JSONObject customer : customerLoc) {
+            //判断数据库是否已经存在该条ip解析
+            obj = clientAndCustomerLocation.findByIp(customer.getString("customer_ip"));
+            if (obj == null) {
+                try {
+                    HttpRequestResult result = new HttpRequestGenerator("https://ipinfo.io/" + customer.getString("customer_ip") +"/json?token=7fac65b5953bb1", RequestMethod.GET).execute();
+                    if (result.isSuccess()) {
+                        obj = result.getResponseContentJSONObj();
+                        String[] locArr = obj.getString("loc").split(",");
+                        obj.put("ip_longitude", locArr[1]);
+                        obj.put("ip_latitude", locArr[0]);
+                        obj.put("moniker_longitude", customer.getString("longitude"));
+                        obj.put("moniker_latitude", customer.getString("latitude"));
+                    }
+                } catch (IOException | URISyntaxException e) {
+                    e.printStackTrace();
+                }
+            }
+
+            if (obj != null && !customer.getString("order_id").equals(obj.get("order_id"))) {
+                obj.put("order_id", customer.getString("order_id"));
+                obj.put("create_time", new Date());
+                clientAndCustomerLocation.save(obj);
+            }
+        }
+    }
+}
diff --git a/src/main/java/au/com/royalpay/payment/manage/datav/web/DatavController.java b/src/main/java/au/com/royalpay/payment/manage/datav/web/DatavController.java
new file mode 100644
index 000000000..34155a772
--- /dev/null
+++ b/src/main/java/au/com/royalpay/payment/manage/datav/web/DatavController.java
@@ -0,0 +1,36 @@
+package au.com.royalpay.payment.manage.datav.web;
+
+
+import au.com.royalpay.payment.manage.datav.core.DatavService;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/v1.0/datav")
+public class DatavController {
+
+    @Resource
+    private DatavService datavService;
+
+    /**
+     * 各类型商家分布
+     * @return
+     */
+    @RequestMapping("/merchant/industry")
+    public List<JSONObject> getMerchantAnalysisByIndustry() {
+        return datavService.merchantByIndustry();
+    }
+
+    /**
+     * 获取支付方与收款方的经纬度
+     * @return
+     */
+    @RequestMapping("/payment/loc")
+    public void getPaymentLonAndLat() {
+        datavService.transactionLoc();
+    }
+}
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java
index 88c534e0d..761715ce8 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java
@@ -71,4 +71,6 @@ public interface OrderMapper {
     List<JSONObject> listNewYearOrdersByOpenId(@Param("customer_id") String open_id,@Param("transaction_date") String date);
 
     List<Integer> listGatewayByClientId(@Param("client_id") int clientId);
+
+    List<JSONObject> getClientAndCustomerLoc(JSONObject params);
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAndCustomerLocation.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAndCustomerLocation.java
new file mode 100644
index 000000000..c9a560b25
--- /dev/null
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAndCustomerLocation.java
@@ -0,0 +1,17 @@
+package au.com.royalpay.payment.manage.mappers.system;
+
+import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.ibatis.annotations.Param;
+
+@AutoMapper(tablename = "sys_clients_customer_locations", pkName = {"id"})
+public interface ClientAndCustomerLocation {
+
+    @AutoSql(type = SqlType.SELECT)
+    JSONObject findByIp(@Param(value = "ip") String ip);
+
+    @AutoSql(type = SqlType.INSERT)
+    void save(JSONObject params);
+}
diff --git a/src/main/java/au/com/royalpay/payment/manage/task/OrderIpAnalysisTask.java b/src/main/java/au/com/royalpay/payment/manage/task/OrderIpAnalysisTask.java
new file mode 100644
index 000000000..aae5981af
--- /dev/null
+++ b/src/main/java/au/com/royalpay/payment/manage/task/OrderIpAnalysisTask.java
@@ -0,0 +1,25 @@
+package au.com.royalpay.payment.manage.task;
+
+import au.com.royalpay.payment.manage.datav.core.DatavService;
+import au.com.royalpay.payment.tools.scheduler.SynchronizedScheduler;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+@Component
+@ConditionalOnProperty(value = "app.run-tasks", havingValue = "true")
+public class OrderIpAnalysisTask {
+    @Resource
+    private DatavService datavService;
+    @Resource
+    private SynchronizedScheduler synchronizedScheduler;
+
+    @Scheduled(cron = "0 0 */1 * * ?")
+    public void ipAnalysis() {
+        synchronizedScheduler.executeProcess("datav_task:ip_analysis", 300_000, () -> {
+            datavService.transactionLoc();
+        });
+    }
+}
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
index e5f0f0017..79ede0a7b 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
@@ -852,4 +852,22 @@
         AND client_id = #{client_id}
         GROUP BY gateway
     </select>
+
+    <select id="getClientAndCustomerLoc" resultType="com.alibaba.fastjson.JSONObject">
+        <![CDATA[
+            SELECT
+                o.customer_ip, l.latitude, l.longitude, o.order_id
+            FROM
+                pmt_transactions t
+            INNER JOIN pmt_orders o ON t.order_id = o.order_id
+            INNER JOIN sys_clients_locations l ON l.client_id = o.client_id
+            WHERE
+                t.transaction_type = 'Credit'
+            AND t.channel != 'Settlement'
+            AND o.create_time < #{end}
+            AND o.create_time >= #{begin}
+            ORDER BY RAND()
+        ]]>
+        <if test="limit != null">limit #{limit}</if>
+    </select>
 </mapper>