From 49548f0137666348a3f4c6e1c03c128fe47e7148 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 18 Sep 2018 11:14:30 +0800
Subject: [PATCH 001/103] add 5%

---
 .../system/SysRpayMerchantApplyMapper.java    |   4 +-
 .../core/impls/ClientManagerImpl.java         |   4 +-
 .../static/payment/partner/partner-manage.js  |  87 ++++++++--
 .../templates/apply_rpay_sub_merchant_id.html | 164 ++++++++++++++++++
 4 files changed, 241 insertions(+), 18 deletions(-)
 create mode 100644 src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html

diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java
index 9aa1cdbff..898ac3661 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java
@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 /**
- * Created by yangluo on 2017-03-14.
+ * Created by yangluo on 2018-09-18.
  */
 @AutoMapper(tablename = "sys_rpay_merchant_apply",pkName = "merchant_app_id")
 public interface SysRpayMerchantApplyMapper {
@@ -21,6 +21,6 @@ public interface SysRpayMerchantApplyMapper {
     void insertRpayMerchantApply(JSONObject params);
 
     @AutoSql(type = SqlType.SELECT)
-    List<JSONObject> selectByShortName(@Param("client_id") int client_id,@Param("merchant_shortname") String shortName);
+    List<JSONObject> listByShortName(@Param("client_id") int client_id,@Param("merchant_shortname") String shortName);
 
 }
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 4defc9826..870653d59 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
@@ -3582,9 +3582,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         }
         checkOrgPermission(manager, client);
 
-        List<JSONObject> selectByshortName = sysRpayMerchantApplyMapper.selectByShortName(client.getIntValue("client_id"),client.getString("short_name"));
+        List<JSONObject> listByshortName = sysRpayMerchantApplyMapper.listByShortName(client.getIntValue("client_id"),client.getString("short_name"));
 
-        if (selectByshortName.size()>0) {
+        if (listByshortName.size()>0) {
             throw new BadRequestException("请修改【" + clientMoniker + "】的Company shortName信息（请避免和Rpay+商务号列表内的Company Short Name重复）");
         }
 
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index b855dae98..8de911884 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -3129,20 +3129,29 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             })
         };
         $scope.applyRpaySubMerchantId = function () {
-            $http.post('/sys/partners/' + $scope.partner.client_moniker + '/registRpaySubMerchantId').then(function (resp) {
-                commonDialog.alert({
-                    title: 'Success',
-                    content: 'Modify Rpay+ Sub Merchant ID successfully',
-                    type: 'success'
-                });
-                $state.reload();
-            }, function (resp) {
-                commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
-            });
-
-
-
-
+            $uibModal.open({
+                templateUrl: '/static/payment/partner/templates/apply_rpay_sub_merchant_id',
+                controller: 'applyRpaySubMerchantIdCtrl',
+                resolve: {
+                    subMerchantInfo: function () {
+                        return $scope.partner;
+                    },
+                    merchantIds: ['$http', '$stateParams', function ($http) {
+                        $http.post('/sys/partners/' + $scope.partner.client_moniker + '/registRpaySubMerchantId').then(function (resp) {
+                            commonDialog.alert({
+                                title: 'Success',
+                                content: 'Modify Rpay+ Sub Merchant ID successfully',
+                                type: 'success'
+                            });
+                            $state.reload();
+                        }, function (resp) {
+                            commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
+                        });
+                    }]
+                }
+            }).result.then(function () {
+                $scope.loadSubMerchantInfos();
+            })
         };
         $scope.loadSubMerchantInfos();
     }]);
@@ -3194,6 +3203,56 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             })
         }
     }]);
+
+    app.controller('applyRpaySubMerchantIdCtrl', ['$scope', '$http', '$uibModal', '$state', 'subMerchantInfo', '$filter', 'merchantIds', 'commonDialog', function ($scope, $http, $uibModal, $state, subMerchantInfo, $filter, merchantIds, commonDialog) {
+        $scope.wxIndustries = angular.copy(wxMerchantIndustries);
+        $scope.subMerchantInfo = angular.copy(subMerchantInfo);
+        $scope.merchantIds = merchantIds.data;
+        $scope.subMerchantInfo.industry = $filter('wxindustries')($scope.subMerchantInfo.industry);
+        $scope.saveAppliy = function (form) {
+            $scope.errmsg = null;
+            if (form.$invalid) {
+                angular.forEach(form, function (item, key) {
+                    if (key.indexOf('$') < 0) {
+                        item.$dirty = true;
+                    }
+                });
+                return;
+            }
+            $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/registRpaySubMerchantId', $scope.subMerchantInfo).then(function (resp) {
+                $scope.apply_sub_merchant_id = resp.data;
+                $scope.$close();
+                if (subMerchantInfo.sub_merchant_id != null) {
+                    commonDialog.confirm({title: 'Confirm', content: '已申请成功，是否确认使用'}).then(function () {
+                        $http.put('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/payment_config', {sub_merchant_id: $scope.apply_sub_merchant_id}).then(function (resp) {
+                            commonDialog.alert({
+                                title: 'Success',
+                                content: 'Modify Wechat Sub Merchant ID successfully',
+                                type: 'success'
+                            });
+                            $state.reload();
+                        }, function (resp) {
+                            commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
+                        });
+                    })
+                } else {
+                    $http.put('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/payment_config', {sub_merchant_id: $scope.apply_sub_merchant_id}).then(function (resp) {
+                        commonDialog.alert({
+                            title: 'Success',
+                            content: 'Apply Success And Modify Wechat Sub Merchant ID successfully',
+                            type: 'success'
+                        });
+                        $state.reload();
+                    }, function (resp) {
+                        commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
+                    });
+                }
+            }, function (resp) {
+                $scope.errmsg = resp.data.message;
+            })
+        }
+    }]);
+
     app.controller('permissionClientCtrl', ['$scope', '$http', '$uibModal', '$state', '$filter', 'commonDialog', function ($scope, $http, $uibModal, $state, $filter, commonDialog) {
         $scope.clientPermission = {client_moniker:$scope.partner.client_moniker};
         $scope.loadPermissionList = function () {
diff --git a/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
new file mode 100644
index 000000000..34b94f7d4
--- /dev/null
+++ b/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
@@ -0,0 +1,164 @@
+<div class="content">
+    <form novalidate name="subForm">
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading">Apply Sub Merchant Id</div>
+                    <div class="panel-body">
+                        <div class="form-horizontal">
+                            <div class="form-group"
+                                 ng-class="{'has-error':subForm.merchant_name.$invalid && subForm.merchant_name.$dirty}">
+                                <label class="control-label col-sm-3" for="merchant_name_input">* Merchant Name</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.company_name"
+                                           type="text" name="merchant_name" id="merchant_name_input" required maxlength="50">
+                                    <div ng-messages="subForm.merchant_name.$error" ng-if="subForm.merchant_name.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required Field</p>
+                                        <p class="small text-danger" ng-message="maxlength">Length is more than 50</p>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group"
+                                 ng-class="{'has-error':subForm.merchant_id.$invalid && subForm.merchant_id.$dirty}">
+                                <label class="control-label col-sm-3" for="business_category_input">* Merchant ID</label>
+                                <div class="col-sm-8">
+                                    <select class="form-control" name="merchant_id"
+                                            ng-model="subMerchantInfo.merchant_id"
+                                            id="merchant_id_input" required
+                                            ng-options="merchant_id.merchant_id as merchant_id.merchant_id for merchant_id in merchantIds">
+                                        <option value="">Please Choose</option>
+                                    </select>
+                                    <div ng-messages="subForm.merchant_id.$error" ng-if="subForm.merchant_id.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required Field</p>
+                                    </div>
+                                </div>
+                                <div ng-messages="subForm.business_category.$error" ng-if="subForm.business_category.$dirty">
+                                    <p class="small text-danger" ng-message="maxLength">More than 50</p>
+                                </div>
+                            </div>
+
+                            <div class="form-group"
+                                 ng-class="{'has-error':subForm.merchant_shortname.$invalid && subForm.merchant_shortname.$dirty}">
+                                <label class="control-label col-sm-3" for="merchant_shortname_input">* Merchant Short Name</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.short_name"
+                                           type="text" name="merchant_shortname" id="merchant_shortname_input" required maxlength="50">
+                                    <div ng-messages="subForm.merchant_shortname.$error" ng-if="subForm.merchant_shortname.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required Field</p>
+                                        <p class="small text-danger" ng-message="maxlength">Length is more than 50</p>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group"
+                                 ng-class="{'has-error':subForm.business_category.$invalid && subForm.business_category.$dirty}">
+                                <label class="control-label col-sm-3" for="business_category_input">* Business Category</label>
+                                <div class="col-sm-8">
+                                    <select class="form-control" name="business_category"
+                                            ng-model="subMerchantInfo.industry"
+                                            id="business_category_input" required
+                                            ng-options="industry.value as industry.label for industry in wxIndustries">
+                                        <option value="">Please Choose</option>
+                                    </select>
+                                    <div ng-messages="subForm.business_category.$error" ng-if="subForm.business_category.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required Field</p>
+                                    </div>
+                                </div>
+                                <div ng-messages="subForm.business_category.$error" ng-if="subForm.business_category.$dirty">
+                                    <p class="small text-danger" ng-message="maxLength">More than 50</p>
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label class="control-label col-sm-3" for="website_input">Website</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.company_website"
+                                           type="url" name="website" id="website_input">
+                                </div>
+                            </div>
+                            <div class="alert alert-danger" ng-if="errmsg" ng-bind="errmsg"></div>
+                            <div class="form-group"
+                                 ng-class="{'has-error':subForm.merchant_remark.$invalid && subForm.merchant_remark.$dirty}">
+                                <label class="control-label col-sm-3" for="merchant_remark_input">* Merchant Remark</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.remark"
+                                           type="text" name="merchant_remark" id="merchant_remark_input" maxlength="20" required>
+                                    <div ng-messages="subForm.merchant_remark.$error" ng-if="subForm.merchant_remark.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required Field</p>
+                                        <p class="small text-danger" ng-message="maxlength">Length is more than 20</p>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group"
+                                 ng-class="{'has-error':subForm.merchant_introduction.$invalid && subForm.merchant_introduction.$dirty}">
+                                <label class="control-label col-sm-3" for="merchant_introduction_input">* Merchant Introduction</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.description"
+                                           type="text" name="merchant_introduction" id="merchant_introduction_input" required maxlength="256" MINLENGTH="10">
+                                    <div ng-messages="subForm.merchant_introduction.$error" ng-if="subForm.merchant_introduction.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required Field</p>
+                                        <p class="small text-danger" ng-message="maxlength">Length is more than 256</p>
+                                        <p class="small text-danger" ng-message="minlength">Length is less than 10</p>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group"
+                                 ng-class="{'has-error':subForm.office_phone.$invalid && subForm.office_phone.$dirty}">
+                                <label class="control-label col-sm-3" for="office_phone_input">* Office Phone</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.company_phone"
+                                           type="tel" name="office_phone" id="office_phone_input" required>
+                                    <div ng-messages="subForm.office_phone.$error" ng-if="subForm.office_phone.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required Field</p>
+                                    </div>
+                                </div>
+
+                            </div>
+
+                            <div class="form-group">
+                                <label class="control-label col-sm-3" for="contact_name_input">Contact Name</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.contact_person"
+                                           type="text" name="contact_name" id="contact_name_input">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label class="control-label col-sm-3" for="contact_phone_input">Contact Phone</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.contact_phone"
+                                           type="text" name="contact_phone" id="contact_phone_input">
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <label class="control-label col-sm-3" for="contact_email_input">Contact Email</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.contact_email"
+                                           type="text" name="contact_email" id="contact_email_input">
+                                </div>
+                            </div>
+
+                        </div>
+                    </div>
+                </div>
+                <!--end 商品基本资料-->
+                <!--<div class="panel panel-default">-->
+                <!--<div class="panel-heading">Goods Qr Code</div>-->
+                <!--<div class="panel-body">-->
+
+                <!--</div>-->
+                <!--</div>-->
+                <!--end 商品二维码-->
+                <div class="btn-group margin-bottom margin-top">
+                    <button class="btn btn-success" type="button"
+                            ng-click="saveAppliy(subForm)">Submit
+                    </button>
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
\ No newline at end of file

From 8c5e51982d700b2f10dbbbc6ea80f9a12b7fa417 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 18 Sep 2018 14:33:00 +0800
Subject: [PATCH 002/103] add 10%

---
 .../static/payment/partner/partner-manage.js  |  52 ++----
 .../templates/apply_rpay_sub_merchant_id.html | 169 ++++++++++++++----
 2 files changed, 142 insertions(+), 79 deletions(-)

diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index 8de911884..63b2127d4 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -3130,24 +3130,12 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
         };
         $scope.applyRpaySubMerchantId = function () {
             $uibModal.open({
-                templateUrl: '/static/payment/partner/templates/apply_rpay_sub_merchant_id',
+                templateUrl: '/static/payment/partner/templates/apply_rpay_sub_merchant_id.html',
                 controller: 'applyRpaySubMerchantIdCtrl',
                 resolve: {
                     subMerchantInfo: function () {
                         return $scope.partner;
-                    },
-                    merchantIds: ['$http', '$stateParams', function ($http) {
-                        $http.post('/sys/partners/' + $scope.partner.client_moniker + '/registRpaySubMerchantId').then(function (resp) {
-                            commonDialog.alert({
-                                title: 'Success',
-                                content: 'Modify Rpay+ Sub Merchant ID successfully',
-                                type: 'success'
-                            });
-                            $state.reload();
-                        }, function (resp) {
-                            commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
-                        });
-                    }]
+                    }
                 }
             }).result.then(function () {
                 $scope.loadSubMerchantInfos();
@@ -3199,17 +3187,18 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                     });
                 }
             }, function (resp) {
-                $scope.errmsg = resp.data.message;
+                commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
             })
         }
     }]);
 
-    app.controller('applyRpaySubMerchantIdCtrl', ['$scope', '$http', '$uibModal', '$state', 'subMerchantInfo', '$filter', 'merchantIds', 'commonDialog', function ($scope, $http, $uibModal, $state, subMerchantInfo, $filter, merchantIds, commonDialog) {
+    app.controller('applyRpaySubMerchantIdCtrl', ['$scope', '$http', '$uibModal', '$state', 'subMerchantInfo', 'businessStructuresMap','$filter', 'commonDialog','timezone', function ($scope, $http, $uibModal, $state, subMerchantInfo, businessStructuresMap,$filter, commonDialog,timezone) {
         $scope.wxIndustries = angular.copy(wxMerchantIndustries);
         $scope.subMerchantInfo = angular.copy(subMerchantInfo);
-        $scope.merchantIds = merchantIds.data;
         $scope.subMerchantInfo.industry = $filter('wxindustries')($scope.subMerchantInfo.industry);
-        $scope.saveAppliy = function (form) {
+        $scope.business_structures = businessStructuresMap.configs();
+
+        $scope.saveRpayAppliy = function (form) {
             $scope.errmsg = null;
             if (form.$invalid) {
                 angular.forEach(form, function (item, key) {
@@ -3223,29 +3212,12 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 $scope.apply_sub_merchant_id = resp.data;
                 $scope.$close();
                 if (subMerchantInfo.sub_merchant_id != null) {
-                    commonDialog.confirm({title: 'Confirm', content: '已申请成功，是否确认使用'}).then(function () {
-                        $http.put('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/payment_config', {sub_merchant_id: $scope.apply_sub_merchant_id}).then(function (resp) {
-                            commonDialog.alert({
-                                title: 'Success',
-                                content: 'Modify Wechat Sub Merchant ID successfully',
-                                type: 'success'
-                            });
-                            $state.reload();
-                        }, function (resp) {
-                            commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
-                        });
-                    })
-                } else {
-                    $http.put('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/payment_config', {sub_merchant_id: $scope.apply_sub_merchant_id}).then(function (resp) {
-                        commonDialog.alert({
-                            title: 'Success',
-                            content: 'Apply Success And Modify Wechat Sub Merchant ID successfully',
-                            type: 'success'
-                        });
-                        $state.reload();
-                    }, function (resp) {
-                        commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
+                    commonDialog.alert({
+                        title: 'Success',
+                        content: 'Modify Rpay+ Sub Merchant ID successfully',
+                        type: 'success'
                     });
+                    $state.reload();
                 }
             }, function (resp) {
                 $scope.errmsg = resp.data.message;
diff --git a/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
index 34b94f7d4..84d908278 100644
--- a/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
+++ b/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
@@ -8,7 +8,7 @@
                         <div class="form-horizontal">
                             <div class="form-group"
                                  ng-class="{'has-error':subForm.merchant_name.$invalid && subForm.merchant_name.$dirty}">
-                                <label class="control-label col-sm-3" for="merchant_name_input">* Merchant Name</label>
+                                <label class="control-label col-sm-3" for="merchant_name_input">* Company Name</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.company_name"
                                            type="text" name="merchant_name" id="merchant_name_input" required maxlength="50">
@@ -21,30 +21,24 @@
 
                             <div class="form-group"
                                  ng-class="{'has-error':subForm.merchant_id.$invalid && subForm.merchant_id.$dirty}">
-                                <label class="control-label col-sm-3" for="business_category_input">* Merchant ID</label>
+                                <label class="control-label col-sm-3" for="business_name_input">* Business Name</label>
                                 <div class="col-sm-8">
-                                    <select class="form-control" name="merchant_id"
-                                            ng-model="subMerchantInfo.merchant_id"
-                                            id="merchant_id_input" required
-                                            ng-options="merchant_id.merchant_id as merchant_id.merchant_id for merchant_id in merchantIds">
-                                        <option value="">Please Choose</option>
-                                    </select>
-                                    <div ng-messages="subForm.merchant_id.$error" ng-if="subForm.merchant_id.$dirty">
+                                    <input class="form-control" ng-model="subMerchantInfo.business_name"
+                                           type="text" name="business_name" id="business_name_input" required maxlength="50">
+                                    <div ng-messages="subForm.business_name.$error" ng-if="subForm.business_name.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
+                                        <p class="small text-danger" ng-message="maxlength">Length is more than 50</p>
                                     </div>
-                                </div>
-                                <div ng-messages="subForm.business_category.$error" ng-if="subForm.business_category.$dirty">
-                                    <p class="small text-danger" ng-message="maxLength">More than 50</p>
-                                </div>
+                            </div>
                             </div>
 
                             <div class="form-group"
-                                 ng-class="{'has-error':subForm.merchant_shortname.$invalid && subForm.merchant_shortname.$dirty}">
-                                <label class="control-label col-sm-3" for="merchant_shortname_input">* Merchant Short Name</label>
+                                 ng-class="{'has-error':subForm.company_shortname.$invalid && subForm.company_shortname.$dirty}">
+                                <label class="control-label col-sm-3" for="company_shortname_input">* Company Short Name</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.short_name"
-                                           type="text" name="merchant_shortname" id="merchant_shortname_input" required maxlength="50">
-                                    <div ng-messages="subForm.merchant_shortname.$error" ng-if="subForm.merchant_shortname.$dirty">
+                                           type="text" name="company_shortname" id="company_shortname_input" required maxlength="50">
+                                    <div ng-messages="subForm.company_shortname.$error" ng-if="subForm.company_shortname.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
                                         <p class="small text-danger" ng-message="maxlength">Length is more than 50</p>
                                     </div>
@@ -78,70 +72,167 @@
                                 </div>
                             </div>
                             <div class="alert alert-danger" ng-if="errmsg" ng-bind="errmsg"></div>
+
                             <div class="form-group"
-                                 ng-class="{'has-error':subForm.merchant_remark.$invalid && subForm.merchant_remark.$dirty}">
-                                <label class="control-label col-sm-3" for="merchant_remark_input">* Merchant Remark</label>
+                                 ng-class="{'has-error':subForm.description.$invalid && subForm.description.$dirty}">
+                                <label class="control-label col-sm-3" for="description_input">* Company description</label>
                                 <div class="col-sm-8">
-                                    <input class="form-control" ng-model="subMerchantInfo.remark"
-                                           type="text" name="merchant_remark" id="merchant_remark_input" maxlength="20" required>
-                                    <div ng-messages="subForm.merchant_remark.$error" ng-if="subForm.merchant_remark.$dirty">
+                                    <input class="form-control" ng-model="subMerchantInfo.description"
+                                           type="text" name="description" id="description_input" required maxlength="256" MINLENGTH="10">
+                                    <div ng-messages="subForm.description.$error" ng-if="subForm.description.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
-                                        <p class="small text-danger" ng-message="maxlength">Length is more than 20</p>
+                                        <p class="small text-danger" ng-message="maxlength">Length is more than 256</p>
+                                        <p class="small text-danger" ng-message="minlength">Length is less than 10</p>
                                     </div>
                                 </div>
                             </div>
 
-                            <div class="form-group"
-                                 ng-class="{'has-error':subForm.merchant_introduction.$invalid && subForm.merchant_introduction.$dirty}">
-                                <label class="control-label col-sm-3" for="merchant_introduction_input">* Merchant Introduction</label>
+                            <div class="form-group" ng-class="{'has-error':subForm.abn.$invalid && subForm.abn.$dirty}">
+                                <label class="control-label col-sm-3" for="abn_input">abn</label>
                                 <div class="col-sm-8">
-                                    <input class="form-control" ng-model="subMerchantInfo.description"
-                                           type="text" name="merchant_introduction" id="merchant_introduction_input" required maxlength="256" MINLENGTH="10">
-                                    <div ng-messages="subForm.merchant_introduction.$error" ng-if="subForm.merchant_introduction.$dirty">
+                                    <input class="form-control" ng-model="subMerchantInfo.abn"
+                                           type="text" name="abn" id="abn_input">
+                                    <div ng-messages="subForm.abn.$error" ng-if="subForm.abn.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
-                                        <p class="small text-danger" ng-message="maxlength">Length is more than 256</p>
-                                        <p class="small text-danger" ng-message="minlength">Length is less than 10</p>
+                                        <p class="small text-danger" ng-message="maxlength">Length is more than 10</p>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group" ng-class="{'has-error':subForm.acn.$invalid && subForm.acn.$dirty}">
+                                <label class="control-label col-sm-3" for="acn_input">acn</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.acn"
+                                           type="text" name="acn" id="acn_input">
+                                    <div ng-messages="subForm.acn.$error" ng-if="subForm.acn.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required Field</p>
+                                        <p class="small text-danger" ng-message="maxlength">Length is more than 10</p>
                                     </div>
                                 </div>
                             </div>
 
                             <div class="form-group"
-                                 ng-class="{'has-error':subForm.office_phone.$invalid && subForm.office_phone.$dirty}">
-                                <label class="control-label col-sm-3" for="office_phone_input">* Office Phone</label>
+                                 ng-class="{'has-error':subForm.business_structure.$invalid && subForm.business_structure.$dirty}">
+                                <label class="control-label col-sm-2" for="business-structure-input">Business Structure</label>
+                                <div class="col-sm-8">
+                                    <select class="form-control" name="business_structure"  ng-model="subMerchantInfo.business_structure"
+                                            id="business-structure-input"
+                                            ng-options="structure.value as structure.label for structure in business_structures">
+                                        <option value="">Please Choose</option>
+                                    </select>
+                                </div>
+                            </div>
+
+
+                            <div class="form-group"
+                                 ng-class="{'has-error':subForm.company_phone.$invalid && subForm.company_phone.$dirty}">
+                                <label class="control-label col-sm-3" for="company_phone_input">* Company Phone</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.company_phone"
-                                           type="tel" name="office_phone" id="office_phone_input" required>
-                                    <div ng-messages="subForm.office_phone.$error" ng-if="subForm.office_phone.$dirty">
+                                           type="tel" name="company_phone" id="company_phone_input" required>
+                                    <div ng-messages="subForm.company_phone.$error" ng-if="subForm.company_phone.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
                                     </div>
                                 </div>
 
                             </div>
 
-                            <div class="form-group">
+                            <div class="form-group" ng-class="{'has-error':subForm.contact_name.$invalid && subForm.contact_name.$dirty}">
                                 <label class="control-label col-sm-3" for="contact_name_input">Contact Name</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.contact_person"
                                            type="text" name="contact_name" id="contact_name_input">
+                                    <div ng-messages="subForm.contact_name.$error" ng-if="subForm.contact_name.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required Field</p>
+                                    </div>
                                 </div>
                             </div>
 
-                            <div class="form-group">
+                            <div class="form-group" ng-class="{'has-error':subForm.contact_phone.$invalid && subForm.contact_phone.$dirty}">
                                 <label class="control-label col-sm-3" for="contact_phone_input">Contact Phone</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.contact_phone"
                                            type="text" name="contact_phone" id="contact_phone_input">
+                                    <div ng-messages="subForm.contact_phone.$error" ng-if="subForm.contact_phone.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required Field</p>
+                                    </div>
                                 </div>
                             </div>
 
-                            <div class="form-group">
+                            <div class="form-group" ng-class="{'has-error':subForm.contact_email.$invalid && subForm.contact_email.$dirty}">
                                 <label class="control-label col-sm-3" for="contact_email_input">Contact Email</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.contact_email"
                                            type="text" name="contact_email" id="contact_email_input">
+                                    <div ng-messages="subForm.contact_email.$error" ng-if="subForm.contact_email.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required Field</p>
+                                    </div>
+                                </div>
+                            </div>
+
+                                <div class="form-group" ng-class="{'has-error':subForm.company_country.$invalid && subForm.company_country.$dirty}">
+                                    <label class="control-label col-sm-3" for="company_country_input">Company country</label>
+                                    <div class="col-sm-8">
+                                        <input class="form-control" ng-model="subMerchantInfo.country"
+                                               type="text" name="company_country" id="company_country_input">
+                                        <div ng-messages="subForm.company_country.$error" ng-if="subForm.company_country.$dirty">
+                                            <p class="small text-danger" ng-message="required">Required Field</p>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            <div class="form-group" ng-class="{'has-error':subForm.company_address.$invalid && subForm.company_address.$dirty}">
+                                <label class="control-label col-sm-3" for="company_address_input">Company address</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.address"
+                                           type="text" name="company_address" id="company_address_input">
+                                    <div ng-messages="subForm.company_address.$error" ng-if="subForm.company_address.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required Field</p>
+                                        <p class="small text-danger" ng-message="maxlength">Length is more than 50</p>
+                                    </div>
                                 </div>
                             </div>
 
+                            <div class="form-group" ng-class="{'has-error':subForm.suburb.$invalid && subForm.suburb.$dirty}">
+                                <label class="control-label col-sm-3" for="company_suburb_input">suburb</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.suburb"
+                                           type="text" name="suburb" id="company_suburb_input">
+                                    <div ng-messages="subForm.suburb.$error" ng-if="subForm.suburb.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required Field</p>
+                                        <p class="small text-danger" ng-message="maxlength">Length is more than 10</p>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group" ng-class="{'has-error':subForm.postcode.$invalid && subForm.postcode.$dirty}">
+                                <label class="control-label col-sm-3" for="company_postcode_input">postCode</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.postcode"
+                                           type="text" name="postcode" id="company_postcode_input">
+                                    <div ng-messages="subForm.postcode.$error" ng-if="subForm.postcode.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required Field</p>
+                                        <p class="small text-danger" ng-message="maxlength">Length is more than 10</p>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div class="form-group" ng-class="{'has-error':subForm.state.$invalid && subForm.state.$dirty}">
+                                <label class="control-label col-sm-3" for="state_input">state</label>
+                                <div class="col-sm-8">
+                                    <input class="form-control" ng-model="subMerchantInfo.state"
+                                           type="text" name="state" id="state_input">
+                                    <div ng-messages="subForm.state.$error" ng-if="subForm.state.$dirty">
+                                        <p class="small text-danger" ng-message="required">Required Field</p>
+                                        <p class="small text-danger" ng-message="maxlength">Length is more than 10</p>
+                                    </div>
+                                </div>
+                            </div>
+
+
+
+
+
                         </div>
                     </div>
                 </div>
@@ -155,7 +246,7 @@
                 <!--end 商品二维码-->
                 <div class="btn-group margin-bottom margin-top">
                     <button class="btn btn-success" type="button"
-                            ng-click="saveAppliy(subForm)">Submit
+                            ng-click="saveRpayAppliy(subForm)">Submit
                     </button>
                 </div>
             </div>

From d215a7fa8af86de7b63e381ff09951a66a066401 Mon Sep 17 00:00:00 2001
From: kira <164851225@qq.com>
Date: Tue, 18 Sep 2018 16:10:42 +0800
Subject: [PATCH 003/103] fix

---
 .../static/payment/partner/templates/partner_bankaccounts.html   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
index 49679a2f3..f1e00b160 100644
--- a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
+++ b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
@@ -171,6 +171,7 @@
             <li role="presentation" ng-class="{active:bankCtrl.rate_name=='Bestpay'}"><a role="button" ng-click="bankCtrl.rate_name='Bestpay'">Bestpay</a></li>
             <li role="presentation" ng-class="{active:bankCtrl.rate_name=='jd'}"><a role="button" ng-click="bankCtrl.rate_name='jd'">JDpay</a></li>
             <li role="presentation" ng-class="{active:bankCtrl.rate_name=='hf'}"><a role="button" ng-click="bankCtrl.rate_name='hf'">HFpay</a></li>
+            <li role="presentation" ng-class="{active:bankCtrl.rate_name=='Rpay'}"><a role="button" ng-click="bankCtrl.rate_name='Rpay'">Rpay+</a></li>
         </ul>
         <div class="table-responsive">
             <table class="table table-bordered">

From 8667dbee0ef602fc70b79114638a0268c00841f3 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 18 Sep 2018 16:20:59 +0800
Subject: [PATCH 004/103] fix rpay clearing html

---
 .../partner/templates/partner_new_rate.html   | 24 +++++++++++++++++++
 .../templates/sub_merchant_id_apply.html      |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/main/ui/static/payment/partner/templates/partner_new_rate.html b/src/main/ui/static/payment/partner/templates/partner_new_rate.html
index 02f7c1875..ee45ccec7 100644
--- a/src/main/ui/static/payment/partner/templates/partner_new_rate.html
+++ b/src/main/ui/static/payment/partner/templates/partner_new_rate.html
@@ -160,6 +160,30 @@
                     </div>
                 </div>
 
+                <div class="form-group"
+                     ng-class="{'has-error':rate_form.hf_rate_value.$invalid && rate_form.hf_rate_value.$dirty}">
+                    <label class="control-label col-sm-4" for="Rpay_rate_value_input">Rpay+ Rate Value</label>
+                    <div class="col-sm-6">
+                        <div class="input-group">
+                            <input type="number" name="jd_rate_value" stringToNumber2 class="form-control" ng-model="rate.Rpay_rate_value"
+                                   min="0.6" max="2.2" step="0.1" id="Rpay_rate_value_input" required>
+                            <div class="input-group-addon">%</div>
+                        </div>
+                        <div ng-messages="rate_form.hf_rate_value.$error" ng-if="rate_form.hf_rate_value.$dirty">
+                            <div class="small text-danger" ng-message="max">
+                                <i class="glyphicon glyphicon-alert"></i> No more than 2.2%
+                            </div>
+                            <div class="small text-danger" ng-message="min">
+                                <i class="glyphicon glyphicon-alert"></i> No less than 0.6%
+                            </div>
+                            <div class="small text-danger" ng-message="required">
+                                <i class="glyphicon glyphicon-alert"></i> Required Field
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
+
                 <div class="form-group">
                     <label class="control-label col-sm-4" for="active_time_input">Active Date</label>
                     <div class="col-sm-6">
diff --git a/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html b/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html
index 40fc8c119..95381f8dd 100644
--- a/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html
+++ b/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html
@@ -95,7 +95,7 @@
             <div class="box-solid">
                 <div class="box box-warning">
                     <div class="box-header">
-                        <h3 class="box-title pull-left" ng-if="partner.rpay_enterprise_id">
+                        <h3 class="box-title pull-left" ng-if="partner.enable_rpay">
                             Rpay+ Sub Merchant Id : {{partner.rpay_enterprise_id}}
                             <i class="fa fa-clock-o text-danger" title="Using temp Sub Merchant ID" ng-if="partner.temp_sub_merchant"></i>
                         </h3>

From 6929fa2ebbbe32acecd7615a25fe64c01b34dbc6 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 18 Sep 2018 16:34:03 +0800
Subject: [PATCH 005/103] fix rpay clearing html

---
 .../static/payment/partner/templates/sub_merchant_id_apply.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html b/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html
index 95381f8dd..66ebd8403 100644
--- a/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html
+++ b/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html
@@ -95,7 +95,7 @@
             <div class="box-solid">
                 <div class="box box-warning">
                     <div class="box-header">
-                        <h3 class="box-title pull-left" ng-if="partner.enable_rpay">
+                        <h3 class="box-title pull-left">
                             Rpay+ Sub Merchant Id : {{partner.rpay_enterprise_id}}
                             <i class="fa fa-clock-o text-danger" title="Using temp Sub Merchant ID" ng-if="partner.temp_sub_merchant"></i>
                         </h3>

From 6a368f7b658d4fc9fac2ebdb5d54e4e3d1bc3cf4 Mon Sep 17 00:00:00 2001
From: kira <164851225@qq.com>
Date: Tue, 18 Sep 2018 17:48:59 +0800
Subject: [PATCH 006/103] add customerId

---
 src/main/ui/static/templates/rpay/v1/payment.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/ui/static/templates/rpay/v1/payment.js b/src/main/ui/static/templates/rpay/v1/payment.js
index 74397a9c1..dfc96b138 100644
--- a/src/main/ui/static/templates/rpay/v1/payment.js
+++ b/src/main/ui/static/templates/rpay/v1/payment.js
@@ -255,6 +255,7 @@ $(function () {
         }
         data.coupons = dataCache.coupons;
         data.qrcodeVersion = window.qrcodeVersion;
+        data.customerId = window.customerId;
 
         dataCache.remark = '';
 
@@ -424,7 +425,7 @@ $(function () {
 
     function getUserId(){
         window.RPayPlus.send("getUserId", null, function(data){
-            window.Rpay.userInfo = data;
+            window.customerId = data;
         });
     }
 

From 48247667efbe4a081acf0bdf625fddcfb5a20107 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 18 Sep 2018 18:15:52 +0800
Subject: [PATCH 007/103] add 40%

---
 .../manage/mappers/system/ClientMapper.java   |  3 ++
 .../manage/merchants/core/ClientManager.java  |  2 +-
 .../core/impls/ClientManagerImpl.java         |  5 +-
 .../static/payment/partner/partner-manage.js  | 46 ++++++++++++-------
 .../templates/apply_rpay_sub_merchant_id.html | 37 ++++++---------
 5 files changed, 49 insertions(+), 44 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
index da095448a..f42b842c5 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
@@ -99,4 +99,7 @@ public interface ClientMapper {
 
     List<JSONObject> findByhfPayUrlNotNull();
 
+    @AutoSql(type = SqlType.UPDATE)
+    void updateRpayEnterpriseId(@Param("client_id") int clientId, @Param("rpay_enterprise_id") String rpayEnterpriseId);
+
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
index 0604c11e3..925136d37 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
@@ -336,6 +336,6 @@ public interface ClientManager {
 
     void updateAllPartnerPassword(String clientMoniker, List<String> emails);
 
-    String subRpayMerchantApplication(String clientMoniker, JSONObject manager);
+    void subRpayMerchantApplication(String clientMoniker, JSONObject manager);
 
 }
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 870653d59..f7374de7b 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
@@ -3575,7 +3575,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     }
 
     @Override
-    public String subRpayMerchantApplication(String clientMoniker, JSONObject manager) {
+    public void subRpayMerchantApplication(String clientMoniker, JSONObject manager) {
         JSONObject client = getClientInfoByMoniker(clientMoniker);
         if (client == null) {
             throw new InvalidShortIdException();
@@ -3602,11 +3602,10 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             merchantApply.put("business_category", client.getString("royalpayindustry"));
             merchantApply.put("merchant_shortname", client.getString("short_name"));
             sysRpayMerchantApplyMapper.insertRpayMerchantApply(merchantApply);
+            clientMapper.updateRpayEnterpriseId(client.getIntValue("client_id"), rpayMerchantInfo.getString("merchantId"));
         }else {
             throw new BadRequestException("请求失败");
         }
-
-        return null;
     }
 
     @Override
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index 63b2127d4..8a65a6128 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -3193,13 +3193,14 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
     }]);
 
     app.controller('applyRpaySubMerchantIdCtrl', ['$scope', '$http', '$uibModal', '$state', 'subMerchantInfo', 'businessStructuresMap','$filter', 'commonDialog','timezone', function ($scope, $http, $uibModal, $state, subMerchantInfo, businessStructuresMap,$filter, commonDialog,timezone) {
-        $scope.wxIndustries = angular.copy(wxMerchantIndustries);
         $scope.subMerchantInfo = angular.copy(subMerchantInfo);
-        $scope.subMerchantInfo.industry = $filter('wxindustries')($scope.subMerchantInfo.industry);
         $scope.business_structures = businessStructuresMap.configs();
+        $scope.timezone = timezone.configs();
+
 
         $scope.saveRpayAppliy = function (form) {
-            $scope.errmsg = null;
+            $scope.merchantInfo = angular.copy(form);
+                $scope.errmsg = null;
             if (form.$invalid) {
                 angular.forEach(form, function (item, key) {
                     if (key.indexOf('$') < 0) {
@@ -3208,20 +3209,31 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 });
                 return;
             }
-            $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/registRpaySubMerchantId', $scope.subMerchantInfo).then(function (resp) {
-                $scope.apply_sub_merchant_id = resp.data;
-                $scope.$close();
-                if (subMerchantInfo.sub_merchant_id != null) {
-                    commonDialog.alert({
-                        title: 'Success',
-                        content: 'Modify Rpay+ Sub Merchant ID successfully',
-                        type: 'success'
-                    });
-                    $state.reload();
-                }
-            }, function (resp) {
-                $scope.errmsg = resp.data.message;
-            })
+
+             angular.forEach(form, function (item, key) {
+                 if(item !=null) {
+                     console.log("++++" + key + item.$name)
+
+                 }
+             });
+
+            // var str = angular.toJson(form, true);
+            // console.log("----------" + str);
+
+            // $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/registRpaySubMerchantId', $scope.merchantInfo).then(function (resp) {
+            //     $scope.apply_sub_merchant_id = resp.data;
+            //     $scope.$close();
+            //     if (subMerchantInfo.sub_merchant_id != null) {
+            //         commonDialog.alert({
+            //             title: 'Success',
+            //             content: 'Modify Rpay+ Sub Merchant ID successfully',
+            //             type: 'success'
+            //         });
+            //         $state.reload();
+            //     }
+            // }, function (resp) {
+            //     $scope.errmsg = resp.data.message;
+            // })
         }
     }]);
 
diff --git a/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
index 84d908278..d13ba4af6 100644
--- a/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
+++ b/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
@@ -8,6 +8,7 @@
                         <div class="form-horizontal">
                             <div class="form-group"
                                  ng-class="{'has-error':subForm.merchant_name.$invalid && subForm.merchant_name.$dirty}">
+                                <div class="alert alert-danger" ng-if="errmsg" ng-bind="errmsg"></div>
                                 <label class="control-label col-sm-3" for="merchant_name_input">* Company Name</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.company_name"
@@ -45,34 +46,13 @@
                                 </div>
                             </div>
 
-                            <div class="form-group"
-                                 ng-class="{'has-error':subForm.business_category.$invalid && subForm.business_category.$dirty}">
-                                <label class="control-label col-sm-3" for="business_category_input">* Business Category</label>
-                                <div class="col-sm-8">
-                                    <select class="form-control" name="business_category"
-                                            ng-model="subMerchantInfo.industry"
-                                            id="business_category_input" required
-                                            ng-options="industry.value as industry.label for industry in wxIndustries">
-                                        <option value="">Please Choose</option>
-                                    </select>
-                                    <div ng-messages="subForm.business_category.$error" ng-if="subForm.business_category.$dirty">
-                                        <p class="small text-danger" ng-message="required">Required Field</p>
-                                    </div>
-                                </div>
-                                <div ng-messages="subForm.business_category.$error" ng-if="subForm.business_category.$dirty">
-                                    <p class="small text-danger" ng-message="maxLength">More than 50</p>
-                                </div>
-                            </div>
-
                             <div class="form-group">
                                 <label class="control-label col-sm-3" for="website_input">Website</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.company_website"
-                                           type="url" name="website" id="website_input">
+                                           type="text" name="website" id="website_input">
                                 </div>
                             </div>
-                            <div class="alert alert-danger" ng-if="errmsg" ng-bind="errmsg"></div>
-
                             <div class="form-group"
                                  ng-class="{'has-error':subForm.description.$invalid && subForm.description.$dirty}">
                                 <label class="control-label col-sm-3" for="description_input">* Company description</label>
@@ -113,7 +93,7 @@
 
                             <div class="form-group"
                                  ng-class="{'has-error':subForm.business_structure.$invalid && subForm.business_structure.$dirty}">
-                                <label class="control-label col-sm-2" for="business-structure-input">Business Structure</label>
+                                <label class="control-label col-sm-3" for="business-structure-input">Business Structure</label>
                                 <div class="col-sm-8">
                                     <select class="form-control" name="business_structure"  ng-model="subMerchantInfo.business_structure"
                                             id="business-structure-input"
@@ -229,6 +209,17 @@
                                 </div>
                             </div>
 
+                            <div class="form-group">
+                                <label class="control-label col-sm-3" for="timezone-input">TimeZone</label>
+                                <div class="col-sm-8">
+                                    <select class="form-control" name="timezone"  ng-model="subMerchantInfo.timezone"
+                                            id="timezone-input"
+                                            ng-options="structure.value as structure.label for structure in timezone">
+                                        <option value="">Please Choose</option>
+                                    </select>
+                                </div>
+                            </div>
+
 
 
 

From de55f0b10c85d3debc883d280f201900a12b6d72 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 18 Sep 2018 18:31:43 +0800
Subject: [PATCH 008/103] fix merchant

---
 .../payment/manage/mappers/system/ClientMapper.java      | 3 +++
 .../mappers/system/SysRpayMerchantApplyMapper.java       | 2 +-
 .../payment/manage/merchants/core/ClientManager.java     | 2 +-
 .../manage/merchants/core/impls/ClientManagerImpl.java   | 9 ++++-----
 .../manage/merchants/web/PartnerManageController.java    | 4 ++--
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
index da095448a..f42b842c5 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
@@ -99,4 +99,7 @@ public interface ClientMapper {
 
     List<JSONObject> findByhfPayUrlNotNull();
 
+    @AutoSql(type = SqlType.UPDATE)
+    void updateRpayEnterpriseId(@Param("client_id") int clientId, @Param("rpay_enterprise_id") String rpayEnterpriseId);
+
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java
index 9aa1cdbff..06664dc14 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java
@@ -21,6 +21,6 @@ public interface SysRpayMerchantApplyMapper {
     void insertRpayMerchantApply(JSONObject params);
 
     @AutoSql(type = SqlType.SELECT)
-    List<JSONObject> selectByShortName(@Param("client_id") int client_id,@Param("merchant_shortname") String shortName);
+    List<JSONObject> listByShortName(@Param("client_id") int client_id,@Param("merchant_shortname") String shortName);
 
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
index 7808c732b..3e03074d9 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
@@ -336,7 +336,7 @@ public interface ClientManager {
 
     void sendHfEmailNotice(JSONObject order);
 
-    String subRpayMerchantApplication(String clientMoniker, JSONObject manager);
+    void subRpayMerchantApplication(String clientMoniker, JSONObject manager);
 
     void updateAllPartnerPassword(String clientMoniker, List<String> emails);
 }
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 9636537e8..01d570fc5 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
@@ -3598,16 +3598,16 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     }
 
     @Override
-    public String subRpayMerchantApplication(String clientMoniker, JSONObject manager) {
+    public void subRpayMerchantApplication(String clientMoniker, JSONObject manager) {
         JSONObject client = getClientInfoByMoniker(clientMoniker);
         if (client == null) {
             throw new InvalidShortIdException();
         }
         checkOrgPermission(manager, client);
 
-        List<JSONObject> selectByshortName = sysRpayMerchantApplyMapper.selectByShortName(client.getIntValue("client_id"),client.getString("short_name"));
+        List<JSONObject> listByshortName = sysRpayMerchantApplyMapper.listByShortName(client.getIntValue("client_id"),client.getString("short_name"));
 
-        if (selectByshortName.size()>0) {
+        if (listByshortName.size()>0) {
             throw new BadRequestException("请修改【" + clientMoniker + "】的Company shortName信息（请避免和Rpay+商务号列表内的Company Short Name重复）");
         }
 
@@ -3625,11 +3625,10 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             merchantApply.put("business_category", client.getString("royalpayindustry"));
             merchantApply.put("merchant_shortname", client.getString("short_name"));
             sysRpayMerchantApplyMapper.insertRpayMerchantApply(merchantApply);
+            clientMapper.updateRpayEnterpriseId(client.getIntValue("client_id"), rpayMerchantInfo.getString("merchantId"));
         }else {
             throw new BadRequestException("请求失败");
         }
-
-        return null;
     }
 
     @Override
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
index 768b1ebcb..6d186abbe 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
@@ -582,8 +582,8 @@ public class PartnerManageController {
         clientManager.switchPermission(manager, clientMoniker, "enable_hf_email_notice", pass.getBooleanValue("allow"));
     }
     @ManagerMapping(value = "/{clientMoniker}/registRpaySubMerchantId", method = RequestMethod.POST, role = {ManagerRole.OPERATOR, ManagerRole.ADMIN})
-    public String subRpayMerchantApplication(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
-        return clientManager.subRpayMerchantApplication(clientMoniker, manager);
+    public void subRpayMerchantApplication(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
+        clientManager.subRpayMerchantApplication(clientMoniker, manager);
     }
 
 }

From 0b70366c7ef1964cef3e90cf28ce67fcf175d17d Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Tue, 18 Sep 2018 18:44:46 +0800
Subject: [PATCH 009/103] =?UTF-8?q?=E6=B7=BB=E5=8A=A0app=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../support/cms/core/AppStyleService.java     |  15 ++
 .../cms/core/Impl/AppStyleServiceImpl.java    | 101 ++++++++
 .../support/cms/web/AppStyleController.java   |  42 ++++
 src/main/ui/static/cms/cms.js                 | 233 +++++++++++++++++-
 .../ui/static/cms/templates/app_style.html    |  65 +++++
 .../cms/templates/app_style_config.html       |  67 +++++
 .../cms/templates/app_style_preview.html      |  46 ++++
 .../ui/static/cms/templates/cms_root.html     |   3 +
 .../risk/templates/attention_merchants.html   |   2 +-
 9 files changed, 572 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/au/com/royalpay/payment/manage/support/cms/core/AppStyleService.java
 create mode 100644 src/main/java/au/com/royalpay/payment/manage/support/cms/core/Impl/AppStyleServiceImpl.java
 create mode 100644 src/main/java/au/com/royalpay/payment/manage/support/cms/web/AppStyleController.java
 create mode 100644 src/main/ui/static/cms/templates/app_style.html
 create mode 100644 src/main/ui/static/cms/templates/app_style_config.html
 create mode 100644 src/main/ui/static/cms/templates/app_style_preview.html

diff --git a/src/main/java/au/com/royalpay/payment/manage/support/cms/core/AppStyleService.java b/src/main/java/au/com/royalpay/payment/manage/support/cms/core/AppStyleService.java
new file mode 100644
index 000000000..3b83a79f5
--- /dev/null
+++ b/src/main/java/au/com/royalpay/payment/manage/support/cms/core/AppStyleService.java
@@ -0,0 +1,15 @@
+package au.com.royalpay.payment.manage.support.cms.core;
+
+import com.alibaba.fastjson.JSONObject;
+
+public interface AppStyleService {
+    JSONObject listAppStyleGroup(int page, int limit);
+
+    JSONObject getAppStyleByStyleId(String style_id);
+
+    void switchGroupByStyleId(String style_id);
+
+    void addAppStyle(String style_id, JSONObject appStyleGroup);
+
+    void updateAppStyleByStyleId(String style_id, String originStyleId, JSONObject appStyleGroup);
+}
diff --git a/src/main/java/au/com/royalpay/payment/manage/support/cms/core/Impl/AppStyleServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/support/cms/core/Impl/AppStyleServiceImpl.java
new file mode 100644
index 000000000..60aa24644
--- /dev/null
+++ b/src/main/java/au/com/royalpay/payment/manage/support/cms/core/Impl/AppStyleServiceImpl.java
@@ -0,0 +1,101 @@
+package au.com.royalpay.payment.manage.support.cms.core.Impl;
+
+import au.com.royalpay.payment.manage.support.cms.core.AppStyleService;
+import au.com.royalpay.payment.tools.exceptions.ServerErrorException;
+import cn.yixblog.platform.http.HttpRequestGenerator;
+import cn.yixblog.platform.http.HttpRequestResult;
+import com.alibaba.fastjson.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+
+@Service
+public class AppStyleServiceImpl implements AppStyleService {
+
+    @Value("http://127.0.0.1:9533")
+    private String cmsHost;
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Override
+    public JSONObject listAppStyleGroup(int page, int limit) {
+        String url = concatUrl("/app/style_group");
+        HttpRequestGenerator gen = new HttpRequestGenerator(url, RequestMethod.GET).addQueryString("page", page + "").addQueryString("limit", limit + "");
+        try {
+            HttpRequestResult res = gen.execute();
+            if (res.isSuccess()) {
+                return res.getResponseContentJSONObj();
+            }
+        } catch (URISyntaxException | IOException e) {
+            logger.error(e.getMessage(), e);
+        }
+        throw new ServerErrorException("Failed to request CMS");
+    }
+
+    @Override
+    public JSONObject getAppStyleByStyleId(String style_id) {
+        String url = concatUrl("/app/style_group/" + style_id);
+        HttpRequestGenerator gen = new HttpRequestGenerator(url, RequestMethod.GET);
+        try {
+            HttpRequestResult res = gen.execute();
+            if (res.isSuccess()) {
+                return res.getResponseContentJSONObj();
+            }
+        } catch (URISyntaxException | IOException e) {
+            logger.error(e.getMessage(), e);
+        }
+        throw new ServerErrorException("Failed to request CMS");
+    }
+
+    @Override
+    public void switchGroupByStyleId(String style_id) {
+        String url = concatUrl("/app/style_group/" + style_id);
+        try {
+            HttpRequestResult res = new HttpRequestGenerator(url, RequestMethod.PUT).execute();
+            if (res.isSuccess()) {
+                return;
+            }
+        } catch (URISyntaxException e) {
+            logger.error(e.getMessage(), e);
+        }
+        throw new ServerErrorException("Failed to request CMS");
+    }
+
+    @Override
+    public void addAppStyle(String style_id, JSONObject appStyleGroup) {
+        String url = concatUrl("/app/style_group");
+        try {
+            HttpRequestResult gen = new HttpRequestGenerator(url, RequestMethod.POST).addQueryString("style_id", style_id).setJSONEntity(appStyleGroup).execute();
+            if (gen.isSuccess()) {
+                return;
+            }
+        } catch (URISyntaxException e) {
+            logger.error(e.getMessage(), e);
+        }
+        throw new ServerErrorException("Failed to request CMS");
+    }
+
+    @Override
+    public void updateAppStyleByStyleId(String style_id, String originStyleId, JSONObject appStyleGroup) {
+        String url = concatUrl("/app/style_group/" + style_id + "/style");
+        try {
+            HttpRequestResult gen = new HttpRequestGenerator(url, RequestMethod.PUT).addQueryString("originStyleId", originStyleId).setJSONEntity(appStyleGroup).execute();
+            if (gen.isSuccess()) {
+                return;
+            }
+        } catch (URISyntaxException e) {
+            logger.error(e.getMessage(), e);
+        }
+        throw new ServerErrorException("Failed to request CMS");
+    }
+
+    private String concatUrl(String uri) {
+        String host = cmsHost.endsWith("/") ? cmsHost.substring(0, cmsHost.length() - 1) : cmsHost;
+        uri = uri.startsWith("/") ? uri.substring(1) : uri;
+        return host + "/" + uri;
+    }
+}
diff --git a/src/main/java/au/com/royalpay/payment/manage/support/cms/web/AppStyleController.java b/src/main/java/au/com/royalpay/payment/manage/support/cms/web/AppStyleController.java
new file mode 100644
index 000000000..2ea0a87e0
--- /dev/null
+++ b/src/main/java/au/com/royalpay/payment/manage/support/cms/web/AppStyleController.java
@@ -0,0 +1,42 @@
+package au.com.royalpay.payment.manage.support.cms.web;
+
+
+import au.com.royalpay.payment.manage.permission.manager.ManagerMapping;
+import au.com.royalpay.payment.manage.support.cms.core.AppStyleService;
+import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@RestController
+@ManagerMapping(value = "/app/cms/app_style", role = {ManagerRole.SITE_MANAGER})
+public class AppStyleController {
+    @Resource
+    private AppStyleService appStyleService;
+
+    @RequestMapping(value = "/style_group", method = RequestMethod.GET)
+    public JSONObject listAppStyleGroup(@RequestParam(defaultValue = "1") int page, @RequestParam(defaultValue = "10") int limit) {
+        return appStyleService.listAppStyleGroup(page, limit);
+    }
+
+    @RequestMapping(value = "/style_group/{style_id}", method = RequestMethod.GET)
+    public JSONObject getAppStyleByStyleId(@PathVariable String style_id) {
+        return appStyleService.getAppStyleByStyleId(style_id);
+    }
+
+    @RequestMapping(value = "/style_group/{style_id}", method = RequestMethod.PUT)
+    public void switchGroupByStyleId(@PathVariable String style_id) {
+        appStyleService.switchGroupByStyleId(style_id);
+    }
+
+    @RequestMapping(value = "/style_group", method = RequestMethod.POST)
+    public void addOneGroupAppStyle(@RequestParam String style_id, @RequestBody JSONObject appStyleGroup) {
+        appStyleService.addAppStyle(style_id, appStyleGroup);
+    }
+
+    @RequestMapping(value = "/style_group/{style_id}/style", method = RequestMethod.PUT)
+    public void updateAppStyleByStyleId(@PathVariable String style_id,@RequestParam String originStyleId, @RequestBody JSONObject appStyleGroup) {
+        appStyleService.updateAppStyleByStyleId(style_id, originStyleId, appStyleGroup);
+    }
+}
diff --git a/src/main/ui/static/cms/cms.js b/src/main/ui/static/cms/cms.js
index 3ab730034..156cda39b 100644
--- a/src/main/ui/static/cms/cms.js
+++ b/src/main/ui/static/cms/cms.js
@@ -4,6 +4,67 @@
 define(['angular', 'uiRouter', 'static/commons/angular-ueditor'], function (angular) {
     'use strict';
     var app = angular.module('cms', ['ui.router','ng.uditor']);
+    var style = [
+        {
+            "style_key":"settlement",
+            "style_value":""
+        },
+        {
+            "style_key":"home_select",
+            "style_value":""
+        },
+        {
+            "style_key":"activity_gray",
+            "style_value":""
+        },
+        {
+            "style_key":"activity_select",
+            "style_value":""
+        },
+        {
+            "style_key":"mess_gray",
+            "style_value":""
+        },
+        {
+            "style_key":"mess_select",
+            "style_value":""
+        },
+        {
+            "style_key":"my_select",
+            "style_value":""
+        },
+        {
+            "style_key":"transaction",
+            "style_value":""
+        },
+        {
+            "style_key":"statistics",
+            "style_value":""
+        },
+        {
+            "style_key":"marketing_account",
+            "style_value":""
+        },
+        {
+            "style_key":"usergroup",
+            "style_value":""
+        },
+        {
+            "style_key":"coupon",
+            "style_value":""
+        },
+        {
+            "style_key":"rpbill",
+            "style_value":""
+        },
+        {
+            "style_key":"invoice_assistant",
+            "style_value":""
+        },
+        {
+            "style_key":"home_gray",
+            "style_value":""
+        }];
     app.config(['$stateProvider', function ($stateProvider) {
         $stateProvider.state('cms', {
             url: '/cms',
@@ -38,7 +99,41 @@ define(['angular', 'uiRouter', 'static/commons/angular-ueditor'], function (angu
         }).state('cms.phone_top_up', {
             url: '/phone_top_up',
             controller: 'CmsPhonetopupCtrl',
-            templateUrl: '/static/cms/templates/phone_top_up.html'
+            templateUrl: '/static/cms/templates/phone_top_up.html',
+        }).state('cms.app_style',{
+            url: '/app_style',
+            controller: 'cmsAppStyleListCtrl',
+            templateUrl: '/static/cms/templates/app_style.html',
+        }).state('cms.app_style.app_style_preview',{
+            url: '/{style_id}/preview',
+            controller: 'cmsAppStylePreviewCtrl',
+            templateUrl: '/static/cms/templates/app_style_preview.html',
+            resolve: {
+                appStyles: ['$http', '$stateParams', function ($http, $stateParams) {
+                    return $http.get('/app/cms/app_style/style_group/' + $stateParams.style_id);
+                }]
+            }
+        }).state('cms.app_style.app_style_save',{
+            url: '/save',
+            controller: 'cmsAppStyleSaveCtrl',
+            templateUrl: '/static/cms/templates/app_style_config.html',
+            resolve: {
+                style: function () {
+                    return angular.copy(style);
+                }
+            }
+        }).state('cms.app_style.app_style_edit',{
+            url: '/{style_id}/edit',
+            controller: 'cmsAppStyleEditCtrl',
+            templateUrl: '/static/cms/templates/app_style_config.html',
+            resolve: {
+                appStyles: ['$http', '$stateParams', function ($http, $stateParams) {
+                    return $http.get('/app/cms/app_style/style_group/' + $stateParams.style_id);
+                }],
+                style: function () {
+                    return angular.copy(style);
+                }
+            }
         })
     }]);
     app.controller('cmsRootCtrl', ['$scope', function ($scope) {
@@ -140,6 +235,142 @@ define(['angular', 'uiRouter', 'static/commons/angular-ueditor'], function (angu
         $scope.article = article.data;
     }]);
 
+    app.controller('cmsAppStyleListCtrl', ['$scope', '$http', '$uibModal', function ($scope, $http, $uibModal) {
+        $scope.pagination = {};
+        $scope.appStyleGroupList = function (page) {
+            var params = $scope.queryParams || {};
+            params.page = page || $scope.pagination.page || 1;
+            $http.get('/app/cms/app_style/style_group', {params: params}).then(function (resp) {
+                $scope.appStyleGroups = resp.data.data;
+                $scope.pagination = resp.data.pagination;
+            })
+        };
+        $scope.appStyleGroupList(1);
+    }]);
+
+    app.controller('cmsAppStylePreviewCtrl', ['$scope', '$http', 'appStyles', function ($scope, $http, appStyles) {
+        $scope.appStyles = appStyles.data.data;
+    }]);
+
+    app.controller('cmsAppStyleEditCtrl', ['$scope', '$http', '$state','commonDialog', 'appStyles', 'style', function ($scope, $http, $state, commonDialog, appStyles, style) {
+        $scope.ctrl = {sending: false, flag: false, originStyleId: angular.copy(appStyles.data.data[0].style_id)};
+        $scope.entity={};
+        $scope.style = angular.copy(style);
+        $scope.entity.appStyle = angular.copy(appStyles.data.data);
+        $scope.params = {style_id: angular.copy(appStyles.data.data[0].style_id)};
+        $scope.appStyleList = function() {
+            var styleKeyStr = "";
+            $scope.entity.appStyle.forEach(function(item){
+                styleKeyStr += item.style_key + ",";
+            });
+            $scope.style.forEach(function(item){
+                if (styleKeyStr.indexOf(item.style_key) < 0) {
+                    $scope.entity.appStyle.push({"style_key": item.style_key,"style_value":""});
+                }
+            })
+        };
+        $scope.appStyleList();
+        $scope.addSpecOption = function() {
+            $scope.entity.appStyle.push({});
+
+        };
+
+        // 删除规格选项
+        $scope.delSpecOption = function(index) {
+            $scope.entity.appStyle.splice(index, 1);
+
+        };
+
+        $scope.saveOneGroupAppStyle = function() {
+            if ($scope.params.style_id == "" || $scope.params.style_id == null) {
+                $scope.errmsg = "title不能为空";
+                return;
+            }
+            var item = "";
+            for (var i=0;i<$scope.entity.appStyle.length;i++) {
+                item = $scope.entity.appStyle[i];
+                if (item.style_value == "" || item.style_value == null) {
+                    $scope.errmsg = "value不能为空";
+                    return;
+                }
+                if (item.style_value.substr(0,4).toLowerCase() != "http" &&
+                    item.style_value.substr(0,5).toLowerCase() != "https") {
+                    $scope.errmsg = "value必须以http或者https开头";
+                    return;
+                }
+
+            }
+            $scope.ctrl.sending = true;
+            $http.put('/app/cms/app_style/style_group/' + $scope.params.style_id + '/style?originStyleId=' + $scope.ctrl.originStyleId, $scope.entity).then(function(){
+                $scope.ctrl.sending = false;
+                $state.go('cms.app_style.app_style_preview',{style_id: $scope.params.style_id});
+            }, function (resp) {
+                $scope.ctrl.sending = false;
+                $scope.errmsg = resp.data.message;
+            })
+        }
+        $scope.toggleAppStyleIsValid = function(styleId) {
+            if (styleId) {
+                commonDialog.confirm({
+                    title: '确认操作',
+                    content: '当前操作将发布title为：' +styleId +"的app图标，是否确认？"
+                }).then(function () {
+                    $http.put('/app/cms/app_style/style_group/' + styleId).then(function () {
+                        $state.reload();
+                    })
+                })
+            }
+        }
+    }]);
+    app.controller('cmsAppStyleSaveCtrl', ['$scope', '$http', '$state', 'style', function ($scope, $http, $state, style) {
+        $scope.ctrl = {sending: false, flag: true};
+        $scope.entity={};
+        $scope.entity.appStyle = angular.copy(style);
+        $scope.params = {style_id: ""};
+        $scope.addSpecOption = function() {
+            $scope.entity.appStyle.push({});
+
+        };
+
+        // 删除规格选项
+        $scope.delSpecOption = function(index) {
+            console.log(index)
+            $scope.entity.appStyle.splice(index, 1);
+
+        };
+
+        $scope.saveOneGroupAppStyle = function() {
+            if ($scope.params.style_id == "" || $scope.params.style_id == null) {
+                $scope.errmsg = "title不能为空";
+                return;
+            }
+            var item = "";
+            for (var i=0;i<$scope.entity.appStyle.length;i++) {
+                item = $scope.entity.appStyle[i];
+                if (item.style_value == "" || item.style_value == null) {
+                    $scope.errmsg = "value不能为空";
+                    return;
+                }
+                if (item.style_value.substr(0,4).toLowerCase() != "http" &&
+                    item.style_value.substr(0,5).toLowerCase() != "https") {
+                    $scope.errmsg = "value必须以http或者https开头";
+                    return;
+                }
+
+            }
+            $scope.ctrl.sending = true;
+            $http.post('/app/cms/app_style/style_group?style_id=' + $scope.params.style_id, $scope.entity).then(function(){
+                $scope.ctrl.sending = false;
+                $state.go('cms.app_style.app_style_preview', {style_id: $scope.params.style_id});
+            }, function (resp) {
+                $scope.ctrl.sending = false;
+                $scope.errmsg = resp.data.message;
+            })
+        };
+        $scope.checkStyleValue = function () {
+
+        }
+    }]);
     app.filter('topUpType', function () {
         return function (status) {
             switch (status + '') {
diff --git a/src/main/ui/static/cms/templates/app_style.html b/src/main/ui/static/cms/templates/app_style.html
new file mode 100644
index 000000000..613b0f19d
--- /dev/null
+++ b/src/main/ui/static/cms/templates/app_style.html
@@ -0,0 +1,65 @@
+<div ui-view>
+    <section class="content-header">
+        <h1>APP_STYLE</h1>
+        <ol class="breadcrumb">
+            <li><a ui-sref="cms">网站管理</a></li>
+            <li>app图标</li>
+        </ol>
+    </section>
+    <section class="content" >
+        <div class="box box-warning">
+            <div class="box-body">
+                <div class="form-inline">
+                    <div class="form-group">
+                        <a class="btn btn-success" ui-sref=".app_style_save">
+                            <i class="fa fa-plus"></i> New App Style
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="box box-default">
+            <div class="box-body table-responsive">
+                <table class="table table-bordered table-hover table-striped">
+                    <thead>
+                    <tr>
+                        <th>Title</th>
+                        <th>Published</th>
+                        <th>Operation</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr ng-repeat="appStyleGroup in appStyleGroups" class="ng-scope">
+                        <td><a role="button" ui-sref=".app_style_preview({style_id:appStyleGroup.style_id})" ng-bind="appStyleGroup.style_id"></a></td>
+                        <td>
+                            <a title="Toggle publish status">
+                                <i class="fa" ng-class="{'fa-check text-success':appStyleGroup.is_valid,'fa-remove text-danger':!appStyleGroup.is_valid}"></i>
+                            </a>
+                        </td>
+                        <td>
+                            <a role="button" ui-sref=".app_style_edit({style_id:appStyleGroup.style_id})" title="edit"><i class="fa fa-edit"></i></a>
+                            <a role="button" ui-sref=".app_style_preview({style_id:appStyleGroup.style_id})" title="preview"><i class="fa fa-eye"></i></a>
+                        </td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+            <div class="box-footer">
+                <uib-pagination class="pagination"
+                                total-items="pagination.totalCount"
+                                boundary-links="true"
+                                ng-model="pagination.page"
+                                items-per-page="pagination.limit"
+                                max-size="10"
+                                ng-change="appStyleGroupList()"
+                                previous-text="&lsaquo;"
+                                next-text="&rsaquo;"
+                                first-text="&laquo;"
+                                last-text="&raquo;"></uib-pagination>
+                <div class="row">
+                    <div class="col-xs-12">Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}</div>
+                </div>
+            </div>
+        </div>
+    </section>
+</div>
\ No newline at end of file
diff --git a/src/main/ui/static/cms/templates/app_style_config.html b/src/main/ui/static/cms/templates/app_style_config.html
new file mode 100644
index 000000000..694d761c9
--- /dev/null
+++ b/src/main/ui/static/cms/templates/app_style_config.html
@@ -0,0 +1,67 @@
+<div ui-view xmlns="http://www.w3.org/1999/html">
+    <section class="content-header">
+        <h1>APP_STYLE</h1>
+        <ol class="breadcrumb">
+            <li><a ui-sref="cms">网站管理</a></li>
+            <li><a ui-sref="cms.app_style">app图标</a></li>
+            <li class="active"  ng-bind="!ctrl.flag?'Edit Article':'New Article'"></li>
+        </ol>
+    </section>
+    <section class="content" >
+        <div class="box box-warning">
+            <div class="box-body">
+                <div class="form-inline">
+                    <div class="form-group">
+                        <div class="form-group">
+                            <label class="control-label" for="short-name-search">title</label>
+                            <input type="text" class="form-control" id="short-name-search" name="style_id"
+                                   ng-model="params.style_id" required>
+                            <div class="checkbox-inline">
+                                <label><input role="button" type="radio" ng-value="true" ng-model="entity.appStyle[0].is_valid" ng-change="toggleAppStyleIsValid(params.style_id)"> Published</label>
+                            </div>
+                        </div>
+                        <!--<div class="form-group">-->
+                            <!--<button class="btn btn-success" type="button" ng-click="addSpecOption()">-->
+                                <!--<i class="fa fa-plus"></i> New App Style-->
+                            <!--</button>-->
+                        <!--</div>-->
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="box box-default">
+            <div class="alert alert-danger" ng-if="errmsg" ng-bind="errmsg"></div>
+            <div class="box-body table-responsive">
+                <table class="table table-bordered table-hover table-striped">
+                    <thead>
+                    <tr>
+                        <th>Key</th>
+                        <th>Value</th>
+                        <!--<th class=>Operation</th>-->
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr ng-repeat="appStyle in entity.appStyle">
+                        <td>
+                            <input class="form-control" ng-model="appStyle.style_key" placeholder="Key" disabled>
+                        </td>
+                        <td>
+                            <input class="form-control" name="style_value" ng-model="appStyle.style_value" placeholder="Value">
+                        </td>
+                        <!--<td>-->
+                            <!--<button type="button" ng-click="delSpecOption($index)"-->
+                                    <!--class="btn btn-default" title="删除">-->
+                                <!--<i class="fa fa-trash-o"></i> 删除-->
+                            <!--</button>-->
+                        <!--</td>-->
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-success" type="button" ng-click="saveOneGroupAppStyle(style_form)" ng-disabled="ctrl.sending">Submit</button>
+                <a role="button" class="btn btn-danger" ui-sref="^" ui-sref-opts="{reload:true}">Cancel</a>
+            </div>
+        </div>
+    </section>
+</div>
\ No newline at end of file
diff --git a/src/main/ui/static/cms/templates/app_style_preview.html b/src/main/ui/static/cms/templates/app_style_preview.html
new file mode 100644
index 000000000..7ab0f756a
--- /dev/null
+++ b/src/main/ui/static/cms/templates/app_style_preview.html
@@ -0,0 +1,46 @@
+<div ui-view>
+    <section class="content-header">
+        <h1>APP_STYLE</h1>
+        <ol class="breadcrumb">
+            <li><a ui-sref="cms">网站管理</a></li>
+            <li><a ui-sref="cms.app_style">app图标</a></li>
+            <li class="active">app图标详情</li>
+        </ol>
+    </section>
+    <section class="content" >
+        <div class="box box-warning">
+            <div class="box-body">
+                <div class="form-inline">
+                    <div class="form-group">
+                        <a class="btn btn-success" ui-sref="cms.app_style.app_style_save">
+                            <i class="fa fa-plus"></i> New App Style
+                        </a>
+                        <a class="btn btn-primary" ui-sref="cms.app_style.app_style_edit({style_id:appStyles[0].style_id})">
+                            <i class="fa fa-edit"></i> Edit App Style
+                        </a>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="box box-default">
+            <div class="box-body table-responsive">
+                <table class="table table-bordered table-hover table-striped">
+                    <thead>
+                    <tr>
+                        <th>Title</th>
+                        <th>Style_Key</th>
+                        <th>Style_Value</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr ng-repeat="appStyle in appStyles">
+                        <td ng-bind="appStyle.style_id"></td>
+                        <td ng-bind="appStyle.style_key"></td>
+                        <td style="width: 50%;" ng-bind="appStyle.style_value"></td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </section>
+</div>
\ No newline at end of file
diff --git a/src/main/ui/static/cms/templates/cms_root.html b/src/main/ui/static/cms/templates/cms_root.html
index 69e7b8911..0040caa6b 100644
--- a/src/main/ui/static/cms/templates/cms_root.html
+++ b/src/main/ui/static/cms/templates/cms_root.html
@@ -26,6 +26,9 @@
                 <div class="btn-group">
                     <a class="btn btn-default" ui-sref=".category({catId:'app_ad'})">App广告页</a>
                 </div>
+                <div class="btn-group">
+                    <a class="btn btn-default" ui-sref=".app_style">App图标</a>
+                </div>
                 <div class="btn-group">
                     <a class="btn btn-default" ui-sref=".phone_top_up">话费充值</a>
                 </div>
diff --git a/src/main/ui/static/risk/templates/attention_merchants.html b/src/main/ui/static/risk/templates/attention_merchants.html
index b618f4f6b..d3ddfdf66 100644
--- a/src/main/ui/static/risk/templates/attention_merchants.html
+++ b/src/main/ui/static/risk/templates/attention_merchants.html
@@ -67,7 +67,7 @@
                         <td>{{client.bank_account_no}}</td>
                         <td>{{client.contact_person}}</td>
                         <td>{{client.contact_phone}}</td>
-                        <td>{{client.last_update_date}}</td>
+                        <td>{{client.creation_date}}</td>
                         <td>{{client.remark}}</td>
                         <td>
                             <a role="button" class="text-bold text-danger"

From ec30db765b8d88bebbb21ca1000a87fd49f9ebb0 Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Tue, 18 Sep 2018 18:48:09 +0800
Subject: [PATCH 010/103] =?UTF-8?q?app=E5=9B=BE=E6=A0=87cmsHost=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/support/cms/core/Impl/AppStyleServiceImpl.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/support/cms/core/Impl/AppStyleServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/support/cms/core/Impl/AppStyleServiceImpl.java
index 60aa24644..dee97a580 100644
--- a/src/main/java/au/com/royalpay/payment/manage/support/cms/core/Impl/AppStyleServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/support/cms/core/Impl/AppStyleServiceImpl.java
@@ -17,7 +17,7 @@ import java.net.URISyntaxException;
 @Service
 public class AppStyleServiceImpl implements AppStyleService {
 
-    @Value("http://127.0.0.1:9533")
+    @Value("${app.cms.host}")
     private String cmsHost;
     private Logger logger = LoggerFactory.getLogger(getClass());
 

From 086873f98ae4f9690cbefc4db94e66319eaae7b4 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 18 Sep 2018 19:15:40 +0800
Subject: [PATCH 011/103] add 55%

---
 .../web/PartnerManageController.java          |  4 +-
 .../static/payment/partner/partner-manage.js  | 42 ++++++++++---------
 .../templates/apply_rpay_sub_merchant_id.html |  2 +-
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
index c228f5995..2b7e1a2ec 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
@@ -564,8 +564,8 @@ public class PartnerManageController {
     }
 
     @ManagerMapping(value = "/{clientMoniker}/registRpaySubMerchantId", method = RequestMethod.POST, role = {ManagerRole.OPERATOR, ManagerRole.ADMIN})
-    public String subRpayMerchantApplication(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
-        return clientManager.subRpayMerchantApplication(clientMoniker, manager);
+    public void subRpayMerchantApplication(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
+        clientManager.subRpayMerchantApplication(clientMoniker, manager);
     }
 
 
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index 8a65a6128..c7652834b 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -3199,7 +3199,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
 
 
         $scope.saveRpayAppliy = function (form) {
-            $scope.merchantInfo = angular.copy(form);
+            var merchantInfo = {};
                 $scope.errmsg = null;
             if (form.$invalid) {
                 angular.forEach(form, function (item, key) {
@@ -3212,28 +3212,30 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
 
              angular.forEach(form, function (item, key) {
                  if(item !=null) {
-                     console.log("++++" + key + item.$name)
-
+                     if(item.$name !=null) {
+                         var name = item.$name;
+                         merchantInfo.name = item.$modelValue;
+                         console.log("++++" + item.$name + "++++" + item.$modelValue);
+                     }
                  }
              });
+             // var str = angular.toJson(form, true);
+             // console.log("----------" + str);
 
-            // var str = angular.toJson(form, true);
-            // console.log("----------" + str);
-
-            // $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/registRpaySubMerchantId', $scope.merchantInfo).then(function (resp) {
-            //     $scope.apply_sub_merchant_id = resp.data;
-            //     $scope.$close();
-            //     if (subMerchantInfo.sub_merchant_id != null) {
-            //         commonDialog.alert({
-            //             title: 'Success',
-            //             content: 'Modify Rpay+ Sub Merchant ID successfully',
-            //             type: 'success'
-            //         });
-            //         $state.reload();
-            //     }
-            // }, function (resp) {
-            //     $scope.errmsg = resp.data.message;
-            // })
+            $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/registRpaySubMerchantId', merchantInfo).then(function (resp) {
+                $scope.apply_sub_merchant_id = resp.data;
+                $scope.$close();
+                if (subMerchantInfo.sub_merchant_id != null) {
+                    commonDialog.alert({
+                        title: 'Success',
+                        content: 'Modify Rpay+ Sub Merchant ID successfully',
+                        type: 'success'
+                    });
+                    $state.reload();
+                }
+            }, function (resp) {
+                $scope.errmsg = resp.data.message;
+            })
         }
     }]);
 
diff --git a/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
index d13ba4af6..d898d0af8 100644
--- a/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
+++ b/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
@@ -214,7 +214,7 @@
                                 <div class="col-sm-8">
                                     <select class="form-control" name="timezone"  ng-model="subMerchantInfo.timezone"
                                             id="timezone-input"
-                                            ng-options="structure.value as structure.label for structure in timezone">
+                                            ng-options="tz.key as tz.detail for tz in timezone">
                                         <option value="">Please Choose</option>
                                     </select>
                                 </div>

From 1a4d406f03389b980130458a03e7a1925cd99511 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 18 Sep 2018 20:25:54 +0800
Subject: [PATCH 012/103] add 65%

---
 .../ui/static/payment/partner/partner-manage.js  |  5 ++---
 .../templates/apply_rpay_sub_merchant_id.html    | 16 ++++++++--------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index c7652834b..575637bcf 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -3209,12 +3209,11 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 });
                 return;
             }
-
+            var option = [];
              angular.forEach(form, function (item, key) {
                  if(item !=null) {
                      if(item.$name !=null) {
-                         var name = item.$name;
-                         merchantInfo.name = item.$modelValue;
+                         merchantInfo[key] = item.$modelValue;
                          console.log("++++" + item.$name + "++++" + item.$modelValue);
                      }
                  }
diff --git a/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
index d898d0af8..90806d504 100644
--- a/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
+++ b/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
@@ -12,7 +12,7 @@
                                 <label class="control-label col-sm-3" for="merchant_name_input">* Company Name</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.company_name"
-                                           type="text" name="merchant_name" id="merchant_name_input" required maxlength="50">
+                                           type="text" name="company_name" id="merchant_name_input" required maxlength="50">
                                     <div ng-messages="subForm.merchant_name.$error" ng-if="subForm.merchant_name.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
                                         <p class="small text-danger" ng-message="maxlength">Length is more than 50</p>
@@ -47,10 +47,10 @@
                             </div>
 
                             <div class="form-group">
-                                <label class="control-label col-sm-3" for="website_input">Website</label>
+                                <label class="control-label col-sm-3" for="company_website_input">Website</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.company_website"
-                                           type="text" name="website" id="website_input">
+                                           type="text" name="company_website" id="company_website_input">
                                 </div>
                             </div>
                             <div class="form-group"
@@ -150,12 +150,12 @@
                                 </div>
                             </div>
 
-                                <div class="form-group" ng-class="{'has-error':subForm.company_country.$invalid && subForm.company_country.$dirty}">
-                                    <label class="control-label col-sm-3" for="company_country_input">Company country</label>
+                                <div class="form-group" ng-class="{'has-error':subForm.country.$invalid && subForm.country.$dirty}">
+                                    <label class="control-label col-sm-3" for="country_input">Company country</label>
                                     <div class="col-sm-8">
                                         <input class="form-control" ng-model="subMerchantInfo.country"
-                                               type="text" name="company_country" id="company_country_input">
-                                        <div ng-messages="subForm.company_country.$error" ng-if="subForm.company_country.$dirty">
+                                               type="text" name="country" id="country_input">
+                                        <div ng-messages="subForm.country.$error" ng-if="subForm.country.$dirty">
                                             <p class="small text-danger" ng-message="required">Required Field</p>
                                         </div>
                                     </div>
@@ -165,7 +165,7 @@
                                 <label class="control-label col-sm-3" for="company_address_input">Company address</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.address"
-                                           type="text" name="company_address" id="company_address_input">
+                                           type="text" name="address" id="company_address_input">
                                     <div ng-messages="subForm.company_address.$error" ng-if="subForm.company_address.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
                                         <p class="small text-danger" ng-message="maxlength">Length is more than 50</p>

From f826867191f879c5692544597daaf44ea281e262 Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Tue, 18 Sep 2018 20:46:56 +0800
Subject: [PATCH 013/103] =?UTF-8?q?=E7=BC=A9=E5=B0=8F=E6=8A=BD=E5=A5=96?=
 =?UTF-8?q?=E5=A5=96=E5=8A=B1=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/static/templates/payment/success.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/ui/static/templates/payment/success.css b/src/main/ui/static/templates/payment/success.css
index ab5abda7a..5dc8ef94b 100644
--- a/src/main/ui/static/templates/payment/success.css
+++ b/src/main/ui/static/templates/payment/success.css
@@ -351,10 +351,10 @@
 }
 .points-dialog .dialog-content{
     margin: auto;
-    width: 90%;
+    width: 80%;
     display: block;
     position: relative;
-    margin-top: 130px;
+    margin-top: 100px;
     padding-top: 25px;
     padding-bottom: 19px;
     border-radius: 5px;
@@ -386,8 +386,8 @@
 }
 
 .points-content .coin{
-    width: 100px;
-    height: 100px;
+    width: 80px;
+    height: 80px;
     position: relative;
     background: url(/static/images/star.png) no-repeat;
     background-size: contain;

From f3bfd8d0ecd9eedd2a3278a63edd3594e1a77a71 Mon Sep 17 00:00:00 2001
From: yixian <astro.dai@royalpay.com.au>
Date: Wed, 19 Sep 2018 09:10:09 +0800
Subject: [PATCH 014/103] img

---
 src/main/ui/static/images/Group@1x.png | Bin 0 -> 6303 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/main/ui/static/images/Group@1x.png

diff --git a/src/main/ui/static/images/Group@1x.png b/src/main/ui/static/images/Group@1x.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fd90323f8095463eab3cd49390d9be251a3b117
GIT binary patch
literal 6303
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
VH$8{n_woP$002ovPDHLkV1i#-e=7h0

literal 0
HcmV?d00001


From d327dce76c13aed431a13db55d0be0ac520d3702 Mon Sep 17 00:00:00 2001
From: kira <164851225@qq.com>
Date: Wed, 19 Sep 2018 10:36:03 +0800
Subject: [PATCH 015/103] update

---
 .../partner/templates/partner_new_rate.html   | 24 -------------------
 1 file changed, 24 deletions(-)

diff --git a/src/main/ui/static/payment/partner/templates/partner_new_rate.html b/src/main/ui/static/payment/partner/templates/partner_new_rate.html
index 2452a150d..19267e23d 100644
--- a/src/main/ui/static/payment/partner/templates/partner_new_rate.html
+++ b/src/main/ui/static/payment/partner/templates/partner_new_rate.html
@@ -88,30 +88,6 @@
 
                     </div>
                 </div>
-                <div class="form-group"
-                     ng-class="{'has-error':rate_form.bestpay_rate_value.$invalid && rate_form.bestpay_rate_value.$dirty}">
-                    <label class="control-label col-sm-4" for="bestpay_rate_value_input">Bestpay Rate Value</label>
-                    <div class="col-sm-6">
-                        <div class="input-group">
-                            <input type="number" name="bestpay_rate_value" stringToNumber2 class="form-control" ng-model="rate.bestpay_rate_value"
-                                   min="0.6" max="2.2" step="0.1" id="bestpay_rate_value_input" required>
-                            <div class="input-group-addon">%</div>
-                        </div>
-                        <div ng-messages="rate_form.bestpay_rate_value.$error" ng-if="rate_form.bestpay_rate_value.$dirty">
-                            <div class="small text-danger" ng-message="max">
-                                <i class="glyphicon glyphicon-alert"></i> No more than 2.2%
-                            </div>
-                            <div class="small text-danger" ng-message="min">
-                                <i class="glyphicon glyphicon-alert"></i> No less than 0.6%
-                            </div>
-                            <div class="small text-danger" ng-message="required">
-                                <i class="glyphicon glyphicon-alert"></i> Required Field
-                            </div>
-                        </div>
-
-                    </div>
-                </div>
-
                 <div class="form-group"
                      ng-class="{'has-error':rate_form.jd_rate_value.$invalid && rate_form.jd_rate_value.$dirty}">
                     <label class="control-label col-sm-4" for="jd_rate_value_input">JD Rate Value</label>

From 93a4ff7bed00b45b45c3e4bc3af9f0e979a5b4d5 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 19 Sep 2018 11:29:14 +0800
Subject: [PATCH 016/103] add 100%

---
 .../manage/merchants/core/ClientManager.java  |  4 +-
 .../core/impls/ClientManagerImpl.java         | 29 ++++----
 .../web/PartnerManageController.java          |  4 +-
 .../static/payment/partner/partner-manage.js  | 10 +--
 .../templates/apply_rpay_sub_merchant_id.html | 73 +++++++++----------
 5 files changed, 58 insertions(+), 62 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
index 925136d37..43b3eec38 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
@@ -334,8 +334,8 @@ public interface ClientManager {
 
     void sendHfEmailNotice(JSONObject order);
 
-    void updateAllPartnerPassword(String clientMoniker, List<String> emails);
+    void subRpayMerchantApplication(String clientMoniker,JSONObject merchantInfo, JSONObject manager);
 
-    void subRpayMerchantApplication(String clientMoniker, JSONObject manager);
+    void updateAllPartnerPassword(String clientMoniker, List<String> emails);
 
 }
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 f7374de7b..85d4c6ff5 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
@@ -3575,33 +3575,32 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     }
 
     @Override
-    public void subRpayMerchantApplication(String clientMoniker, JSONObject manager) {
+    public void subRpayMerchantApplication(String clientMoniker, JSONObject merchantInfo,JSONObject manager) {
         JSONObject client = getClientInfoByMoniker(clientMoniker);
         if (client == null) {
             throw new InvalidShortIdException();
         }
         checkOrgPermission(manager, client);
 
-        List<JSONObject> listByshortName = sysRpayMerchantApplyMapper.listByShortName(client.getIntValue("client_id"),client.getString("short_name"));
+        List<JSONObject> listByshortName = sysRpayMerchantApplyMapper.listByShortName(client.getIntValue("client_id"),merchantInfo.getString("company_shortname"));
 
-        if (listByshortName.size()>0) {
-            throw new BadRequestException("请修改【" + clientMoniker + "】的Company shortName信息（请避免和Rpay+商务号列表内的Company Short Name重复）");
-        }
+//        if (listByshortName.size()>0) {
+//            throw new BadRequestException("请修改【" + clientMoniker + "】的Company shortName信息（请避免和Rpay+商务号列表内的Company Short Name重复）");
+//        }
 
-        SubRpayMerchantInfo subRpayMerchantInfo = JSONObject.toJavaObject(client, SubRpayMerchantInfo.class);
+        SubRpayMerchantInfo subRpayMerchantInfo = JSONObject.toJavaObject(merchantInfo, SubRpayMerchantInfo.class);
         subRpayMerchantInfo.CheckEmpty();
         JSONObject rpayMerchantInfo = rpayApi.registerMerchant(client.getIntValue("client_id"), subRpayMerchantInfo);
 
         if (rpayMerchantInfo != null) {
-            JSONObject merchantApply = new JSONObject();
-            merchantApply.put("merchant_id", rpayMerchantInfo.getString("rpay_order_id"));
-            merchantApply.put("client_id", client.getString("client_id"));
-            merchantApply.put("create_time", new Date());
-            merchantApply.put("operator", manager.getString("display_name"));
-            merchantApply.put("sub_merchant_id", rpayMerchantInfo.getString("merchantId"));
-            merchantApply.put("business_category", client.getString("royalpayindustry"));
-            merchantApply.put("merchant_shortname", client.getString("short_name"));
-            sysRpayMerchantApplyMapper.insertRpayMerchantApply(merchantApply);
+            merchantInfo.put("merchant_id", rpayMerchantInfo.getString("rpay_order_id"));
+            merchantInfo.put("client_id", client.getString("client_id"));
+            merchantInfo.put("create_time", new Date());
+            merchantInfo.put("operator", manager.getString("display_name"));
+            merchantInfo.put("sub_merchant_id", rpayMerchantInfo.getString("merchantId"));
+            merchantInfo.put("business_category", client.getString("royalpayindustry"));
+            merchantInfo.put("merchant_shortname", merchantInfo.getString("company_shortname"));
+            sysRpayMerchantApplyMapper.insertRpayMerchantApply(merchantInfo);
             clientMapper.updateRpayEnterpriseId(client.getIntValue("client_id"), rpayMerchantInfo.getString("merchantId"));
         }else {
             throw new BadRequestException("请求失败");
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
index 2b7e1a2ec..1e5ada8bc 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
@@ -564,8 +564,8 @@ public class PartnerManageController {
     }
 
     @ManagerMapping(value = "/{clientMoniker}/registRpaySubMerchantId", method = RequestMethod.POST, role = {ManagerRole.OPERATOR, ManagerRole.ADMIN})
-    public void subRpayMerchantApplication(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
-        clientManager.subRpayMerchantApplication(clientMoniker, manager);
+    public void subRpayMerchantApplication(@PathVariable String clientMoniker,@RequestBody JSONObject merchantInfo,@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
+        clientManager.subRpayMerchantApplication(clientMoniker, merchantInfo,manager);
     }
 
 
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index 575637bcf..c536102ee 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -3209,17 +3209,13 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 });
                 return;
             }
-            var option = [];
              angular.forEach(form, function (item, key) {
                  if(item !=null) {
                      if(item.$name !=null) {
                          merchantInfo[key] = item.$modelValue;
-                         console.log("++++" + item.$name + "++++" + item.$modelValue);
                      }
                  }
              });
-             // var str = angular.toJson(form, true);
-             // console.log("----------" + str);
 
             $http.post('/sys/partners/' + $scope.subMerchantInfo.client_moniker + '/registRpaySubMerchantId', merchantInfo).then(function (resp) {
                 $scope.apply_sub_merchant_id = resp.data;
@@ -3233,7 +3229,11 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                     $state.reload();
                 }
             }, function (resp) {
-                $scope.errmsg = resp.data.message;
+                commonDialog.alert({
+                    title: 'Error',
+                    content: resp.data.message,
+                    type: 'error'
+                });
             })
         }
     }]);
diff --git a/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
index 90806d504..ecc2e3069 100644
--- a/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
+++ b/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
@@ -7,13 +7,12 @@
                     <div class="panel-body">
                         <div class="form-horizontal">
                             <div class="form-group"
-                                 ng-class="{'has-error':subForm.merchant_name.$invalid && subForm.merchant_name.$dirty}">
-                                <div class="alert alert-danger" ng-if="errmsg" ng-bind="errmsg"></div>
-                                <label class="control-label col-sm-3" for="merchant_name_input">* Company Name</label>
+                                 ng-class="{'has-error':subForm.company_name.$invalid && subForm.company_name.$dirty}">
+                                <label class="control-label col-sm-3" for="company_name_input">* Company Name</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.company_name"
-                                           type="text" name="company_name" id="merchant_name_input" required maxlength="50">
-                                    <div ng-messages="subForm.merchant_name.$error" ng-if="subForm.merchant_name.$dirty">
+                                           type="text" name="company_name" id="company_name_input" required maxlength="50">
+                                    <div ng-messages="subForm.company_name.$error" ng-if="subForm.company_name.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
                                         <p class="small text-danger" ng-message="maxlength">Length is more than 50</p>
                                     </div>
@@ -21,7 +20,7 @@
                             </div>
 
                             <div class="form-group"
-                                 ng-class="{'has-error':subForm.merchant_id.$invalid && subForm.merchant_id.$dirty}">
+                                 ng-class="{'has-error':subForm.business_name.$invalid && subForm.business_name.$dirty}">
                                 <label class="control-label col-sm-3" for="business_name_input">* Business Name</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.business_name"
@@ -58,42 +57,42 @@
                                 <label class="control-label col-sm-3" for="description_input">* Company description</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.description"
-                                           type="text" name="description" id="description_input" required maxlength="256" MINLENGTH="10">
+                                           type="text" name="description" id="description_input" required maxlength="256">
                                     <div ng-messages="subForm.description.$error" ng-if="subForm.description.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
                                         <p class="small text-danger" ng-message="maxlength">Length is more than 256</p>
-                                        <p class="small text-danger" ng-message="minlength">Length is less than 10</p>
                                     </div>
                                 </div>
                             </div>
 
-                            <div class="form-group" ng-class="{'has-error':subForm.abn.$invalid && subForm.abn.$dirty}">
-                                <label class="control-label col-sm-3" for="abn_input">abn</label>
+                            <div class="form-group"
+                                 ng-class="{'has-error':subForm.abn.$invalid && subForm.abn.$dirty}">
+                                <label class="control-label col-sm-3" for="abn_input">* abn</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.abn"
-                                           type="text" name="abn" id="abn_input">
+                                           type="text" name="abn" id="abn_input" required maxlength="256">
                                     <div ng-messages="subForm.abn.$error" ng-if="subForm.abn.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
-                                        <p class="small text-danger" ng-message="maxlength">Length is more than 10</p>
                                     </div>
                                 </div>
                             </div>
 
-                            <div class="form-group" ng-class="{'has-error':subForm.acn.$invalid && subForm.acn.$dirty}">
-                                <label class="control-label col-sm-3" for="acn_input">acn</label>
+                            <div class="form-group"
+                                 ng-class="{'has-error':subForm.acn.$invalid && subForm.acn.$dirty}">
+                                <label class="control-label col-sm-3" for="acn_input">* acn</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.acn"
-                                           type="text" name="acn" id="acn_input">
+                                           type="text" name="acn" id="acn_input" required maxlength="256">
                                     <div ng-messages="subForm.acn.$error" ng-if="subForm.acn.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
-                                        <p class="small text-danger" ng-message="maxlength">Length is more than 10</p>
                                     </div>
                                 </div>
                             </div>
 
+
                             <div class="form-group"
                                  ng-class="{'has-error':subForm.business_structure.$invalid && subForm.business_structure.$dirty}">
-                                <label class="control-label col-sm-3" for="business-structure-input">Business Structure</label>
+                                <label class="control-label col-sm-3" for="business-structure-input">* Business Structure</label>
                                 <div class="col-sm-8">
                                     <select class="form-control" name="business_structure"  ng-model="subMerchantInfo.business_structure"
                                             id="business-structure-input"
@@ -109,7 +108,7 @@
                                 <label class="control-label col-sm-3" for="company_phone_input">* Company Phone</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.company_phone"
-                                           type="tel" name="company_phone" id="company_phone_input" required>
+                                           type="tel" name="company_phone" id="company_phone_input" required maxlength="256">
                                     <div ng-messages="subForm.company_phone.$error" ng-if="subForm.company_phone.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
                                     </div>
@@ -118,10 +117,10 @@
                             </div>
 
                             <div class="form-group" ng-class="{'has-error':subForm.contact_name.$invalid && subForm.contact_name.$dirty}">
-                                <label class="control-label col-sm-3" for="contact_name_input">Contact Name</label>
+                                <label class="control-label col-sm-3" for="contact_name_input">* Contact Name</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.contact_person"
-                                           type="text" name="contact_name" id="contact_name_input">
+                                           type="text" name="contact_name" id="contact_name_input" required maxlength="256">
                                     <div ng-messages="subForm.contact_name.$error" ng-if="subForm.contact_name.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
                                     </div>
@@ -129,10 +128,10 @@
                             </div>
 
                             <div class="form-group" ng-class="{'has-error':subForm.contact_phone.$invalid && subForm.contact_phone.$dirty}">
-                                <label class="control-label col-sm-3" for="contact_phone_input">Contact Phone</label>
+                                <label class="control-label col-sm-3" for="contact_phone_input">* Contact Phone</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.contact_phone"
-                                           type="text" name="contact_phone" id="contact_phone_input">
+                                           type="text" name="contact_phone" id="contact_phone_input" required maxlength="256">
                                     <div ng-messages="subForm.contact_phone.$error" ng-if="subForm.contact_phone.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
                                     </div>
@@ -140,10 +139,10 @@
                             </div>
 
                             <div class="form-group" ng-class="{'has-error':subForm.contact_email.$invalid && subForm.contact_email.$dirty}">
-                                <label class="control-label col-sm-3" for="contact_email_input">Contact Email</label>
+                                <label class="control-label col-sm-3" for="contact_email_input">* Contact Email</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.contact_email"
-                                           type="text" name="contact_email" id="contact_email_input">
+                                           type="text" name="contact_email" id="contact_email_input" required maxlength="256">
                                     <div ng-messages="subForm.contact_email.$error" ng-if="subForm.contact_email.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
                                     </div>
@@ -151,22 +150,22 @@
                             </div>
 
                                 <div class="form-group" ng-class="{'has-error':subForm.country.$invalid && subForm.country.$dirty}">
-                                    <label class="control-label col-sm-3" for="country_input">Company country</label>
+                                    <label class="control-label col-sm-3" for="country_input">* Company country</label>
                                     <div class="col-sm-8">
                                         <input class="form-control" ng-model="subMerchantInfo.country"
-                                               type="text" name="country" id="country_input">
+                                               type="text" name="country" id="country_input" required maxlength="256">
                                         <div ng-messages="subForm.country.$error" ng-if="subForm.country.$dirty">
                                             <p class="small text-danger" ng-message="required">Required Field</p>
                                         </div>
                                     </div>
                                 </div>
 
-                            <div class="form-group" ng-class="{'has-error':subForm.company_address.$invalid && subForm.company_address.$dirty}">
-                                <label class="control-label col-sm-3" for="company_address_input">Company address</label>
+                            <div class="form-group" ng-class="{'has-error':subForm.address.$invalid && subForm.address.$dirty}">
+                                <label class="control-label col-sm-3" for="company_address_input">* Company address</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.address"
-                                           type="text" name="address" id="company_address_input">
-                                    <div ng-messages="subForm.company_address.$error" ng-if="subForm.company_address.$dirty">
+                                           type="text" name="address" id="company_address_input" required maxlength="256">
+                                    <div ng-messages="subForm.address.$error" ng-if="subForm.address.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
                                         <p class="small text-danger" ng-message="maxlength">Length is more than 50</p>
                                     </div>
@@ -174,34 +173,32 @@
                             </div>
 
                             <div class="form-group" ng-class="{'has-error':subForm.suburb.$invalid && subForm.suburb.$dirty}">
-                                <label class="control-label col-sm-3" for="company_suburb_input">suburb</label>
+                                <label class="control-label col-sm-3" for="company_suburb_input">* suburb</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.suburb"
-                                           type="text" name="suburb" id="company_suburb_input">
+                                           type="text" name="suburb" id="company_suburb_input" required maxlength="256">
                                     <div ng-messages="subForm.suburb.$error" ng-if="subForm.suburb.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
-                                        <p class="small text-danger" ng-message="maxlength">Length is more than 10</p>
                                     </div>
                                 </div>
                             </div>
 
                             <div class="form-group" ng-class="{'has-error':subForm.postcode.$invalid && subForm.postcode.$dirty}">
-                                <label class="control-label col-sm-3" for="company_postcode_input">postCode</label>
+                                <label class="control-label col-sm-3" for="company_postcode_input">* postCode</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.postcode"
-                                           type="text" name="postcode" id="company_postcode_input">
+                                           type="text" name="postcode" id="company_postcode_input" required maxlength="256">
                                     <div ng-messages="subForm.postcode.$error" ng-if="subForm.postcode.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
-                                        <p class="small text-danger" ng-message="maxlength">Length is more than 10</p>
                                     </div>
                                 </div>
                             </div>
 
                             <div class="form-group" ng-class="{'has-error':subForm.state.$invalid && subForm.state.$dirty}">
-                                <label class="control-label col-sm-3" for="state_input">state</label>
+                                <label class="control-label col-sm-3" for="state_input">* state</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.state"
-                                           type="text" name="state" id="state_input">
+                                           type="text" name="state" id="state_input" required maxlength="256">
                                     <div ng-messages="subForm.state.$error" ng-if="subForm.state.$dirty">
                                         <p class="small text-danger" ng-message="required">Required Field</p>
                                         <p class="small text-danger" ng-message="maxlength">Length is more than 10</p>

From 2436757e1dc581df5f854d29a92f5928ea2ef51c Mon Sep 17 00:00:00 2001
From: kira <164851225@qq.com>
Date: Wed, 19 Sep 2018 11:40:08 +0800
Subject: [PATCH 017/103] update

---
 .../cms/core/Impl/AppStyleServiceImpl.java    | 74 +++----------------
 1 file changed, 9 insertions(+), 65 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/support/cms/core/Impl/AppStyleServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/support/cms/core/Impl/AppStyleServiceImpl.java
index dee97a580..804daffe8 100644
--- a/src/main/java/au/com/royalpay/payment/manage/support/cms/core/Impl/AppStyleServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/support/cms/core/Impl/AppStyleServiceImpl.java
@@ -1,18 +1,14 @@
 package au.com.royalpay.payment.manage.support.cms.core.Impl;
 
 import au.com.royalpay.payment.manage.support.cms.core.AppStyleService;
-import au.com.royalpay.payment.tools.exceptions.ServerErrorException;
-import cn.yixblog.platform.http.HttpRequestGenerator;
-import cn.yixblog.platform.http.HttpRequestResult;
+import au.com.royalpay.payment.tools.cms.RoyalPayCMSSupport;
+
 import com.alibaba.fastjson.JSONObject;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
 
 @Service
 public class AppStyleServiceImpl implements AppStyleService {
@@ -21,81 +17,29 @@ public class AppStyleServiceImpl implements AppStyleService {
     private String cmsHost;
     private Logger logger = LoggerFactory.getLogger(getClass());
 
+    private RoyalPayCMSSupport royalPayCMSSupport;
     @Override
     public JSONObject listAppStyleGroup(int page, int limit) {
-        String url = concatUrl("/app/style_group");
-        HttpRequestGenerator gen = new HttpRequestGenerator(url, RequestMethod.GET).addQueryString("page", page + "").addQueryString("limit", limit + "");
-        try {
-            HttpRequestResult res = gen.execute();
-            if (res.isSuccess()) {
-                return res.getResponseContentJSONObj();
-            }
-        } catch (URISyntaxException | IOException e) {
-            logger.error(e.getMessage(), e);
-        }
-        throw new ServerErrorException("Failed to request CMS");
+        return royalPayCMSSupport.listAppStyleGroup(page,limit);
     }
 
     @Override
     public JSONObject getAppStyleByStyleId(String style_id) {
-        String url = concatUrl("/app/style_group/" + style_id);
-        HttpRequestGenerator gen = new HttpRequestGenerator(url, RequestMethod.GET);
-        try {
-            HttpRequestResult res = gen.execute();
-            if (res.isSuccess()) {
-                return res.getResponseContentJSONObj();
-            }
-        } catch (URISyntaxException | IOException e) {
-            logger.error(e.getMessage(), e);
-        }
-        throw new ServerErrorException("Failed to request CMS");
+        return royalPayCMSSupport.getAppStyleByStyleId(style_id);
     }
 
     @Override
     public void switchGroupByStyleId(String style_id) {
-        String url = concatUrl("/app/style_group/" + style_id);
-        try {
-            HttpRequestResult res = new HttpRequestGenerator(url, RequestMethod.PUT).execute();
-            if (res.isSuccess()) {
-                return;
-            }
-        } catch (URISyntaxException e) {
-            logger.error(e.getMessage(), e);
-        }
-        throw new ServerErrorException("Failed to request CMS");
+        royalPayCMSSupport.switchGroupByStyleId(style_id);
     }
 
     @Override
     public void addAppStyle(String style_id, JSONObject appStyleGroup) {
-        String url = concatUrl("/app/style_group");
-        try {
-            HttpRequestResult gen = new HttpRequestGenerator(url, RequestMethod.POST).addQueryString("style_id", style_id).setJSONEntity(appStyleGroup).execute();
-            if (gen.isSuccess()) {
-                return;
-            }
-        } catch (URISyntaxException e) {
-            logger.error(e.getMessage(), e);
-        }
-        throw new ServerErrorException("Failed to request CMS");
+        royalPayCMSSupport.addAppStyle(style_id,appStyleGroup);
     }
 
     @Override
     public void updateAppStyleByStyleId(String style_id, String originStyleId, JSONObject appStyleGroup) {
-        String url = concatUrl("/app/style_group/" + style_id + "/style");
-        try {
-            HttpRequestResult gen = new HttpRequestGenerator(url, RequestMethod.PUT).addQueryString("originStyleId", originStyleId).setJSONEntity(appStyleGroup).execute();
-            if (gen.isSuccess()) {
-                return;
-            }
-        } catch (URISyntaxException e) {
-            logger.error(e.getMessage(), e);
-        }
-        throw new ServerErrorException("Failed to request CMS");
-    }
-
-    private String concatUrl(String uri) {
-        String host = cmsHost.endsWith("/") ? cmsHost.substring(0, cmsHost.length() - 1) : cmsHost;
-        uri = uri.startsWith("/") ? uri.substring(1) : uri;
-        return host + "/" + uri;
+        royalPayCMSSupport.updateAppStyleByStyleId(style_id,originStyleId,appStyleGroup);
     }
 }

From f72b439353cc925edf109594a1350bd87fbc3a7a Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 19 Sep 2018 12:03:46 +0800
Subject: [PATCH 018/103] change Rpay merchant

---
 .../payment/partner/templates/apply_rpay_sub_merchant_id.html   | 2 +-
 ...apply_sub_merchant_id.html => apply_wx_sub_merchant_id.html} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename src/main/ui/static/payment/partner/templates/{apply_sub_merchant_id.html => apply_wx_sub_merchant_id.html} (99%)

diff --git a/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
index ecc2e3069..bf36efcf3 100644
--- a/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
+++ b/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
@@ -3,7 +3,7 @@
         <div class="row">
             <div class="col-sm-12">
                 <div class="panel panel-default">
-                    <div class="panel-heading">Apply Sub Merchant Id</div>
+                    <div class="panel-heading">Apply Rpay+ Sub Merchant Id</div>
                     <div class="panel-body">
                         <div class="form-horizontal">
                             <div class="form-group"
diff --git a/src/main/ui/static/payment/partner/templates/apply_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/apply_wx_sub_merchant_id.html
similarity index 99%
rename from src/main/ui/static/payment/partner/templates/apply_sub_merchant_id.html
rename to src/main/ui/static/payment/partner/templates/apply_wx_sub_merchant_id.html
index 34b94f7d4..58b227e73 100644
--- a/src/main/ui/static/payment/partner/templates/apply_sub_merchant_id.html
+++ b/src/main/ui/static/payment/partner/templates/apply_wx_sub_merchant_id.html
@@ -3,7 +3,7 @@
         <div class="row">
             <div class="col-sm-12">
                 <div class="panel panel-default">
-                    <div class="panel-heading">Apply Sub Merchant Id</div>
+                    <div class="panel-heading">Apply Wechat Sub Merchant Id</div>
                     <div class="panel-body">
                         <div class="form-horizontal">
                             <div class="form-group"

From ba41845c03d9169b510cc03433a96a5bb4b1d807 Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Wed, 19 Sep 2018 13:17:31 +0800
Subject: [PATCH 019/103] =?UTF-8?q?=E5=8A=A0@Resource=E5=BC=95=E5=85=A5Roy?=
 =?UTF-8?q?alPayCMSSupport?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/support/cms/core/Impl/AppStyleServiceImpl.java     | 4 +++-
 src/main/ui/static/cms/templates/app_style_config.html        | 4 ++--
 src/main/ui/static/cms/templates/app_style_preview.html       | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/support/cms/core/Impl/AppStyleServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/support/cms/core/Impl/AppStyleServiceImpl.java
index 804daffe8..e189061a9 100644
--- a/src/main/java/au/com/royalpay/payment/manage/support/cms/core/Impl/AppStyleServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/support/cms/core/Impl/AppStyleServiceImpl.java
@@ -10,13 +10,15 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 @Service
 public class AppStyleServiceImpl implements AppStyleService {
 
     @Value("${app.cms.host}")
     private String cmsHost;
     private Logger logger = LoggerFactory.getLogger(getClass());
-
+    @Resource
     private RoyalPayCMSSupport royalPayCMSSupport;
     @Override
     public JSONObject listAppStyleGroup(int page, int limit) {
diff --git a/src/main/ui/static/cms/templates/app_style_config.html b/src/main/ui/static/cms/templates/app_style_config.html
index 694d761c9..d934aa1f4 100644
--- a/src/main/ui/static/cms/templates/app_style_config.html
+++ b/src/main/ui/static/cms/templates/app_style_config.html
@@ -3,7 +3,7 @@
         <h1>APP_STYLE</h1>
         <ol class="breadcrumb">
             <li><a ui-sref="cms">网站管理</a></li>
-            <li><a ui-sref="cms.app_style">app图标</a></li>
+            <li><a ui-sref="^" ui-sref-opts="{reload:true}">app图标</a></li>
             <li class="active"  ng-bind="!ctrl.flag?'Edit Article':'New Article'"></li>
         </ol>
     </section>
@@ -16,7 +16,7 @@
                             <label class="control-label" for="short-name-search">title</label>
                             <input type="text" class="form-control" id="short-name-search" name="style_id"
                                    ng-model="params.style_id" required>
-                            <div class="checkbox-inline">
+                            <div class="checkbox-inline" ng-if="!ctrl.flag">
                                 <label><input role="button" type="radio" ng-value="true" ng-model="entity.appStyle[0].is_valid" ng-change="toggleAppStyleIsValid(params.style_id)"> Published</label>
                             </div>
                         </div>
diff --git a/src/main/ui/static/cms/templates/app_style_preview.html b/src/main/ui/static/cms/templates/app_style_preview.html
index 7ab0f756a..08eda755d 100644
--- a/src/main/ui/static/cms/templates/app_style_preview.html
+++ b/src/main/ui/static/cms/templates/app_style_preview.html
@@ -3,7 +3,7 @@
         <h1>APP_STYLE</h1>
         <ol class="breadcrumb">
             <li><a ui-sref="cms">网站管理</a></li>
-            <li><a ui-sref="cms.app_style">app图标</a></li>
+            <li><a ui-sref="^" ui-sref-opts="{reload:true}">app图标</a></li>
             <li class="active">app图标详情</li>
         </ol>
     </section>

From 163c8e1976c8621ec407075ba3fadb43fd6e62fa Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 19 Sep 2018 13:20:59 +0800
Subject: [PATCH 020/103] 0.2.0 -dev

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index adaacec07..cfb6e206d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>au.com.royalpay.payment</groupId>
         <artifactId>payment-parent</artifactId>
-        <version>0.2.0</version>
+        <version>0.2.0-dev</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

From 3831ea17ae23aa08b0229a664b752c919d5f9fe9 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 19 Sep 2018 13:26:06 +0800
Subject: [PATCH 021/103] fix pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index cfb6e206d..adaacec07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>au.com.royalpay.payment</groupId>
         <artifactId>payment-parent</artifactId>
-        <version>0.2.0-dev</version>
+        <version>0.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

From 9c2ee829d6e9b27b46be5fa18ae0b8968b68acd0 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 19 Sep 2018 13:35:23 +0800
Subject: [PATCH 022/103] fix pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index adaacec07..cfb6e206d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>au.com.royalpay.payment</groupId>
         <artifactId>payment-parent</artifactId>
-        <version>0.2.0</version>
+        <version>0.2.0-dev</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

From 71daf269e453857b94613957b40e5e4725c04725 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 19 Sep 2018 13:55:53 +0800
Subject: [PATCH 023/103] fix pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index cfb6e206d..adaacec07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>au.com.royalpay.payment</groupId>
         <artifactId>payment-parent</artifactId>
-        <version>0.2.0-dev</version>
+        <version>0.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

From 6e60424265923d2f38e676de050061c4ffabc942 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 19 Sep 2018 16:16:45 +0800
Subject: [PATCH 024/103] fix merchant_id

---
 .../templates/apply_rpay_sub_merchant_id.html     | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
index bf36efcf3..f7d130c75 100644
--- a/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
+++ b/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
@@ -77,22 +77,17 @@
                                 </div>
                             </div>
 
-                            <div class="form-group"
-                                 ng-class="{'has-error':subForm.acn.$invalid && subForm.acn.$dirty}">
-                                <label class="control-label col-sm-3" for="acn_input">* acn</label>
+                            <div class="form-group">
+                                <label class="control-label col-sm-3" for="acn_input">acn</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.acn"
-                                           type="text" name="acn" id="acn_input" required maxlength="256">
-                                    <div ng-messages="subForm.acn.$error" ng-if="subForm.acn.$dirty">
-                                        <p class="small text-danger" ng-message="required">Required Field</p>
-                                    </div>
+                                           type="text" name="acn" id="acn_input">
                                 </div>
                             </div>
 
 
-                            <div class="form-group"
-                                 ng-class="{'has-error':subForm.business_structure.$invalid && subForm.business_structure.$dirty}">
-                                <label class="control-label col-sm-3" for="business-structure-input">* Business Structure</label>
+                            <div class="form-group">
+                                <label class="control-label col-sm-3" for="business-structure-input">Business Structure</label>
                                 <div class="col-sm-8">
                                     <select class="form-control" name="business_structure"  ng-model="subMerchantInfo.business_structure"
                                             id="business-structure-input"

From 4d39963f981717df09545af2a00afcad19c81d26 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 19 Sep 2018 16:18:14 +0800
Subject: [PATCH 025/103] fix merchant

---
 .../templates/apply_rpay_sub_merchant_id.html     | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
index bf36efcf3..f7d130c75 100644
--- a/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
+++ b/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
@@ -77,22 +77,17 @@
                                 </div>
                             </div>
 
-                            <div class="form-group"
-                                 ng-class="{'has-error':subForm.acn.$invalid && subForm.acn.$dirty}">
-                                <label class="control-label col-sm-3" for="acn_input">* acn</label>
+                            <div class="form-group">
+                                <label class="control-label col-sm-3" for="acn_input">acn</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.acn"
-                                           type="text" name="acn" id="acn_input" required maxlength="256">
-                                    <div ng-messages="subForm.acn.$error" ng-if="subForm.acn.$dirty">
-                                        <p class="small text-danger" ng-message="required">Required Field</p>
-                                    </div>
+                                           type="text" name="acn" id="acn_input">
                                 </div>
                             </div>
 
 
-                            <div class="form-group"
-                                 ng-class="{'has-error':subForm.business_structure.$invalid && subForm.business_structure.$dirty}">
-                                <label class="control-label col-sm-3" for="business-structure-input">* Business Structure</label>
+                            <div class="form-group">
+                                <label class="control-label col-sm-3" for="business-structure-input">Business Structure</label>
                                 <div class="col-sm-8">
                                     <select class="form-control" name="business_structure"  ng-model="subMerchantInfo.business_structure"
                                             id="business-structure-input"

From f1ea323c28cfca1ba9704d4592260e5b86a32666 Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Wed, 19 Sep 2018 16:27:52 +0800
Subject: [PATCH 026/103] =?UTF-8?q?[fix]channel=E6=B7=BB=E5=8A=A0Rpay?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/impls/ChannelsAnalysisServiceImpl.java    |  2 +-
 .../analysis/core/impls/DashboardServiceImpl.java  |  2 +-
 .../bdprize/core/impls/BDPrizeServiceImpl.java     |  2 +-
 src/main/ui/static/analysis/clearing-log.js        |  2 ++
 .../templates/settlement_transactions.html         |  5 +++++
 .../commons/services/clearingDetailService.js      |  2 ++
 src/main/ui/static/config/bdprize/bdprize.js       |  2 ++
 .../config/bdprize/templates/bd_prize_detail.html  | 14 ++++++++++++++
 .../bdprize/templates/bd_prize_month_report.html   | 12 ++++++++++++
 .../templates/partner_settlement_dialog.html       |  5 +++++
 .../payment/tradelog/templates/trade_logs.html     |  2 ++
 11 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ChannelsAnalysisServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ChannelsAnalysisServiceImpl.java
index 1b3f2b439..5ad52e954 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ChannelsAnalysisServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ChannelsAnalysisServiceImpl.java
@@ -40,7 +40,7 @@ public class ChannelsAnalysisServiceImpl implements ChannelsAnalysisService {
         }
         List<JSONObject> list = new ArrayList<>();
         Map<Date,JSONObject> analysisMap = new TreeMap<>();
-        String[] channels = {"Wechat","Bestpay","Alipay","jd","AlipayOnline","hf"};
+        String[] channels = {"Wechat","Bestpay","Alipay","jd","AlipayOnline","hf", "Rpay"};
         for (String channel:channels){
             analysisChannelCustomers(params, analysisMap, channel);
         }
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
index 75cff47fa..261626c82 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
@@ -553,7 +553,7 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
         }
     }
     private JSONObject getTodayChannelCount(JSONObject params){
-        String[] channels = new String[]{"Bestpay","Wechat","Alipay","jd","AlipayOnline","hf"};
+        String[] channels = new String[]{"Bestpay","Wechat","Alipay","jd","AlipayOnline","hf", "Rpay"};
         JSONObject resp = new JSONObject();
         for(String channel:channels) {
             params.put("channel", channel);
diff --git a/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java
index 99217ffa0..85b8e6ae8 100644
--- a/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java
@@ -80,7 +80,7 @@ public class BDPrizeServiceImpl implements BDPrizeService {
 
     private static BigDecimal percent = new BigDecimal(100);
 
-    private static String[] channels = new String[]{"Wechat", "Alipay", "Bestpay", "jd", "AlipayOnline","hf"};
+    private static String[] channels = new String[]{"Wechat", "Alipay", "Bestpay", "jd", "AlipayOnline","hf", "Rpay"};
     private static Logger logger = LoggerFactory.getLogger(BDPrizeServiceImpl.class);
 
     @Override
diff --git a/src/main/ui/static/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js
index cb1429ab3..9ecebf963 100644
--- a/src/main/ui/static/analysis/clearing-log.js
+++ b/src/main/ui/static/analysis/clearing-log.js
@@ -542,6 +542,8 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
                     return '/static/images/jd_sign_lg.png';
                 case 'hf':
                     return '/static/images/hf_sign_lg.png';
+                case 'Rpay':
+                    return '/static/images/royalpay_sign.png';
             }
         }
     });
diff --git a/src/main/ui/static/analysis/templates/settlement_transactions.html b/src/main/ui/static/analysis/templates/settlement_transactions.html
index c1f522e0c..ddb451ebe 100644
--- a/src/main/ui/static/analysis/templates/settlement_transactions.html
+++ b/src/main/ui/static/analysis/templates/settlement_transactions.html
@@ -48,6 +48,11 @@
                         <img src="/static/images/hf_sign_lg.png" class="channel-icon-lg">
                     </a>
                 </li>
+                <li ng-class="{active:ctrl.channel=='Rpay'}" ng-if="report.channels.Rpay">
+                    <a role="button" ng-click="ctrl.channel='Rpay';channelAndDayOfAnalysis()" title="RPAY">
+                        <img src="/static/images/royalpay_sign.png" class="channel-icon-lg">
+                    </a>
+                </li>
             </ul>
         </div>
     </div>
diff --git a/src/main/ui/static/commons/services/clearingDetailService.js b/src/main/ui/static/commons/services/clearingDetailService.js
index bc2d39f35..bcd54527e 100644
--- a/src/main/ui/static/commons/services/clearingDetailService.js
+++ b/src/main/ui/static/commons/services/clearingDetailService.js
@@ -60,6 +60,8 @@ define(['../app','decimal'], function (app,Decimal) {
                     return '/static/images/jd_sign_lg.png';
                 case 'hf':
                     return '/static/images/hf_sign_lg.png';
+                case 'Rpay':
+                    return '/static/images/royalpay_sign.png';
             }
         }
     });
diff --git a/src/main/ui/static/config/bdprize/bdprize.js b/src/main/ui/static/config/bdprize/bdprize.js
index d444fb858..55f608f1f 100644
--- a/src/main/ui/static/config/bdprize/bdprize.js
+++ b/src/main/ui/static/config/bdprize/bdprize.js
@@ -392,6 +392,8 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) {
                     return '/static/images/jd_sign_lg.png';
                 case 'hf':
                     return '/static/images/hf_sign_lg.png';
+                case 'Rpay':
+                    return '/static/images/royalpay_sign.png';
             }
         }
     });
diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html b/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html
index 05fd32c87..c9a2d092a 100644
--- a/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html
+++ b/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html
@@ -132,6 +132,19 @@
                 </div>
             </div>
         </div>
+        <div class="col-xs-4" ng-if="detail.RpayDetail">
+            <div class="info-box" style="background: lightcyan">
+                <div class="info-box-icon" style="    background: bottom;">
+                    <img uib-tooltip="HF" src="/static/images/royalpay_sign.png">
+                </div>
+                <div class="info-box-content">
+                    <h5>Transaction: ${{detail.RpayDetail.total_amount}}</h5>
+                    <h5>Commission: ${{detail.RpayDetail.total_prize}}</h5>
+                    <h5>Send: ${{detail.RpayDetail.send_prize}}</h5>
+                    <h5>Fund: ${{detail.RpayDetail.total_donation}}</h5>
+                </div>
+            </div>
+        </div>
     </div>
     <div class="box box-default" ng-if="!detail.no_record">
         <div class="box-header">Details<span class="text-danger">(Red Client Moniker means received from BD User who left company.)</span></div>
@@ -174,6 +187,7 @@
                         <img ng-if="log.channel=='Bestpay'" uib-tooltip="Bestpay" src="/static/images/bestpay_sign_lg.png">
                         <img ng-if="log.channel=='jd'" uib-tooltip="Bestpay" src="/static/images/jd_sign_lg.png">
                         <img ng-if="log.channel=='hf'" uib-tooltip="Bestpay" src="/static/images/hf_sign_lg.png">
+                        <img ng-if="log.channel=='Rpay'" uib-tooltip="Rpay" src="/static/images/royalpay_sign.png">
                     </td>
                 </tr>
                 </tbody>
diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
index 1ab3492ee..3a8303211 100644
--- a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
+++ b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
@@ -107,6 +107,18 @@
                     </div>
                 </div>
             </div>
+            <div class="col-xs-4" ng-if="report.RpayReport">
+                <div class="info-box" style="background: lightcyan">
+                    <div class="info-box-icon" style="    background: bottom;">
+                        <img uib-tooltip="HF" src="/static/images/royalpay_sign.png">
+                    </div>
+                    <div class="info-box-content">
+                        <h5>BD Total Commission: ${{report.RpayReport.total_prize}}</h5>
+                        <h5>BD Total Send: ${{report.RpayReport.total_send_prize}}</h5>
+                        <h5>BD Total Fund: ${{report.RpayReport.total_donation}}</h5>
+                    </div>
+                </div>
+            </div>
         </div>
         <div class="box box-default">
             <div class="box-header">BD Commission</div>
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
index 8671dcfa1..c6dabc50d 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
@@ -40,6 +40,11 @@
                         <img src="/static/images/hf_sign_lg.png">
                     </a>
                 </li>
+                <li ng-class="{active:ctrl.channel=='Rpay'}" ng-if="report.channels.Rpay">
+                    <a role="button" ng-click="ctrl.channel='Rpay';channelAndDayOfAnalysis()" title="Rpay Pay">
+                        <img src="/static/images/royalpay_sign.png">
+                    </a>
+                </li>
             </ul>
         </div>
     </div>
diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
index 7dc4e3a21..56b590d51 100644
--- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
@@ -351,6 +351,8 @@
                                          uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                     <img src="/static/images/hf_sign.png"
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
+                                    <img src="/static/images/royalpay_sign.png"
+                                         uib-tooltip="Royal Pay" ng-if="trade.channel=='Rpay'"/>
                                     {{trade.order_id}}
                                 </td>
                                 <td>

From 2478d14b6e054cc9145e3cf12b24cfb94c682710 Mon Sep 17 00:00:00 2001
From: kira <164851225@qq.com>
Date: Wed, 19 Sep 2018 16:41:37 +0800
Subject: [PATCH 027/103] rpay js check order status

---
 .../ui/static/templates/rpay/v1/payment.js    | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/main/ui/static/templates/rpay/v1/payment.js b/src/main/ui/static/templates/rpay/v1/payment.js
index dfc96b138..67b2625a3 100644
--- a/src/main/ui/static/templates/rpay/v1/payment.js
+++ b/src/main/ui/static/templates/rpay/v1/payment.js
@@ -270,7 +270,7 @@ $(function () {
                 window.RPayPlus.send("closeLoading", null, null);
                 pay(resp,function(data){
                     if(data == 'success'){
-                        location.href = '/api/v1.0/rpay/partners/' + window.client_moniker + '/orders/' + resp.mch_order_id + '/result'
+                        startCheckOrder(window.order_id, '/api/v1.0/rpay/partners/' + window.client_moniker + '/orders/' + resp.mch_order_id + '/result');
                     }else if(data == 'fail'){
                         alert('Oops,Network fluctuation,please try again later...');
                     }
@@ -423,6 +423,25 @@ $(function () {
     }
 
 
+    function startCheckOrder(orderId, url) {
+        function checkOrderStd() {
+            $.ajax({
+                       url: '/api/v1.0/payment/orders/' + orderId + '/status',
+                       method: 'GET',
+                       dataType: 'json',
+                       success: function (res) {
+                           if (res.paid) {
+                               location.href = url;
+                           } else {
+                               setTimeout(checkOrderStd, 500);
+                           }
+                       }
+                   })
+        }
+
+        checkOrderStd();
+    }
+
     function getUserId(){
         window.RPayPlus.send("getUserId", null, function(data){
             window.customerId = data;

From 158276ecffd532cf992abc647d021182dc28194d Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Wed, 19 Sep 2018 16:47:55 +0800
Subject: [PATCH 028/103] =?UTF-8?q?[fix]=E6=98=BE=E7=A4=BA=E6=80=BB?=
 =?UTF-8?q?=E5=95=86=E6=88=B7=E6=95=B0=EF=BC=8C=E5=8C=85=E6=8B=AC=E7=A6=81?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysis/core/impls/DashboardServiceImpl.java   |  5 ++++-
 .../analysis/mappers/ClientAnalysisMapper.java      |  3 +++
 .../analysis/mappers/ClientAnalysisMapper.xml       | 13 +++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
index 261626c82..ece285f7a 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
@@ -102,7 +102,10 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
         }
         JSONObject res = new JSONObject();
         res.put("new_partners", clientAnalysisMapper.countNewClients(params));
-        res.put("total_partners", clientAnalysisMapper.countClients(params));
+
+        //res.put("total_partners", clientAnalysisMapper.countClients(params));
+        // 统计所有的商户，包括禁用的
+        res.put("total_partners", clientAnalysisMapper.countClientsAll(params));
         stringRedisTemplate.boundValueOps("org_commonAnalysis3"+params.getString("org_id")+params.getString("begin")).set(res.toJSONString(), 5, TimeUnit.MINUTES);
         return res;
     }
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java
index e74edaa7b..dd4272dd2 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java
@@ -22,6 +22,9 @@ public interface ClientAnalysisMapper {
 
     int countClients(JSONObject params);
 
+    // 统计所有的商户，包括禁用的
+    int countClientsAll(JSONObject params);
+
     @AutoSql(type = SqlType.COUNT)
     @AdvanceSelect(addonWhereClause = "sub_merchant_id is not null")
     int countTotalPartners();
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
index c5462dae2..6afef4190 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
@@ -40,6 +40,19 @@
         </if>
         GROUP BY a.datelist
     </select>
+    <!--显示所有的商户，包括禁用的-->
+    <select id="countClientsAll" resultType="java.lang.Integer">
+        <![CDATA[
+        SELECT count(client_id)
+        FROM sys_clients
+        WHERE
+            create_time <= #{end} and (approve_result is null or approve_result !=0)
+        ]]>
+        <if test="org_id!=null and org_ids==null">and org_id=#{org_id}</if>
+        <if test="org_ids!=null">and org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
+    </select>
+
     <select id="countClients" resultType="java.lang.Integer">
         <![CDATA[
         SELECT count(client_id)

From 939e29a9522ac9cd1d469474c94c4efef697e122 Mon Sep 17 00:00:00 2001
From: kira <164851225@qq.com>
Date: Wed, 19 Sep 2018 17:05:33 +0800
Subject: [PATCH 029/103] update

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

diff --git a/src/main/ui/static/templates/rpay/v1/payment.js b/src/main/ui/static/templates/rpay/v1/payment.js
index 67b2625a3..7cbd9ff0a 100644
--- a/src/main/ui/static/templates/rpay/v1/payment.js
+++ b/src/main/ui/static/templates/rpay/v1/payment.js
@@ -270,7 +270,7 @@ $(function () {
                 window.RPayPlus.send("closeLoading", null, null);
                 pay(resp,function(data){
                     if(data == 'success'){
-                        startCheckOrder(window.order_id, '/api/v1.0/rpay/partners/' + window.client_moniker + '/orders/' + resp.mch_order_id + '/result');
+                        startCheckOrder(resp.mch_order_id, '/api/v1.0/rpay/partners/' + window.client_moniker + '/orders/' + resp.mch_order_id + '/result');
                     }else if(data == 'fail'){
                         alert('Oops,Network fluctuation,please try again later...');
                     }

From 2dbe7e3b69aabf1acd455328acbdca9cadeeea14 Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Wed, 19 Sep 2018 17:39:57 +0800
Subject: [PATCH 030/103] =?UTF-8?q?[fix]=E6=B7=BB=E5=8A=A0rpay+=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/static/analysis/clearing-log.js     |   4 ++--
 .../templates/settlement_transactions.html      |   4 ++--
 .../commons/services/clearingDetailService.js   |   4 ++--
 src/main/ui/static/config/bdprize/bdprize.js    |   4 ++--
 .../bdprize/templates/bd_prize_detail.html      |   4 ++--
 .../templates/bd_prize_month_report.html        |   2 +-
 src/main/ui/static/images/rpayplus.png          | Bin 0 -> 20524 bytes
 .../templates/partner_settlement_dialog.html    |   4 ++--
 .../payment/tradelog/templates/trade_logs.html  |   2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 src/main/ui/static/images/rpayplus.png

diff --git a/src/main/ui/static/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js
index 9ecebf963..d77ea8380 100644
--- a/src/main/ui/static/analysis/clearing-log.js
+++ b/src/main/ui/static/analysis/clearing-log.js
@@ -533,7 +533,7 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
                 case 'AlipayOnline':
                     return '/static/images/alipay_online.png';
                 case 'System':
-                    return '/static/images/royalpay_sign.png';
+                    return '/static/images/rpayplus.png';
                 case 'Bestpay':
                     return '/static/images/bestpay_sign_lg.png';
                 case 'Wechat':
@@ -543,7 +543,7 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
                 case 'hf':
                     return '/static/images/hf_sign_lg.png';
                 case 'Rpay':
-                    return '/static/images/royalpay_sign.png';
+                    return '/static/images/rpayplus.png';
             }
         }
     });
diff --git a/src/main/ui/static/analysis/templates/settlement_transactions.html b/src/main/ui/static/analysis/templates/settlement_transactions.html
index ddb451ebe..a305471a6 100644
--- a/src/main/ui/static/analysis/templates/settlement_transactions.html
+++ b/src/main/ui/static/analysis/templates/settlement_transactions.html
@@ -15,7 +15,7 @@
             <ul class="nav nav-pills">
                 <li ng-class="{active:ctrl.channel==null}">
                     <a role="button" ng-click="ctrl.channel=null;channelAndDayOfAnalysis()" title="All">
-                        <img src="/static/images/royalpay_sign.png" class="channel-icon-lg">
+                        <img src="/static/images/rpayplus.png" class="channel-icon-lg">
                     </a>
                 </li>
                 <li ng-class="{active:ctrl.channel=='Wechat'}" ng-if="report.channels.Wechat">
@@ -50,7 +50,7 @@
                 </li>
                 <li ng-class="{active:ctrl.channel=='Rpay'}" ng-if="report.channels.Rpay">
                     <a role="button" ng-click="ctrl.channel='Rpay';channelAndDayOfAnalysis()" title="RPAY">
-                        <img src="/static/images/royalpay_sign.png" class="channel-icon-lg">
+                        <img src="/static/images/rpayplus.png" class="channel-icon-lg">
                     </a>
                 </li>
             </ul>
diff --git a/src/main/ui/static/commons/services/clearingDetailService.js b/src/main/ui/static/commons/services/clearingDetailService.js
index bcd54527e..73de796be 100644
--- a/src/main/ui/static/commons/services/clearingDetailService.js
+++ b/src/main/ui/static/commons/services/clearingDetailService.js
@@ -51,7 +51,7 @@ define(['../app','decimal'], function (app,Decimal) {
                 case 'AlipayOnline':
                     return '/static/images/alipay_online.png';
                 case 'System':
-                    return '/static/images/royalpay_sign.png';
+                    return '/static/images/rpayplus.png';
                 case 'Bestpay':
                     return '/static/images/bestpay_sign_lg.png';
                 case 'Wechat':
@@ -61,7 +61,7 @@ define(['../app','decimal'], function (app,Decimal) {
                 case 'hf':
                     return '/static/images/hf_sign_lg.png';
                 case 'Rpay':
-                    return '/static/images/royalpay_sign.png';
+                    return '/static/images/rpayplus.png';
             }
         }
     });
diff --git a/src/main/ui/static/config/bdprize/bdprize.js b/src/main/ui/static/config/bdprize/bdprize.js
index 55f608f1f..d79cf24c4 100644
--- a/src/main/ui/static/config/bdprize/bdprize.js
+++ b/src/main/ui/static/config/bdprize/bdprize.js
@@ -383,7 +383,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) {
                 case 'AlipayOnline':
                     return '/static/images/alipay_online.png';
                 case 'System':
-                    return '/static/images/royalpay_sign.png';
+                    return '/static/images/rpayplus.png';
                 case 'Bestpay':
                     return '/static/images/bestpay_sign_lg.png';
                 case 'Wechat':
@@ -393,7 +393,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) {
                 case 'hf':
                     return '/static/images/hf_sign_lg.png';
                 case 'Rpay':
-                    return '/static/images/royalpay_sign.png';
+                    return '/static/images/rpayplus.png';
             }
         }
     });
diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html b/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html
index c9a2d092a..1e418ed94 100644
--- a/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html
+++ b/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html
@@ -135,7 +135,7 @@
         <div class="col-xs-4" ng-if="detail.RpayDetail">
             <div class="info-box" style="background: lightcyan">
                 <div class="info-box-icon" style="    background: bottom;">
-                    <img uib-tooltip="HF" src="/static/images/royalpay_sign.png">
+                    <img uib-tooltip="HF" src="/static/images/rpayplus.png">
                 </div>
                 <div class="info-box-content">
                     <h5>Transaction: ${{detail.RpayDetail.total_amount}}</h5>
@@ -187,7 +187,7 @@
                         <img ng-if="log.channel=='Bestpay'" uib-tooltip="Bestpay" src="/static/images/bestpay_sign_lg.png">
                         <img ng-if="log.channel=='jd'" uib-tooltip="Bestpay" src="/static/images/jd_sign_lg.png">
                         <img ng-if="log.channel=='hf'" uib-tooltip="Bestpay" src="/static/images/hf_sign_lg.png">
-                        <img ng-if="log.channel=='Rpay'" uib-tooltip="Rpay" src="/static/images/royalpay_sign.png">
+                        <img ng-if="log.channel=='Rpay'" uib-tooltip="Rpay" src="/static/images/rpayplus.png">
                     </td>
                 </tr>
                 </tbody>
diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
index 3a8303211..377e1386d 100644
--- a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
+++ b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
@@ -110,7 +110,7 @@
             <div class="col-xs-4" ng-if="report.RpayReport">
                 <div class="info-box" style="background: lightcyan">
                     <div class="info-box-icon" style="    background: bottom;">
-                        <img uib-tooltip="HF" src="/static/images/royalpay_sign.png">
+                        <img uib-tooltip="HF" src="/static/images/rpayplus.png">
                     </div>
                     <div class="info-box-content">
                         <h5>BD Total Commission: ${{report.RpayReport.total_prize}}</h5>
diff --git a/src/main/ui/static/images/rpayplus.png b/src/main/ui/static/images/rpayplus.png
new file mode 100644
index 0000000000000000000000000000000000000000..d23029388d467d5d7e99669b8352c52976e579cf
GIT binary patch
literal 20524
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

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
index c6dabc50d..1d1f07f0e 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
@@ -7,7 +7,7 @@
             <ul class="nav nav-pills">
                 <li ng-class="{active:ctrl.channel==null}">
                     <a role="button" ng-click="ctrl.channel=null;channelAndDayOfAnalysis()" title="All">
-                        <img src="/static/images/royalpay_sign.png">
+                        <img src="/static/images/rpayplus.png">
                     </a>
                 </li>
                 <li ng-class="{active:ctrl.channel=='Wechat'}" ng-if="report.channels.Wechat">
@@ -42,7 +42,7 @@
                 </li>
                 <li ng-class="{active:ctrl.channel=='Rpay'}" ng-if="report.channels.Rpay">
                     <a role="button" ng-click="ctrl.channel='Rpay';channelAndDayOfAnalysis()" title="Rpay Pay">
-                        <img src="/static/images/royalpay_sign.png">
+                        <img src="/static/images/rpayplus.png">
                     </a>
                 </li>
             </ul>
diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
index 56b590d51..6b33eb04a 100644
--- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
@@ -351,7 +351,7 @@
                                          uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                     <img src="/static/images/hf_sign.png"
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
-                                    <img src="/static/images/royalpay_sign.png"
+                                    <img src="/static/images/rpayplus.png"
                                          uib-tooltip="Royal Pay" ng-if="trade.channel=='Rpay'"/>
                                     {{trade.order_id}}
                                 </td>

From 5b26497cd843b1753c92cd0c935e1089aadcefc6 Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Thu, 20 Sep 2018 09:03:41 +0800
Subject: [PATCH 031/103] [fix]

---
 .../ui/static/analysis/templates/settlement_transactions.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/ui/static/analysis/templates/settlement_transactions.html b/src/main/ui/static/analysis/templates/settlement_transactions.html
index a305471a6..247848535 100644
--- a/src/main/ui/static/analysis/templates/settlement_transactions.html
+++ b/src/main/ui/static/analysis/templates/settlement_transactions.html
@@ -15,7 +15,7 @@
             <ul class="nav nav-pills">
                 <li ng-class="{active:ctrl.channel==null}">
                     <a role="button" ng-click="ctrl.channel=null;channelAndDayOfAnalysis()" title="All">
-                        <img src="/static/images/rpayplus.png" class="channel-icon-lg">
+                        <img src="/static/images/royalpay_sign.png" class="channel-icon-lg">
                     </a>
                 </li>
                 <li ng-class="{active:ctrl.channel=='Wechat'}" ng-if="report.channels.Wechat">

From 014fb0a3695c4b923b98a1ffb132efcdde14f7e8 Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Thu, 20 Sep 2018 09:23:58 +0800
Subject: [PATCH 032/103] =?UTF-8?q?[Y]=20dashboard=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E5=95=86=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysis/core/impls/DashboardServiceImpl.java   |  5 ++++-
 .../analysis/mappers/ClientAnalysisMapper.java      |  3 +++
 .../analysis/mappers/ClientAnalysisMapper.xml       | 13 +++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
index 75cff47fa..9584e26f5 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
@@ -102,7 +102,10 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
         }
         JSONObject res = new JSONObject();
         res.put("new_partners", clientAnalysisMapper.countNewClients(params));
-        res.put("total_partners", clientAnalysisMapper.countClients(params));
+
+        //res.put("total_partners", clientAnalysisMapper.countClients(params));
+        // 统计所有的商户，包括禁用的
+        res.put("total_partners", clientAnalysisMapper.countClientsAll(params));
         stringRedisTemplate.boundValueOps("org_commonAnalysis3"+params.getString("org_id")+params.getString("begin")).set(res.toJSONString(), 5, TimeUnit.MINUTES);
         return res;
     }
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java
index e74edaa7b..dd4272dd2 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java
@@ -22,6 +22,9 @@ public interface ClientAnalysisMapper {
 
     int countClients(JSONObject params);
 
+    // 统计所有的商户，包括禁用的
+    int countClientsAll(JSONObject params);
+
     @AutoSql(type = SqlType.COUNT)
     @AdvanceSelect(addonWhereClause = "sub_merchant_id is not null")
     int countTotalPartners();
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
index c5462dae2..6afef4190 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
@@ -40,6 +40,19 @@
         </if>
         GROUP BY a.datelist
     </select>
+    <!--显示所有的商户，包括禁用的-->
+    <select id="countClientsAll" resultType="java.lang.Integer">
+        <![CDATA[
+        SELECT count(client_id)
+        FROM sys_clients
+        WHERE
+            create_time <= #{end} and (approve_result is null or approve_result !=0)
+        ]]>
+        <if test="org_id!=null and org_ids==null">and org_id=#{org_id}</if>
+        <if test="org_ids!=null">and org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
+    </select>
+
     <select id="countClients" resultType="java.lang.Integer">
         <![CDATA[
         SELECT count(client_id)

From 535267fa96f6f3bb8e3e76af7605abb08ca78268 Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Thu, 20 Sep 2018 11:45:59 +0800
Subject: [PATCH 033/103] =?UTF-8?q?[fix]=E6=B7=BB=E5=8A=A0Rpay+=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysis/mappers/CustomerAndOrdersStatisticsMapper.xml   | 4 +++-
 src/main/ui/static/analysis/templates/customer_analysis.html | 2 ++
 src/main/ui/static/analysis/templates/trans_analysis.html    | 5 ++++-
 .../ui/static/analysis/templates/trans_analysis_monthly.html | 3 +++
 src/main/ui/static/commons/templates/order_detail.html       | 2 ++
 src/main/ui/static/invoice/templates/invoice_assistant.html  | 2 ++
 src/main/ui/static/payment/custom/templates/custom.html      | 2 ++
 src/main/ui/static/payment/invoice/templates/invoice.html    | 2 ++
 .../static/payment/partner/templates/partner_pay_logs.html   | 1 +
 .../ui/static/payment/tradelog/templates/balance_report.html | 2 ++
 .../payment/tradelog/templates/partner_trade_logs.html       | 1 +
 11 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml
index 361c1769b..253dcc017 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml
@@ -316,7 +316,9 @@
                 ifnull(sum(CASE WHEN s.channel = 'AlipayOnline' THEN s.total ELSE 0 END),0) alipayonlineamount,
                 ifnull(sum(CASE WHEN s.channel = 'AlipayOnline' THEN s.orders  ELSE 0 END),0) alipayonline_order_count,
                 ifnull(sum(CASE WHEN s.channel = 'hf' THEN s.total ELSE 0 END),0) hfamount,
-                ifnull(sum(CASE WHEN s.channel = 'hf' THEN s.orders ELSE 0 END),0) hf_order_count
+                ifnull(sum(CASE WHEN s.channel = 'hf' THEN s.orders ELSE 0 END),0) hf_order_count,
+                ifnull(sum(CASE WHEN s.channel = 'Rpay' THEN s.total ELSE 0 END),0) rpayamount,
+                ifnull(sum(CASE WHEN s.channel = 'Rpay' THEN s.orders ELSE 0 END),0) rpay_order_count
         FROM statistics_customer_order s
         LEFT JOIN sys_clients c ON  c.client_id = s.client_id and c.is_valid=1
         ]]>
diff --git a/src/main/ui/static/analysis/templates/customer_analysis.html b/src/main/ui/static/analysis/templates/customer_analysis.html
index d155affb3..1c54efb22 100644
--- a/src/main/ui/static/analysis/templates/customer_analysis.html
+++ b/src/main/ui/static/analysis/templates/customer_analysis.html
@@ -179,6 +179,8 @@
                                      uib-tooltip="JD Pay" ng-if="order.channel=='jd'"/>
                                 <img src="/static/images/hf_sign.png"
                                      uib-tooltip="HF Pay" ng-if="order.channel=='hf'"/>
+                                <img src="/static/images/rpayplus.png"
+                                     uib-tooltip="R Pay" ng-if="order.channel=='Rpay'"/>
                                 {{order.order_id}}
                             </td>
                             <td>{{order.short_name}}(<a class="text-primary" role="button" title="Detail"
diff --git a/src/main/ui/static/analysis/templates/trans_analysis.html b/src/main/ui/static/analysis/templates/trans_analysis.html
index 17f6b602a..22bc4a6d2 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis.html
@@ -216,9 +216,12 @@
                                 <th>
                                     <img src="/static/images/jd_sign.png"/>
                                     JD Pay:{{totalChannelAmount.jdPayAmount|currency: ' $ '}}</th>
+                                <th>
+                                    <img src="/static/images/rpayplus.png"/>
+                                    R Pay:{{totalChannelAmount.rpayamount|currency: ' $ '}}</th>
                                 <th>
                                     <img src="/static/images/hf_sign.png"/>
-                                    JD Pay:{{totalChannelAmount.hfPayAmount|currency: ' $ '}}</th>
+                                    hf Pay:{{totalChannelAmount.hfPayAmount|currency: ' $ '}}</th>
                                 &lt;!&ndash;<th>&ndash;&gt;
                                     &lt;!&ndash;<img src="/static/images/wechatpay_sign.png"/>&ndash;&gt;
                                     &lt;!&ndash;Znyoo:{{totalChannelAmount.znyooAmount|currency: ' $ '}}</th>&ndash;&gt;
diff --git a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
index c507e7de6..858b8762c 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
@@ -178,6 +178,9 @@
                                 <th>
                                     <img src="/static/images/hf_sign.png"/>
                                     JD Pay:{{totalChannelAmount.hfPayAmount|currency: ' $ '}}</th>
+                                <th>
+                                    <img src="/static/images/rpayplus.png"/>
+                                    R Pay:{{totalChannelAmount.rpayamount|currency: ' $ '}}</th>
                             </tr>
                         </table>-->
                     </div>
diff --git a/src/main/ui/static/commons/templates/order_detail.html b/src/main/ui/static/commons/templates/order_detail.html
index 748662a23..7b25d1a59 100644
--- a/src/main/ui/static/commons/templates/order_detail.html
+++ b/src/main/ui/static/commons/templates/order_detail.html
@@ -45,6 +45,8 @@
                                  uib-tooltip="JD Pay" ng-if="order.channel=='jd'"/>
                             <img src="/static/images/hf_sign.png"
                                  uib-tooltip="HF Pay" ng-if="order.channel=='hf'"/>
+                            <img src="/static/images/rpayplus.png"
+                                 uib-tooltip="R Pay" ng-if="order.channel=='Rpay'"/>
                             {{order.order_id}}
                             </td>
                         </p>
diff --git a/src/main/ui/static/invoice/templates/invoice_assistant.html b/src/main/ui/static/invoice/templates/invoice_assistant.html
index 43420b87c..136a5bdd0 100644
--- a/src/main/ui/static/invoice/templates/invoice_assistant.html
+++ b/src/main/ui/static/invoice/templates/invoice_assistant.html
@@ -206,6 +206,8 @@
                                          uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                     <img src="/static/images/hf_sign.png"
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
+                                    <img src="/static/images/rpayplus.png"
+                                         uib-tooltip="R Pay" ng-if="trade.channel=='Rpay'"/>
                                     {{trade.order_id2}}
                                 </td>
                                 <td ng-bind="trade.currency"></td>
diff --git a/src/main/ui/static/payment/custom/templates/custom.html b/src/main/ui/static/payment/custom/templates/custom.html
index 2a15a45f7..0bf23ead3 100644
--- a/src/main/ui/static/payment/custom/templates/custom.html
+++ b/src/main/ui/static/payment/custom/templates/custom.html
@@ -101,6 +101,8 @@
                                                  uib-tooltip="JD Pay" ng-if="order.channel=='jd'"/>
                                             <img src="/static/images/hf_sign.png"
                                                  uib-tooltip="HF Pay" ng-if="order.channel=='hf'"/>
+                                            <img src="/static/images/rpayplus.png"
+                                                 uib-tooltip="R Pay" ng-if="order.channel=='Rpay'"/>
                                             {{order.order_id}}
                                     </td>
                                     </p>
diff --git a/src/main/ui/static/payment/invoice/templates/invoice.html b/src/main/ui/static/payment/invoice/templates/invoice.html
index cf06b87f7..266e8d661 100644
--- a/src/main/ui/static/payment/invoice/templates/invoice.html
+++ b/src/main/ui/static/payment/invoice/templates/invoice.html
@@ -200,6 +200,8 @@
                                          uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                     <img src="/static/images/hf_sign.png"
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
+                                    <img src="/static/images/rpayplus.png"
+                                         uib-tooltip="R Pay" ng-if="trade.channel=='Rpay'"/>
                                     {{trade.order_id2}}
                                 </td>
                                 <td ng-bind="trade.currency"></td>
diff --git a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
index 0055cf480..6bcad5c56 100644
--- a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
+++ b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
@@ -185,6 +185,7 @@
                         <img src="/static/images/alipay_sign.png" uib-tooltip="AlipayOnline" ng-if="trade.channel=='AlipayOnline'"/>
                         <img src="/static/images/jd_sign.png" uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                         <img src="/static/images/hf_sign.png" uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
+                        <img src="/static/images/rpayplus.png" uib-tooltip="R Pay" ng-if="trade.channel=='Rpay'"/>
                         {{trade.order_id}}
                     </td>
                     <td>
diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html
index e373aee29..352936b65 100644
--- a/src/main/ui/static/payment/tradelog/templates/balance_report.html
+++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html
@@ -296,6 +296,8 @@
                                          uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                     <img src="/static/images/hf_sign.png"
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
+                                    <img src="/static/images/rpayplus.png"
+                                         uib-tooltip="RPay" ng-if="trade.channel=='Rpay'"/>
                                     {{trade.order_id2}}
                                 </td>
                                 <td ng-bind="trade.currency"></td>
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
index e093dd66e..b31e11469 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
@@ -322,6 +322,7 @@
                                      <img src="/static/images/alipay_sign.png" uib-tooltip="AlipayOnline" alt="AlipayOnline" ng-if="trade.channel=='AlipayOnline'"/>
                                      <img src="/static/images/jd_sign.png" uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                      <img src="/static/images/hf_sign.png" uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
+                                     <img src="/static/images/rpayplus.png" uib-tooltip="R Pay" ng-if="trade.channel=='Rpay'"/>
                                      {{trade.order_id}}
                                  </td>
                                  <td>

From dca2b18ea0a141615f7179c9575fbe45e6ee8b28 Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Thu, 20 Sep 2018 12:11:36 +0800
Subject: [PATCH 034/103] =?UTF-8?q?[fix]=E6=B7=BB=E5=8A=A0Rpay+=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysis/templates/trans_analysis.html      | 11 +++++++++++
 .../templates/trans_analysis_monthly.html       | 12 ++++++++++++
 .../static/dashboard/templates/dashboard.html   | 17 +++++++++++++++++
 3 files changed, 40 insertions(+)

diff --git a/src/main/ui/static/analysis/templates/trans_analysis.html b/src/main/ui/static/analysis/templates/trans_analysis.html
index 22bc4a6d2..57fd8db3f 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis.html
@@ -197,6 +197,17 @@
                                     </div>
                                 </div>
                             </div>
+                            <!-- Rpay+显示交易额分析，先注释掉，日后可能需要显示
+                            <div class="col-sm-2 col-xs-6">
+                                <div class="description-block">
+                                    <div class="description-header text-bold"><img src="/static/images/rpayplus.png"/>R Pay</div>
+                                    <div class="description-text text-red">
+                                        <label class="description-text"
+                                               ng-bind="totalChannelAmount.rpayamount|currency: ' $ '"></label>
+                                    </div>
+                                </div>
+                            </div>
+                            -->
                         </div>
                         <!--<table class="table">
                             <tr>
diff --git a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
index 858b8762c..be580aa13 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
@@ -157,6 +157,18 @@
                                     </div>
                                 </div>
                             </div>
+
+                            <!-- 显示Rpay+交易额分析，先注释掉，日后可能需要显示
+                            <div class="col-sm-2 col-xs-6">
+                                <div class="description-block">
+                                    <div class="description-header text-bold"><img src="/static/images/rpayplus.png"/>R Pay</div>
+                                    <div class="description-text">
+                                        <label class="description-text text-red"
+                                               ng-bind="totalChannelAmount.rpayamount|currency: ' $ '"></label>
+                                    </div>
+                                </div>
+                            </div>
+                            -->
                         </div>
                       <!--  <table class="table">
                             <tr>
diff --git a/src/main/ui/static/dashboard/templates/dashboard.html b/src/main/ui/static/dashboard/templates/dashboard.html
index 73b1c3d38..55c56f2fa 100644
--- a/src/main/ui/static/dashboard/templates/dashboard.html
+++ b/src/main/ui/static/dashboard/templates/dashboard.html
@@ -159,6 +159,23 @@
                         <div class="description-header text-bold"><img src="/static/images/hf_sign.png"/>HF</div>
                     </div>
                 </div>
+
+                <!-- dashboard显示Rpay+交易额，先注释掉，日后可能需要显示
+                <div class="col-sm-4 col-xs-6">
+                    <div class="description-block">
+                        <div class="description-text">交易额:
+                            <label class="description-text text-red"
+                                   ng-bind="totalChannelAmount.rpayamount|currency: ' $ '"></label>
+                        </div>
+                        <div class="description-text">订单数:
+                            <label class="description-text text-red"
+                                   ng-bind="totalChannelAmount.rpay_order_count"></label>
+                        </div>
+                        <div class="description-header text-bold"><img src="/static/images/rpayplus.png"/>R</div>
+                    </div>
+                </div>
+                -->
+
             </div>
         </div>
     </div>

From 7ac83ccf01d48216347d2695b299d2407d005823 Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Thu, 20 Sep 2018 13:18:15 +0800
Subject: [PATCH 035/103] rpay

---
 .../ui/static/analysis/templates/customer_analysis.html     | 2 +-
 .../static/analysis/templates/manage_customers_orders.html  | 4 +++-
 src/main/ui/static/analysis/templates/trans_analysis.html   | 4 +++-
 .../static/analysis/templates/trans_analysis_monthly.html   | 4 +++-
 .../analysis/templates/transaction_amount_Analysis.html     | 2 ++
 src/main/ui/static/commons/templates/order_detail.html      | 2 +-
 src/main/ui/static/invoice/templates/invoice_assistant.html | 2 +-
 src/main/ui/static/payment/custom/templates/custom.html     | 2 +-
 src/main/ui/static/payment/invoice/templates/invoice.html   | 2 +-
 .../static/payment/partner/templates/partner_pay_logs.html  | 6 ++++--
 .../static/payment/tradelog/templates/balance_report.html   | 6 +++---
 .../payment/tradelog/templates/partner_trade_logs.html      | 4 +++-
 .../ui/static/payment/tradelog/templates/trade_logs.html    | 4 +++-
 13 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/main/ui/static/analysis/templates/customer_analysis.html b/src/main/ui/static/analysis/templates/customer_analysis.html
index 1c54efb22..d28281419 100644
--- a/src/main/ui/static/analysis/templates/customer_analysis.html
+++ b/src/main/ui/static/analysis/templates/customer_analysis.html
@@ -180,7 +180,7 @@
                                 <img src="/static/images/hf_sign.png"
                                      uib-tooltip="HF Pay" ng-if="order.channel=='hf'"/>
                                 <img src="/static/images/rpayplus.png"
-                                     uib-tooltip="R Pay" ng-if="order.channel=='Rpay'"/>
+                                     uib-tooltip="RPay+" ng-if="order.channel=='Rpay'"/>
                                 {{order.order_id}}
                             </td>
                             <td>{{order.short_name}}(<a class="text-primary" role="button" title="Detail"
diff --git a/src/main/ui/static/analysis/templates/manage_customers_orders.html b/src/main/ui/static/analysis/templates/manage_customers_orders.html
index a8531b7d3..735431137 100644
--- a/src/main/ui/static/analysis/templates/manage_customers_orders.html
+++ b/src/main/ui/static/analysis/templates/manage_customers_orders.html
@@ -90,7 +90,9 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='jd'}"
                                                    ng-click="params.channel='jd';doAnalysis(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
-                                                   ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a>
+                                                   ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a> |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                   ng-click="params.channel='RPay';doAnalysis(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/analysis/templates/trans_analysis.html b/src/main/ui/static/analysis/templates/trans_analysis.html
index 57fd8db3f..67db5f858 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis.html
@@ -97,7 +97,9 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='jd'}"
                                                    ng-click="params.channel='jd';doAnalysis(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
-                                                   ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a>
+                                                   ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a> |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                   ng-click="params.channel='RPay';doAnalysis(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
index be580aa13..0cae44777 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
@@ -67,7 +67,9 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='jd'}"
                                                    ng-click="params.channel='jd';doAnalysis(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
-                                                   ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a>
+                                                   ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a> |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                   ng-click="params.channel='RPay';doAnalysis(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
index b23530dd5..f5fd6e838 100644
--- a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
+++ b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
@@ -32,6 +32,8 @@
                                                    ng-click="params.channel='jd';loadTradeLogs()">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
                                                    ng-click="params.channel='hf';loadTradeLogs()">HF Pay</a>
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                   ng-click="params.channel='RPay';loadTradeLogs(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/commons/templates/order_detail.html b/src/main/ui/static/commons/templates/order_detail.html
index 7b25d1a59..3184f16b2 100644
--- a/src/main/ui/static/commons/templates/order_detail.html
+++ b/src/main/ui/static/commons/templates/order_detail.html
@@ -46,7 +46,7 @@
                             <img src="/static/images/hf_sign.png"
                                  uib-tooltip="HF Pay" ng-if="order.channel=='hf'"/>
                             <img src="/static/images/rpayplus.png"
-                                 uib-tooltip="R Pay" ng-if="order.channel=='Rpay'"/>
+                                 uib-tooltip="RPay+" ng-if="order.channel=='Rpay'"/>
                             {{order.order_id}}
                             </td>
                         </p>
diff --git a/src/main/ui/static/invoice/templates/invoice_assistant.html b/src/main/ui/static/invoice/templates/invoice_assistant.html
index 136a5bdd0..a477b413a 100644
--- a/src/main/ui/static/invoice/templates/invoice_assistant.html
+++ b/src/main/ui/static/invoice/templates/invoice_assistant.html
@@ -207,7 +207,7 @@
                                     <img src="/static/images/hf_sign.png"
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
                                     <img src="/static/images/rpayplus.png"
-                                         uib-tooltip="R Pay" ng-if="trade.channel=='Rpay'"/>
+                                         uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
                                     {{trade.order_id2}}
                                 </td>
                                 <td ng-bind="trade.currency"></td>
diff --git a/src/main/ui/static/payment/custom/templates/custom.html b/src/main/ui/static/payment/custom/templates/custom.html
index 0bf23ead3..c4b3299e2 100644
--- a/src/main/ui/static/payment/custom/templates/custom.html
+++ b/src/main/ui/static/payment/custom/templates/custom.html
@@ -102,7 +102,7 @@
                                             <img src="/static/images/hf_sign.png"
                                                  uib-tooltip="HF Pay" ng-if="order.channel=='hf'"/>
                                             <img src="/static/images/rpayplus.png"
-                                                 uib-tooltip="R Pay" ng-if="order.channel=='Rpay'"/>
+                                                 uib-tooltip="RPay+" ng-if="order.channel=='Rpay'"/>
                                             {{order.order_id}}
                                     </td>
                                     </p>
diff --git a/src/main/ui/static/payment/invoice/templates/invoice.html b/src/main/ui/static/payment/invoice/templates/invoice.html
index 266e8d661..6a49339c8 100644
--- a/src/main/ui/static/payment/invoice/templates/invoice.html
+++ b/src/main/ui/static/payment/invoice/templates/invoice.html
@@ -201,7 +201,7 @@
                                     <img src="/static/images/hf_sign.png"
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
                                     <img src="/static/images/rpayplus.png"
-                                         uib-tooltip="R Pay" ng-if="trade.channel=='Rpay'"/>
+                                         uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
                                     {{trade.order_id2}}
                                 </td>
                                 <td ng-bind="trade.currency"></td>
diff --git a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
index 6bcad5c56..dd8618334 100644
--- a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
+++ b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
@@ -85,7 +85,9 @@
                         <a role="button" ng-class="{'bg-primary':params.channel=='JD'}"
                            ng-click="params.channel='JD';loadTradeLogs(1)">JDpay</a> |
                         <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
-                           ng-click="params.channel='HF';loadTradeLogs(1)">HFpay</a>
+                           ng-click="params.channel='HF';loadTradeLogs(1)">HFpay</a> |
+                        <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                           ng-click="params.channel='RPay';loadTradeLogs(1)">RPay +</a>
                     </p>
                 </div>
             </div>
@@ -185,7 +187,7 @@
                         <img src="/static/images/alipay_sign.png" uib-tooltip="AlipayOnline" ng-if="trade.channel=='AlipayOnline'"/>
                         <img src="/static/images/jd_sign.png" uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                         <img src="/static/images/hf_sign.png" uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
-                        <img src="/static/images/rpayplus.png" uib-tooltip="R Pay" ng-if="trade.channel=='Rpay'"/>
+                        <img src="/static/images/rpayplus.png" uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
                         {{trade.order_id}}
                     </td>
                     <td>
diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html
index 352936b65..2ab2afc98 100644
--- a/src/main/ui/static/payment/tradelog/templates/balance_report.html
+++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html
@@ -95,9 +95,9 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='JD'}"
                                                    ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
-                                                   ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a><!--|
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='ZNYOO'}"
-                                                   ng-click="params.channel='ZNYOO';loadTradeLogs(1)">Znyoo</a>-->
+                                                   ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a> |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                   ng-click="params.channel='RPay';loadTradeLogs(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
index b31e11469..b63e52165 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
@@ -96,6 +96,8 @@
                                                    ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
                                                    ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a>
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='Rpay'}"
+                                                   ng-click="params.channel='RPay';loadTradeLogs(1)">RPay+</a>
                                             </p>
                                         </div>
                                     </div>
@@ -322,7 +324,7 @@
                                      <img src="/static/images/alipay_sign.png" uib-tooltip="AlipayOnline" alt="AlipayOnline" ng-if="trade.channel=='AlipayOnline'"/>
                                      <img src="/static/images/jd_sign.png" uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                      <img src="/static/images/hf_sign.png" uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
-                                     <img src="/static/images/rpayplus.png" uib-tooltip="R Pay" ng-if="trade.channel=='Rpay'"/>
+                                     <img src="/static/images/rpayplus.png" uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
                                      {{trade.order_id}}
                                  </td>
                                  <td>
diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
index 6b33eb04a..4a1d0ab54 100644
--- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
@@ -133,7 +133,9 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='JD'}"
                                                    ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
-                                                   ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a>
+                                                   ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a> |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                   ng-click="params.channel='RPay';loadTradeLogs(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>

From 7c073d79b97529d5a4472205331a35c51fc79c93 Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Thu, 20 Sep 2018 13:35:24 +0800
Subject: [PATCH 036/103] rpay

---
 src/main/ui/static/images/rpayplus.png | Bin 20524 -> 1629 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/main/ui/static/images/rpayplus.png b/src/main/ui/static/images/rpayplus.png
index d23029388d467d5d7e99669b8352c52976e579cf..1350a89e2fe67c97088e46834a6a079290e67561 100644
GIT binary patch
literal 1629
zcmZ`%3rtgI6h0`EwG46N;bW6tO*TO&+&*dVNF1by%oR&1s9_FDTT0bJg^NXy4IR#C
zOniZ~hJ|cyQSb#W&LOh+egKN1(`3e|4Df}@RE)i)y*szKjhXD`-2Xr4Ki~JA@BX<P
zG-)Y8{Aqju2uhu&(&9ded*2?9YostZ12=zjqB;?vWpm(&{w=Ht!#u4Tp!_3%s%iiR
zkE-qil#&1sa{(v^z+_wf(ewm>aoL*Bbjic8%LQjx7`y}}jX*hJ)^?b&6$IOSfeDs)
z*aQhZP{zVA3v3(cYG6h+gxO&tMj02uz8Eco*FktK%xr^91fwj1*FcDqPn`Kc-X)+q
zB9s>*6d0IbdFp*xEiYmXgd(K}?0Z0o$_VbCo$^YY{z{VG7d5wzC#Z(-Ciobg;6&8H
zmTP|g>1k3s1dn>g^G*TPIXxZ|^o;(|(uD|RM}z{C(a-UnaHB^PZWSnT?Gz}H^-82c
zSro^dn=a8}iBA4@&Pk0r$F)nKL?pJ5jyHf544mRZW2D9<&2UMyE|CUH1|wndNOhg(
z*jdm1R(Fn_QRR+otVaMN%@}d)W?hW8_a6K7nYVXfq-wjT{hZra!4c=?dGGdn&vr8@
z2DkNV_QgxjxBHl6y-SvX%I*bA*~d>k-#0U{Y3|QycIdfhR|`Wf7@f;?2cLSHj(F<#
zdT;l!L(klnDhB=dT)pn@Z$(Sq%Qr^WJDK=Q23!AhQ5n_HcEx6I*EP4U5V;6&rx-kK
zXGW@ba6^}rdQV?;7glpEMHVC1adiAB%;PgzmQ_!1Ji`CaMr+f!U)9e)fFFntFTmdq
zU_3vJh>Q^mV<H8iym8>ik5E<CI-E{NO?l#Uo}Yi1s@=`BCWZP35S5H;H4(s%tf`6Q
z1;#iWF@b?Xr&H(@I$~-f8K#nGce_=u*|n7_lq3RI?|l3#H#2X3it7CIqYFE*2%uBd
z$pO8*(4d)9Tr&1Bwt1<lMBS9DhTPn|e7(tV?@nLuz}@~o%*IKRLf;F2H!P%XOU<?&
zTWhzQH5#2ZD?Kyg#^q~0*RT9`)l8C7u{<g=W_E0pOeQ(fY-~RCbBi$g;GTU=2O1Cm
zWVab@#VZ^478NXCT4=E@vzL~bhlXA}yg&Hx$%Ds_8pta*&()pio|D_t7nQMF-5@Ht
zK6sp%v*mbw>+^xQMZXmMx$VajGrlB*ojVRLYF#?K^YEkV>%Uo5_0Fy46;}s@*+;Cm
zTO<i5c}8pBfm;<XpWOWFPOgsL6n0+UvSR&2fwFwC?AVI6-}#+?up#wARHNm=ROjMP
zH}c7DllflX056coCqHR#Xz0Flw&P^iX@FVxvu0@rPIclveMl!SqK$gmL>Y=rxPh1y
zDTJg_C?<6x2_=zIVrev~ph%LxP+IpNg0;wK$zS#VgbMzqXe6X@6H1EmX}iAI1gTcN
z*`(H+Erw-;JXRSi5{gJ7T_h*U6!ILol=yc%Q9#o+DlX1$x5rvI7QV=eEh;weF`bxz
z%2POHT|ucekD^pXhEl7kkftaNLQ6ojn{A7G1LK=bQS(d|a{&z^h5U=?>LA2S9;5Rb
zv(RFs3pmKd->+#9GIb0@ZLyl@RW=j&T*cW6&2tWArM;n})*%W+GD*BtERxHmt34sZ
z2niXZlVK_6t~*vXKPjmun+V5t(wKIpHWl(M%T0I%akSMI=bN_NfV+96#bg)f#OL_r
kMN*MiDp5$}GKC^Xrp(DEmoWXCen2%yO-@rCNXlLN7ygcY`~Uy|

literal 20524
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


From a512a449faf7247c7ffbd3603d72ed0ae497243f Mon Sep 17 00:00:00 2001
From: kira <164851225@qq.com>
Date: Thu, 20 Sep 2018 13:55:33 +0800
Subject: [PATCH 037/103] rpay payment success page

---
 .../images/rpay/icon_success_red_186x186.png     | Bin 0 -> 4930 bytes
 .../static/images/{ => rpay}/rpay_horizental.png | Bin
 src/main/ui/static/templates/payment/success.css |   1 +
 3 files changed, 1 insertion(+)
 create mode 100644 src/main/ui/static/images/rpay/icon_success_red_186x186.png
 rename src/main/ui/static/images/{ => rpay}/rpay_horizental.png (100%)

diff --git a/src/main/ui/static/images/rpay/icon_success_red_186x186.png b/src/main/ui/static/images/rpay/icon_success_red_186x186.png
new file mode 100644
index 0000000000000000000000000000000000000000..340781e95141fc3211327284de8491c6ce24ca3b
GIT binary patch
literal 4930
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
M8d)0FBCf^%524%i?f?J)

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/rpay_horizental.png b/src/main/ui/static/images/rpay/rpay_horizental.png
similarity index 100%
rename from src/main/ui/static/images/rpay_horizental.png
rename to src/main/ui/static/images/rpay/rpay_horizental.png
diff --git a/src/main/ui/static/templates/payment/success.css b/src/main/ui/static/templates/payment/success.css
index 5dc8ef94b..c68ad7747 100644
--- a/src/main/ui/static/templates/payment/success.css
+++ b/src/main/ui/static/templates/payment/success.css
@@ -16,6 +16,7 @@
     border-radius: 50%;
     vertical-align: middle;
     margin-left: 8%;
+    background-color: white;
 }
 
 .pleft {

From f7d1ffb83725653d39b84d4821793bfb8a7204bc Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 20 Sep 2018 14:32:07 +0800
Subject: [PATCH 038/103] fix rpay+ icon

---
 src/main/ui/static/analysis/clearing-log.js   |   2 +-
 .../templates/manage_customers_orders.html    |   2 +-
 .../analysis/templates/trans_analysis.html    |   2 +-
 .../templates/trans_analysis_monthly.html     |   2 +-
 .../transaction_amount_Analysis.html          |   2 +-
 .../commons/services/clearingDetailService.js |   2 +-
 src/main/ui/static/config/bdprize/bdprize.js  |   2 +-
 .../bdprize/templates/bd_prize_detail.html    |   2 +-
 .../templates/bd_prize_month_report.html      |   2 +-
 src/main/ui/static/images/rpayplus.png        | Bin 1629 -> 2790 bytes
 .../partner/templates/partner_pay_logs.html   |   2 +-
 .../tradelog/templates/balance_report.html    |   2 +-
 .../templates/partner_trade_logs.html         |   2 +-
 .../tradelog/templates/trade_logs.html        |   2 +-
 14 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/ui/static/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js
index d77ea8380..5683116bd 100644
--- a/src/main/ui/static/analysis/clearing-log.js
+++ b/src/main/ui/static/analysis/clearing-log.js
@@ -533,7 +533,7 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
                 case 'AlipayOnline':
                     return '/static/images/alipay_online.png';
                 case 'System':
-                    return '/static/images/rpayplus.png';
+                    return '/static/images/royalpay_sign.png';
                 case 'Bestpay':
                     return '/static/images/bestpay_sign_lg.png';
                 case 'Wechat':
diff --git a/src/main/ui/static/analysis/templates/manage_customers_orders.html b/src/main/ui/static/analysis/templates/manage_customers_orders.html
index 735431137..531eadff2 100644
--- a/src/main/ui/static/analysis/templates/manage_customers_orders.html
+++ b/src/main/ui/static/analysis/templates/manage_customers_orders.html
@@ -92,7 +92,7 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
                                                    ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
-                                                   ng-click="params.channel='RPay';doAnalysis(1)">RPay +</a>
+                                                   ng-click="params.channel='RPAY';doAnalysis(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/analysis/templates/trans_analysis.html b/src/main/ui/static/analysis/templates/trans_analysis.html
index 67db5f858..14d91b836 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis.html
@@ -99,7 +99,7 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
                                                    ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
-                                                   ng-click="params.channel='RPay';doAnalysis(1)">RPay +</a>
+                                                   ng-click="params.channel='RPAY';doAnalysis(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
index 0cae44777..7c393b9d2 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
@@ -69,7 +69,7 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
                                                    ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
-                                                   ng-click="params.channel='RPay';doAnalysis(1)">RPay +</a>
+                                                   ng-click="params.channel='RPAY';doAnalysis(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
index f5fd6e838..6267766b8 100644
--- a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
+++ b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
@@ -33,7 +33,7 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
                                                    ng-click="params.channel='hf';loadTradeLogs()">HF Pay</a>
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
-                                                   ng-click="params.channel='RPay';loadTradeLogs(1)">RPay +</a>
+                                                   ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/commons/services/clearingDetailService.js b/src/main/ui/static/commons/services/clearingDetailService.js
index 73de796be..c77d3fe80 100644
--- a/src/main/ui/static/commons/services/clearingDetailService.js
+++ b/src/main/ui/static/commons/services/clearingDetailService.js
@@ -51,7 +51,7 @@ define(['../app','decimal'], function (app,Decimal) {
                 case 'AlipayOnline':
                     return '/static/images/alipay_online.png';
                 case 'System':
-                    return '/static/images/rpayplus.png';
+                    return '/static/images/royalpay_sign.png';
                 case 'Bestpay':
                     return '/static/images/bestpay_sign_lg.png';
                 case 'Wechat':
diff --git a/src/main/ui/static/config/bdprize/bdprize.js b/src/main/ui/static/config/bdprize/bdprize.js
index d79cf24c4..3c418044d 100644
--- a/src/main/ui/static/config/bdprize/bdprize.js
+++ b/src/main/ui/static/config/bdprize/bdprize.js
@@ -383,7 +383,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) {
                 case 'AlipayOnline':
                     return '/static/images/alipay_online.png';
                 case 'System':
-                    return '/static/images/rpayplus.png';
+                    return '/static/images/royalpay_sign.png';
                 case 'Bestpay':
                     return '/static/images/bestpay_sign_lg.png';
                 case 'Wechat':
diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html b/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html
index 1e418ed94..a97dd0384 100644
--- a/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html
+++ b/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html
@@ -135,7 +135,7 @@
         <div class="col-xs-4" ng-if="detail.RpayDetail">
             <div class="info-box" style="background: lightcyan">
                 <div class="info-box-icon" style="    background: bottom;">
-                    <img uib-tooltip="HF" src="/static/images/rpayplus.png">
+                    <img uib-tooltip="Rpay+" src="/static/images/rpayplus.png">
                 </div>
                 <div class="info-box-content">
                     <h5>Transaction: ${{detail.RpayDetail.total_amount}}</h5>
diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
index 377e1386d..213408c10 100644
--- a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
+++ b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
@@ -110,7 +110,7 @@
             <div class="col-xs-4" ng-if="report.RpayReport">
                 <div class="info-box" style="background: lightcyan">
                     <div class="info-box-icon" style="    background: bottom;">
-                        <img uib-tooltip="HF" src="/static/images/rpayplus.png">
+                        <img uib-tooltip="Rpay+" src="/static/images/rpayplus.png">
                     </div>
                     <div class="info-box-content">
                         <h5>BD Total Commission: ${{report.RpayReport.total_prize}}</h5>
diff --git a/src/main/ui/static/images/rpayplus.png b/src/main/ui/static/images/rpayplus.png
index 1350a89e2fe67c97088e46834a6a079290e67561..9b05b9b41440e9fce5252b6d740011e102333334 100644
GIT binary patch
literal 2790
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

literal 1629
zcmZ`%3rtgI6h0`EwG46N;bW6tO*TO&+&*dVNF1by%oR&1s9_FDTT0bJg^NXy4IR#C
zOniZ~hJ|cyQSb#W&LOh+egKN1(`3e|4Df}@RE)i)y*szKjhXD`-2Xr4Ki~JA@BX<P
zG-)Y8{Aqju2uhu&(&9ded*2?9YostZ12=zjqB;?vWpm(&{w=Ht!#u4Tp!_3%s%iiR
zkE-qil#&1sa{(v^z+_wf(ewm>aoL*Bbjic8%LQjx7`y}}jX*hJ)^?b&6$IOSfeDs)
z*aQhZP{zVA3v3(cYG6h+gxO&tMj02uz8Eco*FktK%xr^91fwj1*FcDqPn`Kc-X)+q
zB9s>*6d0IbdFp*xEiYmXgd(K}?0Z0o$_VbCo$^YY{z{VG7d5wzC#Z(-Ciobg;6&8H
zmTP|g>1k3s1dn>g^G*TPIXxZ|^o;(|(uD|RM}z{C(a-UnaHB^PZWSnT?Gz}H^-82c
zSro^dn=a8}iBA4@&Pk0r$F)nKL?pJ5jyHf544mRZW2D9<&2UMyE|CUH1|wndNOhg(
z*jdm1R(Fn_QRR+otVaMN%@}d)W?hW8_a6K7nYVXfq-wjT{hZra!4c=?dGGdn&vr8@
z2DkNV_QgxjxBHl6y-SvX%I*bA*~d>k-#0U{Y3|QycIdfhR|`Wf7@f;?2cLSHj(F<#
zdT;l!L(klnDhB=dT)pn@Z$(Sq%Qr^WJDK=Q23!AhQ5n_HcEx6I*EP4U5V;6&rx-kK
zXGW@ba6^}rdQV?;7glpEMHVC1adiAB%;PgzmQ_!1Ji`CaMr+f!U)9e)fFFntFTmdq
zU_3vJh>Q^mV<H8iym8>ik5E<CI-E{NO?l#Uo}Yi1s@=`BCWZP35S5H;H4(s%tf`6Q
z1;#iWF@b?Xr&H(@I$~-f8K#nGce_=u*|n7_lq3RI?|l3#H#2X3it7CIqYFE*2%uBd
z$pO8*(4d)9Tr&1Bwt1<lMBS9DhTPn|e7(tV?@nLuz}@~o%*IKRLf;F2H!P%XOU<?&
zTWhzQH5#2ZD?Kyg#^q~0*RT9`)l8C7u{<g=W_E0pOeQ(fY-~RCbBi$g;GTU=2O1Cm
zWVab@#VZ^478NXCT4=E@vzL~bhlXA}yg&Hx$%Ds_8pta*&()pio|D_t7nQMF-5@Ht
zK6sp%v*mbw>+^xQMZXmMx$VajGrlB*ojVRLYF#?K^YEkV>%Uo5_0Fy46;}s@*+;Cm
zTO<i5c}8pBfm;<XpWOWFPOgsL6n0+UvSR&2fwFwC?AVI6-}#+?up#wARHNm=ROjMP
zH}c7DllflX056coCqHR#Xz0Flw&P^iX@FVxvu0@rPIclveMl!SqK$gmL>Y=rxPh1y
zDTJg_C?<6x2_=zIVrev~ph%LxP+IpNg0;wK$zS#VgbMzqXe6X@6H1EmX}iAI1gTcN
z*`(H+Erw-;JXRSi5{gJ7T_h*U6!ILol=yc%Q9#o+DlX1$x5rvI7QV=eEh;weF`bxz
z%2POHT|ucekD^pXhEl7kkftaNLQ6ojn{A7G1LK=bQS(d|a{&z^h5U=?>LA2S9;5Rb
zv(RFs3pmKd->+#9GIb0@ZLyl@RW=j&T*cW6&2tWArM;n})*%W+GD*BtERxHmt34sZ
z2niXZlVK_6t~*vXKPjmun+V5t(wKIpHWl(M%T0I%akSMI=bN_NfV+96#bg)f#OL_r
kMN*MiDp5$}GKC^Xrp(DEmoWXCen2%yO-@rCNXlLN7ygcY`~Uy|

diff --git a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
index dd8618334..0939919a9 100644
--- a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
+++ b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
@@ -87,7 +87,7 @@
                         <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
                            ng-click="params.channel='HF';loadTradeLogs(1)">HFpay</a> |
                         <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
-                           ng-click="params.channel='RPay';loadTradeLogs(1)">RPay +</a>
+                           ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +</a>
                     </p>
                 </div>
             </div>
diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html
index 2ab2afc98..7d5d17fe9 100644
--- a/src/main/ui/static/payment/tradelog/templates/balance_report.html
+++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html
@@ -97,7 +97,7 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
                                                    ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
-                                                   ng-click="params.channel='RPay';loadTradeLogs(1)">RPay +</a>
+                                                   ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
index b63e52165..efb867200 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
@@ -97,7 +97,7 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
                                                    ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a>
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='Rpay'}"
-                                                   ng-click="params.channel='RPay';loadTradeLogs(1)">RPay+</a>
+                                                   ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay+</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
index 4a1d0ab54..13496d1a2 100644
--- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
@@ -135,7 +135,7 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
                                                    ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
-                                                   ng-click="params.channel='RPay';loadTradeLogs(1)">RPay +</a>
+                                                   ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>

From 27343d11b511ef47e073e126c24f6640364ab43f Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 20 Sep 2018 14:38:05 +0800
Subject: [PATCH 039/103] fix rpay+ icon

---
 src/main/ui/static/analysis/clearing-log.js   |   2 +-
 .../templates/manage_customers_orders.html    |   2 +-
 .../analysis/templates/trans_analysis.html    |   2 +-
 .../templates/trans_analysis_monthly.html     |   2 +-
 .../transaction_amount_Analysis.html          |   2 +-
 .../commons/services/clearingDetailService.js |   2 +-
 src/main/ui/static/config/bdprize/bdprize.js  |   2 +-
 .../bdprize/templates/bd_prize_detail.html    |   2 +-
 .../templates/bd_prize_month_report.html      |   2 +-
 src/main/ui/static/images/rpayplus.png        | Bin 1629 -> 2790 bytes
 .../partner/templates/partner_pay_logs.html   |   2 +-
 .../tradelog/templates/balance_report.html    |   2 +-
 .../templates/partner_trade_logs.html         |   2 +-
 .../tradelog/templates/trade_logs.html        |   2 +-
 14 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/ui/static/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js
index d77ea8380..5683116bd 100644
--- a/src/main/ui/static/analysis/clearing-log.js
+++ b/src/main/ui/static/analysis/clearing-log.js
@@ -533,7 +533,7 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
                 case 'AlipayOnline':
                     return '/static/images/alipay_online.png';
                 case 'System':
-                    return '/static/images/rpayplus.png';
+                    return '/static/images/royalpay_sign.png';
                 case 'Bestpay':
                     return '/static/images/bestpay_sign_lg.png';
                 case 'Wechat':
diff --git a/src/main/ui/static/analysis/templates/manage_customers_orders.html b/src/main/ui/static/analysis/templates/manage_customers_orders.html
index 735431137..531eadff2 100644
--- a/src/main/ui/static/analysis/templates/manage_customers_orders.html
+++ b/src/main/ui/static/analysis/templates/manage_customers_orders.html
@@ -92,7 +92,7 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
                                                    ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
-                                                   ng-click="params.channel='RPay';doAnalysis(1)">RPay +</a>
+                                                   ng-click="params.channel='RPAY';doAnalysis(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/analysis/templates/trans_analysis.html b/src/main/ui/static/analysis/templates/trans_analysis.html
index 67db5f858..14d91b836 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis.html
@@ -99,7 +99,7 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
                                                    ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
-                                                   ng-click="params.channel='RPay';doAnalysis(1)">RPay +</a>
+                                                   ng-click="params.channel='RPAY';doAnalysis(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
index 0cae44777..7c393b9d2 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
@@ -69,7 +69,7 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
                                                    ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
-                                                   ng-click="params.channel='RPay';doAnalysis(1)">RPay +</a>
+                                                   ng-click="params.channel='RPAY';doAnalysis(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
index f5fd6e838..6267766b8 100644
--- a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
+++ b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
@@ -33,7 +33,7 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
                                                    ng-click="params.channel='hf';loadTradeLogs()">HF Pay</a>
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
-                                                   ng-click="params.channel='RPay';loadTradeLogs(1)">RPay +</a>
+                                                   ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/commons/services/clearingDetailService.js b/src/main/ui/static/commons/services/clearingDetailService.js
index 73de796be..c77d3fe80 100644
--- a/src/main/ui/static/commons/services/clearingDetailService.js
+++ b/src/main/ui/static/commons/services/clearingDetailService.js
@@ -51,7 +51,7 @@ define(['../app','decimal'], function (app,Decimal) {
                 case 'AlipayOnline':
                     return '/static/images/alipay_online.png';
                 case 'System':
-                    return '/static/images/rpayplus.png';
+                    return '/static/images/royalpay_sign.png';
                 case 'Bestpay':
                     return '/static/images/bestpay_sign_lg.png';
                 case 'Wechat':
diff --git a/src/main/ui/static/config/bdprize/bdprize.js b/src/main/ui/static/config/bdprize/bdprize.js
index d79cf24c4..3c418044d 100644
--- a/src/main/ui/static/config/bdprize/bdprize.js
+++ b/src/main/ui/static/config/bdprize/bdprize.js
@@ -383,7 +383,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) {
                 case 'AlipayOnline':
                     return '/static/images/alipay_online.png';
                 case 'System':
-                    return '/static/images/rpayplus.png';
+                    return '/static/images/royalpay_sign.png';
                 case 'Bestpay':
                     return '/static/images/bestpay_sign_lg.png';
                 case 'Wechat':
diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html b/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html
index 1e418ed94..a97dd0384 100644
--- a/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html
+++ b/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html
@@ -135,7 +135,7 @@
         <div class="col-xs-4" ng-if="detail.RpayDetail">
             <div class="info-box" style="background: lightcyan">
                 <div class="info-box-icon" style="    background: bottom;">
-                    <img uib-tooltip="HF" src="/static/images/rpayplus.png">
+                    <img uib-tooltip="Rpay+" src="/static/images/rpayplus.png">
                 </div>
                 <div class="info-box-content">
                     <h5>Transaction: ${{detail.RpayDetail.total_amount}}</h5>
diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
index 377e1386d..213408c10 100644
--- a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
+++ b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
@@ -110,7 +110,7 @@
             <div class="col-xs-4" ng-if="report.RpayReport">
                 <div class="info-box" style="background: lightcyan">
                     <div class="info-box-icon" style="    background: bottom;">
-                        <img uib-tooltip="HF" src="/static/images/rpayplus.png">
+                        <img uib-tooltip="Rpay+" src="/static/images/rpayplus.png">
                     </div>
                     <div class="info-box-content">
                         <h5>BD Total Commission: ${{report.RpayReport.total_prize}}</h5>
diff --git a/src/main/ui/static/images/rpayplus.png b/src/main/ui/static/images/rpayplus.png
index 1350a89e2fe67c97088e46834a6a079290e67561..9b05b9b41440e9fce5252b6d740011e102333334 100644
GIT binary patch
literal 2790
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

literal 1629
zcmZ`%3rtgI6h0`EwG46N;bW6tO*TO&+&*dVNF1by%oR&1s9_FDTT0bJg^NXy4IR#C
zOniZ~hJ|cyQSb#W&LOh+egKN1(`3e|4Df}@RE)i)y*szKjhXD`-2Xr4Ki~JA@BX<P
zG-)Y8{Aqju2uhu&(&9ded*2?9YostZ12=zjqB;?vWpm(&{w=Ht!#u4Tp!_3%s%iiR
zkE-qil#&1sa{(v^z+_wf(ewm>aoL*Bbjic8%LQjx7`y}}jX*hJ)^?b&6$IOSfeDs)
z*aQhZP{zVA3v3(cYG6h+gxO&tMj02uz8Eco*FktK%xr^91fwj1*FcDqPn`Kc-X)+q
zB9s>*6d0IbdFp*xEiYmXgd(K}?0Z0o$_VbCo$^YY{z{VG7d5wzC#Z(-Ciobg;6&8H
zmTP|g>1k3s1dn>g^G*TPIXxZ|^o;(|(uD|RM}z{C(a-UnaHB^PZWSnT?Gz}H^-82c
zSro^dn=a8}iBA4@&Pk0r$F)nKL?pJ5jyHf544mRZW2D9<&2UMyE|CUH1|wndNOhg(
z*jdm1R(Fn_QRR+otVaMN%@}d)W?hW8_a6K7nYVXfq-wjT{hZra!4c=?dGGdn&vr8@
z2DkNV_QgxjxBHl6y-SvX%I*bA*~d>k-#0U{Y3|QycIdfhR|`Wf7@f;?2cLSHj(F<#
zdT;l!L(klnDhB=dT)pn@Z$(Sq%Qr^WJDK=Q23!AhQ5n_HcEx6I*EP4U5V;6&rx-kK
zXGW@ba6^}rdQV?;7glpEMHVC1adiAB%;PgzmQ_!1Ji`CaMr+f!U)9e)fFFntFTmdq
zU_3vJh>Q^mV<H8iym8>ik5E<CI-E{NO?l#Uo}Yi1s@=`BCWZP35S5H;H4(s%tf`6Q
z1;#iWF@b?Xr&H(@I$~-f8K#nGce_=u*|n7_lq3RI?|l3#H#2X3it7CIqYFE*2%uBd
z$pO8*(4d)9Tr&1Bwt1<lMBS9DhTPn|e7(tV?@nLuz}@~o%*IKRLf;F2H!P%XOU<?&
zTWhzQH5#2ZD?Kyg#^q~0*RT9`)l8C7u{<g=W_E0pOeQ(fY-~RCbBi$g;GTU=2O1Cm
zWVab@#VZ^478NXCT4=E@vzL~bhlXA}yg&Hx$%Ds_8pta*&()pio|D_t7nQMF-5@Ht
zK6sp%v*mbw>+^xQMZXmMx$VajGrlB*ojVRLYF#?K^YEkV>%Uo5_0Fy46;}s@*+;Cm
zTO<i5c}8pBfm;<XpWOWFPOgsL6n0+UvSR&2fwFwC?AVI6-}#+?up#wARHNm=ROjMP
zH}c7DllflX056coCqHR#Xz0Flw&P^iX@FVxvu0@rPIclveMl!SqK$gmL>Y=rxPh1y
zDTJg_C?<6x2_=zIVrev~ph%LxP+IpNg0;wK$zS#VgbMzqXe6X@6H1EmX}iAI1gTcN
z*`(H+Erw-;JXRSi5{gJ7T_h*U6!ILol=yc%Q9#o+DlX1$x5rvI7QV=eEh;weF`bxz
z%2POHT|ucekD^pXhEl7kkftaNLQ6ojn{A7G1LK=bQS(d|a{&z^h5U=?>LA2S9;5Rb
zv(RFs3pmKd->+#9GIb0@ZLyl@RW=j&T*cW6&2tWArM;n})*%W+GD*BtERxHmt34sZ
z2niXZlVK_6t~*vXKPjmun+V5t(wKIpHWl(M%T0I%akSMI=bN_NfV+96#bg)f#OL_r
kMN*MiDp5$}GKC^Xrp(DEmoWXCen2%yO-@rCNXlLN7ygcY`~Uy|

diff --git a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
index dd8618334..0939919a9 100644
--- a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
+++ b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
@@ -87,7 +87,7 @@
                         <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
                            ng-click="params.channel='HF';loadTradeLogs(1)">HFpay</a> |
                         <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
-                           ng-click="params.channel='RPay';loadTradeLogs(1)">RPay +</a>
+                           ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +</a>
                     </p>
                 </div>
             </div>
diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html
index 2ab2afc98..7d5d17fe9 100644
--- a/src/main/ui/static/payment/tradelog/templates/balance_report.html
+++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html
@@ -97,7 +97,7 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
                                                    ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
-                                                   ng-click="params.channel='RPay';loadTradeLogs(1)">RPay +</a>
+                                                   ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
index b63e52165..efb867200 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
@@ -97,7 +97,7 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
                                                    ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a>
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='Rpay'}"
-                                                   ng-click="params.channel='RPay';loadTradeLogs(1)">RPay+</a>
+                                                   ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay+</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
index 4a1d0ab54..13496d1a2 100644
--- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
@@ -135,7 +135,7 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
                                                    ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
-                                                   ng-click="params.channel='RPay';loadTradeLogs(1)">RPay +</a>
+                                                   ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>

From f6ebe3f6ad7d07c5354eb56ee6b83bce9b6b3bbc Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 20 Sep 2018 14:49:37 +0800
Subject: [PATCH 040/103] fix rpay+ icon

---
 src/main/ui/static/analysis/clearing-log.js      |   2 +-
 .../analysis/templates/customer_analysis.html    |   2 +-
 .../templates/settlement_transactions.html       |   2 +-
 .../commons/services/clearingDetailService.js    |   2 +-
 .../static/commons/templates/order_detail.html   |   2 +-
 src/main/ui/static/config/bdprize/bdprize.js     |   2 +-
 .../bdprize/templates/bd_prize_detail.html       |   4 ++--
 .../bdprize/templates/bd_prize_month_report.html |   2 +-
 src/main/ui/static/images/rpayplus_sign.png      | Bin 0 -> 1629 bytes
 .../{rpayplus.png => rpayplus_sign_lg.png}       | Bin
 .../invoice/templates/invoice_assistant.html     |   2 +-
 .../static/payment/custom/templates/custom.html  |   2 +-
 .../payment/invoice/templates/invoice.html       |   2 +-
 .../partner/templates/partner_pay_logs.html      |   2 +-
 .../tradelog/templates/balance_report.html       |   2 +-
 .../templates/partner_settlement_dialog.html     |   4 ++--
 .../tradelog/templates/partner_trade_logs.html   |   2 +-
 .../payment/tradelog/templates/trade_logs.html   |   2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100644 src/main/ui/static/images/rpayplus_sign.png
 rename src/main/ui/static/images/{rpayplus.png => rpayplus_sign_lg.png} (100%)

diff --git a/src/main/ui/static/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js
index 5683116bd..e610c6ee9 100644
--- a/src/main/ui/static/analysis/clearing-log.js
+++ b/src/main/ui/static/analysis/clearing-log.js
@@ -543,7 +543,7 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
                 case 'hf':
                     return '/static/images/hf_sign_lg.png';
                 case 'Rpay':
-                    return '/static/images/rpayplus.png';
+                    return '/static/images/rpayplus_sign_lg.png';
             }
         }
     });
diff --git a/src/main/ui/static/analysis/templates/customer_analysis.html b/src/main/ui/static/analysis/templates/customer_analysis.html
index d28281419..db731d054 100644
--- a/src/main/ui/static/analysis/templates/customer_analysis.html
+++ b/src/main/ui/static/analysis/templates/customer_analysis.html
@@ -179,7 +179,7 @@
                                      uib-tooltip="JD Pay" ng-if="order.channel=='jd'"/>
                                 <img src="/static/images/hf_sign.png"
                                      uib-tooltip="HF Pay" ng-if="order.channel=='hf'"/>
-                                <img src="/static/images/rpayplus.png"
+                                <img src="/static/images/rpayplus_sign.png"
                                      uib-tooltip="RPay+" ng-if="order.channel=='Rpay'"/>
                                 {{order.order_id}}
                             </td>
diff --git a/src/main/ui/static/analysis/templates/settlement_transactions.html b/src/main/ui/static/analysis/templates/settlement_transactions.html
index 247848535..7f19fc00e 100644
--- a/src/main/ui/static/analysis/templates/settlement_transactions.html
+++ b/src/main/ui/static/analysis/templates/settlement_transactions.html
@@ -50,7 +50,7 @@
                 </li>
                 <li ng-class="{active:ctrl.channel=='Rpay'}" ng-if="report.channels.Rpay">
                     <a role="button" ng-click="ctrl.channel='Rpay';channelAndDayOfAnalysis()" title="RPAY">
-                        <img src="/static/images/rpayplus.png" class="channel-icon-lg">
+                        <img src="/static/images/rpayplus_sign_lg.png" class="channel-icon-lg">
                     </a>
                 </li>
             </ul>
diff --git a/src/main/ui/static/commons/services/clearingDetailService.js b/src/main/ui/static/commons/services/clearingDetailService.js
index c77d3fe80..fc23d7390 100644
--- a/src/main/ui/static/commons/services/clearingDetailService.js
+++ b/src/main/ui/static/commons/services/clearingDetailService.js
@@ -61,7 +61,7 @@ define(['../app','decimal'], function (app,Decimal) {
                 case 'hf':
                     return '/static/images/hf_sign_lg.png';
                 case 'Rpay':
-                    return '/static/images/rpayplus.png';
+                    return '/static/images/rpayplus_sign_lg.png';
             }
         }
     });
diff --git a/src/main/ui/static/commons/templates/order_detail.html b/src/main/ui/static/commons/templates/order_detail.html
index 3184f16b2..3c63f639c 100644
--- a/src/main/ui/static/commons/templates/order_detail.html
+++ b/src/main/ui/static/commons/templates/order_detail.html
@@ -45,7 +45,7 @@
                                  uib-tooltip="JD Pay" ng-if="order.channel=='jd'"/>
                             <img src="/static/images/hf_sign.png"
                                  uib-tooltip="HF Pay" ng-if="order.channel=='hf'"/>
-                            <img src="/static/images/rpayplus.png"
+                            <img src="/static/images/rpayplus_sign.png"
                                  uib-tooltip="RPay+" ng-if="order.channel=='Rpay'"/>
                             {{order.order_id}}
                             </td>
diff --git a/src/main/ui/static/config/bdprize/bdprize.js b/src/main/ui/static/config/bdprize/bdprize.js
index 3c418044d..6b5fa2f4c 100644
--- a/src/main/ui/static/config/bdprize/bdprize.js
+++ b/src/main/ui/static/config/bdprize/bdprize.js
@@ -393,7 +393,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) {
                 case 'hf':
                     return '/static/images/hf_sign_lg.png';
                 case 'Rpay':
-                    return '/static/images/rpayplus.png';
+                    return '/static/images/rpayplus_sign_lg.png';
             }
         }
     });
diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html b/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html
index a97dd0384..5c49583b6 100644
--- a/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html
+++ b/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html
@@ -135,7 +135,7 @@
         <div class="col-xs-4" ng-if="detail.RpayDetail">
             <div class="info-box" style="background: lightcyan">
                 <div class="info-box-icon" style="    background: bottom;">
-                    <img uib-tooltip="Rpay+" src="/static/images/rpayplus.png">
+                    <img uib-tooltip="Rpay+" src="/static/images/rpayplus_sign_lg.png">
                 </div>
                 <div class="info-box-content">
                     <h5>Transaction: ${{detail.RpayDetail.total_amount}}</h5>
@@ -187,7 +187,7 @@
                         <img ng-if="log.channel=='Bestpay'" uib-tooltip="Bestpay" src="/static/images/bestpay_sign_lg.png">
                         <img ng-if="log.channel=='jd'" uib-tooltip="Bestpay" src="/static/images/jd_sign_lg.png">
                         <img ng-if="log.channel=='hf'" uib-tooltip="Bestpay" src="/static/images/hf_sign_lg.png">
-                        <img ng-if="log.channel=='Rpay'" uib-tooltip="Rpay" src="/static/images/rpayplus.png">
+                        <img ng-if="log.channel=='Rpay'" uib-tooltip="Rpay" src="/static/images/rpayplus_sign_lg.png">
                     </td>
                 </tr>
                 </tbody>
diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
index 213408c10..4d314367a 100644
--- a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
+++ b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
@@ -110,7 +110,7 @@
             <div class="col-xs-4" ng-if="report.RpayReport">
                 <div class="info-box" style="background: lightcyan">
                     <div class="info-box-icon" style="    background: bottom;">
-                        <img uib-tooltip="Rpay+" src="/static/images/rpayplus.png">
+                        <img uib-tooltip="Rpay+" src="/static/images/rpayplus_sign_lg.png">
                     </div>
                     <div class="info-box-content">
                         <h5>BD Total Commission: ${{report.RpayReport.total_prize}}</h5>
diff --git a/src/main/ui/static/images/rpayplus_sign.png b/src/main/ui/static/images/rpayplus_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..1350a89e2fe67c97088e46834a6a079290e67561
GIT binary patch
literal 1629
zcmZ`%3rtgI6h0`EwG46N;bW6tO*TO&+&*dVNF1by%oR&1s9_FDTT0bJg^NXy4IR#C
zOniZ~hJ|cyQSb#W&LOh+egKN1(`3e|4Df}@RE)i)y*szKjhXD`-2Xr4Ki~JA@BX<P
zG-)Y8{Aqju2uhu&(&9ded*2?9YostZ12=zjqB;?vWpm(&{w=Ht!#u4Tp!_3%s%iiR
zkE-qil#&1sa{(v^z+_wf(ewm>aoL*Bbjic8%LQjx7`y}}jX*hJ)^?b&6$IOSfeDs)
z*aQhZP{zVA3v3(cYG6h+gxO&tMj02uz8Eco*FktK%xr^91fwj1*FcDqPn`Kc-X)+q
zB9s>*6d0IbdFp*xEiYmXgd(K}?0Z0o$_VbCo$^YY{z{VG7d5wzC#Z(-Ciobg;6&8H
zmTP|g>1k3s1dn>g^G*TPIXxZ|^o;(|(uD|RM}z{C(a-UnaHB^PZWSnT?Gz}H^-82c
zSro^dn=a8}iBA4@&Pk0r$F)nKL?pJ5jyHf544mRZW2D9<&2UMyE|CUH1|wndNOhg(
z*jdm1R(Fn_QRR+otVaMN%@}d)W?hW8_a6K7nYVXfq-wjT{hZra!4c=?dGGdn&vr8@
z2DkNV_QgxjxBHl6y-SvX%I*bA*~d>k-#0U{Y3|QycIdfhR|`Wf7@f;?2cLSHj(F<#
zdT;l!L(klnDhB=dT)pn@Z$(Sq%Qr^WJDK=Q23!AhQ5n_HcEx6I*EP4U5V;6&rx-kK
zXGW@ba6^}rdQV?;7glpEMHVC1adiAB%;PgzmQ_!1Ji`CaMr+f!U)9e)fFFntFTmdq
zU_3vJh>Q^mV<H8iym8>ik5E<CI-E{NO?l#Uo}Yi1s@=`BCWZP35S5H;H4(s%tf`6Q
z1;#iWF@b?Xr&H(@I$~-f8K#nGce_=u*|n7_lq3RI?|l3#H#2X3it7CIqYFE*2%uBd
z$pO8*(4d)9Tr&1Bwt1<lMBS9DhTPn|e7(tV?@nLuz}@~o%*IKRLf;F2H!P%XOU<?&
zTWhzQH5#2ZD?Kyg#^q~0*RT9`)l8C7u{<g=W_E0pOeQ(fY-~RCbBi$g;GTU=2O1Cm
zWVab@#VZ^478NXCT4=E@vzL~bhlXA}yg&Hx$%Ds_8pta*&()pio|D_t7nQMF-5@Ht
zK6sp%v*mbw>+^xQMZXmMx$VajGrlB*ojVRLYF#?K^YEkV>%Uo5_0Fy46;}s@*+;Cm
zTO<i5c}8pBfm;<XpWOWFPOgsL6n0+UvSR&2fwFwC?AVI6-}#+?up#wARHNm=ROjMP
zH}c7DllflX056coCqHR#Xz0Flw&P^iX@FVxvu0@rPIclveMl!SqK$gmL>Y=rxPh1y
zDTJg_C?<6x2_=zIVrev~ph%LxP+IpNg0;wK$zS#VgbMzqXe6X@6H1EmX}iAI1gTcN
z*`(H+Erw-;JXRSi5{gJ7T_h*U6!ILol=yc%Q9#o+DlX1$x5rvI7QV=eEh;weF`bxz
z%2POHT|ucekD^pXhEl7kkftaNLQ6ojn{A7G1LK=bQS(d|a{&z^h5U=?>LA2S9;5Rb
zv(RFs3pmKd->+#9GIb0@ZLyl@RW=j&T*cW6&2tWArM;n})*%W+GD*BtERxHmt34sZ
z2niXZlVK_6t~*vXKPjmun+V5t(wKIpHWl(M%T0I%akSMI=bN_NfV+96#bg)f#OL_r
kMN*MiDp5$}GKC^Xrp(DEmoWXCen2%yO-@rCNXlLN7ygcY`~Uy|

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/rpayplus.png b/src/main/ui/static/images/rpayplus_sign_lg.png
similarity index 100%
rename from src/main/ui/static/images/rpayplus.png
rename to src/main/ui/static/images/rpayplus_sign_lg.png
diff --git a/src/main/ui/static/invoice/templates/invoice_assistant.html b/src/main/ui/static/invoice/templates/invoice_assistant.html
index a477b413a..d00a3a693 100644
--- a/src/main/ui/static/invoice/templates/invoice_assistant.html
+++ b/src/main/ui/static/invoice/templates/invoice_assistant.html
@@ -206,7 +206,7 @@
                                          uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                     <img src="/static/images/hf_sign.png"
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
-                                    <img src="/static/images/rpayplus.png"
+                                    <img src="/static/images/rpayplus_sign.png"
                                          uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
                                     {{trade.order_id2}}
                                 </td>
diff --git a/src/main/ui/static/payment/custom/templates/custom.html b/src/main/ui/static/payment/custom/templates/custom.html
index c4b3299e2..c3e911d21 100644
--- a/src/main/ui/static/payment/custom/templates/custom.html
+++ b/src/main/ui/static/payment/custom/templates/custom.html
@@ -101,7 +101,7 @@
                                                  uib-tooltip="JD Pay" ng-if="order.channel=='jd'"/>
                                             <img src="/static/images/hf_sign.png"
                                                  uib-tooltip="HF Pay" ng-if="order.channel=='hf'"/>
-                                            <img src="/static/images/rpayplus.png"
+                                            <img src="/static/images/rpayplus_sign.png"
                                                  uib-tooltip="RPay+" ng-if="order.channel=='Rpay'"/>
                                             {{order.order_id}}
                                     </td>
diff --git a/src/main/ui/static/payment/invoice/templates/invoice.html b/src/main/ui/static/payment/invoice/templates/invoice.html
index 6a49339c8..a26005322 100644
--- a/src/main/ui/static/payment/invoice/templates/invoice.html
+++ b/src/main/ui/static/payment/invoice/templates/invoice.html
@@ -200,7 +200,7 @@
                                          uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                     <img src="/static/images/hf_sign.png"
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
-                                    <img src="/static/images/rpayplus.png"
+                                    <img src="/static/images/rpayplus_sign.png"
                                          uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
                                     {{trade.order_id2}}
                                 </td>
diff --git a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
index 0939919a9..fc92231f4 100644
--- a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
+++ b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
@@ -187,7 +187,7 @@
                         <img src="/static/images/alipay_sign.png" uib-tooltip="AlipayOnline" ng-if="trade.channel=='AlipayOnline'"/>
                         <img src="/static/images/jd_sign.png" uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                         <img src="/static/images/hf_sign.png" uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
-                        <img src="/static/images/rpayplus.png" uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
+                        <img src="/static/images/rpayplus_sign.png" uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
                         {{trade.order_id}}
                     </td>
                     <td>
diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html
index 7d5d17fe9..412309d68 100644
--- a/src/main/ui/static/payment/tradelog/templates/balance_report.html
+++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html
@@ -296,7 +296,7 @@
                                          uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                     <img src="/static/images/hf_sign.png"
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
-                                    <img src="/static/images/rpayplus.png"
+                                    <img src="/static/images/rpayplus_sign.png"
                                          uib-tooltip="RPay" ng-if="trade.channel=='Rpay'"/>
                                     {{trade.order_id2}}
                                 </td>
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
index 1d1f07f0e..527e66e50 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
@@ -7,7 +7,7 @@
             <ul class="nav nav-pills">
                 <li ng-class="{active:ctrl.channel==null}">
                     <a role="button" ng-click="ctrl.channel=null;channelAndDayOfAnalysis()" title="All">
-                        <img src="/static/images/rpayplus.png">
+                        <img src="/static/images/rpayplus_sign_lg.png">
                     </a>
                 </li>
                 <li ng-class="{active:ctrl.channel=='Wechat'}" ng-if="report.channels.Wechat">
@@ -42,7 +42,7 @@
                 </li>
                 <li ng-class="{active:ctrl.channel=='Rpay'}" ng-if="report.channels.Rpay">
                     <a role="button" ng-click="ctrl.channel='Rpay';channelAndDayOfAnalysis()" title="Rpay Pay">
-                        <img src="/static/images/rpayplus.png">
+                        <img src="/static/images/rpayplus_sign_lg.png">
                     </a>
                 </li>
             </ul>
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
index efb867200..4d1b06b1a 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
@@ -324,7 +324,7 @@
                                      <img src="/static/images/alipay_sign.png" uib-tooltip="AlipayOnline" alt="AlipayOnline" ng-if="trade.channel=='AlipayOnline'"/>
                                      <img src="/static/images/jd_sign.png" uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                      <img src="/static/images/hf_sign.png" uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
-                                     <img src="/static/images/rpayplus.png" uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
+                                     <img src="/static/images/rpayplus_sign.png" uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
                                      {{trade.order_id}}
                                  </td>
                                  <td>
diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
index 13496d1a2..38cc5ba87 100644
--- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
@@ -353,7 +353,7 @@
                                          uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                     <img src="/static/images/hf_sign.png"
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
-                                    <img src="/static/images/rpayplus.png"
+                                    <img src="/static/images/rpayplus_sign.png"
                                          uib-tooltip="Royal Pay" ng-if="trade.channel=='Rpay'"/>
                                     {{trade.order_id}}
                                 </td>

From ffa22ee1928683db53de7cf8d6fc91fbaa9f9387 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 20 Sep 2018 14:52:57 +0800
Subject: [PATCH 041/103] fix rpay+ icon

---
 src/main/ui/static/images/rpayplus_sign.png | Bin 1629 -> 1566 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/main/ui/static/images/rpayplus_sign.png b/src/main/ui/static/images/rpayplus_sign.png
index 1350a89e2fe67c97088e46834a6a079290e67561..4c53e791cabe78375d5c7ea86cf24082ca632a77 100644
GIT binary patch
literal 1566
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc&_u!9QqR!T
z(8R(}N5ROz&{*HVSl`fC*U-qyz|zXlQ~?T<fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf`)Hma%LWg
zuL;)R>ucqiS6q^qmz?V9Vygr+LN7Bj#md;t+|j_&*vQGm$=T4*)xyHa)WE{o&Begf
z%+T4`#Sy00B|o_|H#M&WrZ)wl*BGZ>P+G_>0NU)5T9jFqn&MWJpQ`}&vsES*w>UbP
z7@Hcp8UoF8!tNG`-V`iuf$9bM1G`>*pkwqwF^d$_Fd<;_0Wsm}7RZ68{M0;PaxVg=
z>nmB2!VC;d6FprVLn?0N1jl-a1d9B7cW0(-*;)H*|F>*#Fce}oJvgCm!FCU2C80N-
zRXmsEx|BMW$Z<6vnODWJ_{GBZe+%U&u2^#D)xqgZyu7B@L(8MX%gf5s^3vaJdmJVA
zqs{pFyy|m1pIf(|HQU;_q`hFygmxc6rUah<odSZJ?km1s<2B#ArTE>#Q;GU*iR{iR
zPak4C{i$)fSmR2qHy846cwfwk3#)0{W4V|s%;V!S{n?N07lutce0!Jtt7k>WB|jca
zl*qR`#c-=n>c!cw9pCsH!l$S@F!D6bxLX?GGu5Ok;WlUDIkuzwh4x+0US@8}U96_?
zfBLVy?wM<M^R|AH@+(?yvfStYUg-x%SvM{C(XKC`ZMgDzoDJ*y##)1UypAr@C;s`z
zd|~U3Np-vaYIm&p7G|)XFT(85UE3MimQ6eN9#81=^^lLRmOk`+ed5B!+#B2V7e0A<
zfS2Kw_<D`0t1Rt0pYHBokh{9+W2S`m_xWDCx9#QHvx4E{_xW?b2Zu?o@}7R^<+7KT
zj$61FeUYxn<NPx1Sjf~PeI3USp6-5{dh<I^QKzAzX|^KE+I4I<W9MG@ZgMa<Ui<Av
z_2v!F#TPycU$?2R^vEo}1DiMV-Ml+@o$j|ErqinOmwKI_P|B?F({h8_vIHxM*)1Py
zIF7B}UUFc;lbi+*mGIi@+y~633ADxwW>|Ebcv@E>l@<6Si9suM`!nb4$$}*}8M{{f
z_<V<9gU%+^6jQrJ)7`}P^*L`yWAfX5Y0>IQ4znuXop*n9w_^_D@sl&_*H&>0DKGAb
z+36_~b~!~g$l2{Tqgr?PoY);+r!tpiZfN2bn5gmKV#+a-rAFD8SQdZ(>}2n9>8+#u
y@7?FFbGo0jJRSS+jA>a;_S@4f>@Ab)StJ-vbxX7v@mW3umDrxHelF{r5}E)lY+L{U

literal 1629
zcmZ`%3rtgI6h0`EwG46N;bW6tO*TO&+&*dVNF1by%oR&1s9_FDTT0bJg^NXy4IR#C
zOniZ~hJ|cyQSb#W&LOh+egKN1(`3e|4Df}@RE)i)y*szKjhXD`-2Xr4Ki~JA@BX<P
zG-)Y8{Aqju2uhu&(&9ded*2?9YostZ12=zjqB;?vWpm(&{w=Ht!#u4Tp!_3%s%iiR
zkE-qil#&1sa{(v^z+_wf(ewm>aoL*Bbjic8%LQjx7`y}}jX*hJ)^?b&6$IOSfeDs)
z*aQhZP{zVA3v3(cYG6h+gxO&tMj02uz8Eco*FktK%xr^91fwj1*FcDqPn`Kc-X)+q
zB9s>*6d0IbdFp*xEiYmXgd(K}?0Z0o$_VbCo$^YY{z{VG7d5wzC#Z(-Ciobg;6&8H
zmTP|g>1k3s1dn>g^G*TPIXxZ|^o;(|(uD|RM}z{C(a-UnaHB^PZWSnT?Gz}H^-82c
zSro^dn=a8}iBA4@&Pk0r$F)nKL?pJ5jyHf544mRZW2D9<&2UMyE|CUH1|wndNOhg(
z*jdm1R(Fn_QRR+otVaMN%@}d)W?hW8_a6K7nYVXfq-wjT{hZra!4c=?dGGdn&vr8@
z2DkNV_QgxjxBHl6y-SvX%I*bA*~d>k-#0U{Y3|QycIdfhR|`Wf7@f;?2cLSHj(F<#
zdT;l!L(klnDhB=dT)pn@Z$(Sq%Qr^WJDK=Q23!AhQ5n_HcEx6I*EP4U5V;6&rx-kK
zXGW@ba6^}rdQV?;7glpEMHVC1adiAB%;PgzmQ_!1Ji`CaMr+f!U)9e)fFFntFTmdq
zU_3vJh>Q^mV<H8iym8>ik5E<CI-E{NO?l#Uo}Yi1s@=`BCWZP35S5H;H4(s%tf`6Q
z1;#iWF@b?Xr&H(@I$~-f8K#nGce_=u*|n7_lq3RI?|l3#H#2X3it7CIqYFE*2%uBd
z$pO8*(4d)9Tr&1Bwt1<lMBS9DhTPn|e7(tV?@nLuz}@~o%*IKRLf;F2H!P%XOU<?&
zTWhzQH5#2ZD?Kyg#^q~0*RT9`)l8C7u{<g=W_E0pOeQ(fY-~RCbBi$g;GTU=2O1Cm
zWVab@#VZ^478NXCT4=E@vzL~bhlXA}yg&Hx$%Ds_8pta*&()pio|D_t7nQMF-5@Ht
zK6sp%v*mbw>+^xQMZXmMx$VajGrlB*ojVRLYF#?K^YEkV>%Uo5_0Fy46;}s@*+;Cm
zTO<i5c}8pBfm;<XpWOWFPOgsL6n0+UvSR&2fwFwC?AVI6-}#+?up#wARHNm=ROjMP
zH}c7DllflX056coCqHR#Xz0Flw&P^iX@FVxvu0@rPIclveMl!SqK$gmL>Y=rxPh1y
zDTJg_C?<6x2_=zIVrev~ph%LxP+IpNg0;wK$zS#VgbMzqXe6X@6H1EmX}iAI1gTcN
z*`(H+Erw-;JXRSi5{gJ7T_h*U6!ILol=yc%Q9#o+DlX1$x5rvI7QV=eEh;weF`bxz
z%2POHT|ucekD^pXhEl7kkftaNLQ6ojn{A7G1LK=bQS(d|a{&z^h5U=?>LA2S9;5Rb
zv(RFs3pmKd->+#9GIb0@ZLyl@RW=j&T*cW6&2tWArM;n})*%W+GD*BtERxHmt34sZ
z2niXZlVK_6t~*vXKPjmun+V5t(wKIpHWl(M%T0I%akSMI=bN_NfV+96#bg)f#OL_r
kMN*MiDp5$}GKC^Xrp(DEmoWXCen2%yO-@rCNXlLN7ygcY`~Uy|


From 348dd76fd6b326509df029f08aa2a61e07f48eca Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 20 Sep 2018 15:06:11 +0800
Subject: [PATCH 042/103] fix rpay+ icon

---
 src/main/ui/static/analysis/clearing-log.js      |   2 +-
 .../analysis/templates/customer_analysis.html    |   2 +-
 .../templates/manage_customers_orders.html       |   2 +-
 .../templates/settlement_transactions.html       |   2 +-
 .../analysis/templates/trans_analysis.html       |   2 +-
 .../templates/trans_analysis_monthly.html        |   2 +-
 .../templates/transaction_amount_Analysis.html   |   2 +-
 .../commons/services/clearingDetailService.js    |   2 +-
 .../static/commons/templates/order_detail.html   |   2 +-
 src/main/ui/static/config/bdprize/bdprize.js     |   2 +-
 .../bdprize/templates/bd_prize_detail.html       |   4 ++--
 .../bdprize/templates/bd_prize_month_report.html |   2 +-
 src/main/ui/static/images/rpayplus_sign.png      | Bin 0 -> 1566 bytes
 .../{rpayplus.png => rpayplus_sign_lg.png}       | Bin
 .../invoice/templates/invoice_assistant.html     |   2 +-
 .../static/payment/custom/templates/custom.html  |   2 +-
 .../payment/invoice/templates/invoice.html       |   2 +-
 .../partner/templates/partner_pay_logs.html      |   4 ++--
 .../tradelog/templates/balance_report.html       |   4 ++--
 .../templates/partner_settlement_dialog.html     |   4 ++--
 .../tradelog/templates/partner_trade_logs.html   |   4 ++--
 .../payment/tradelog/templates/trade_logs.html   |   4 ++--
 22 files changed, 26 insertions(+), 26 deletions(-)
 create mode 100644 src/main/ui/static/images/rpayplus_sign.png
 rename src/main/ui/static/images/{rpayplus.png => rpayplus_sign_lg.png} (100%)

diff --git a/src/main/ui/static/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js
index 5683116bd..e610c6ee9 100644
--- a/src/main/ui/static/analysis/clearing-log.js
+++ b/src/main/ui/static/analysis/clearing-log.js
@@ -543,7 +543,7 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
                 case 'hf':
                     return '/static/images/hf_sign_lg.png';
                 case 'Rpay':
-                    return '/static/images/rpayplus.png';
+                    return '/static/images/rpayplus_sign_lg.png';
             }
         }
     });
diff --git a/src/main/ui/static/analysis/templates/customer_analysis.html b/src/main/ui/static/analysis/templates/customer_analysis.html
index d28281419..db731d054 100644
--- a/src/main/ui/static/analysis/templates/customer_analysis.html
+++ b/src/main/ui/static/analysis/templates/customer_analysis.html
@@ -179,7 +179,7 @@
                                      uib-tooltip="JD Pay" ng-if="order.channel=='jd'"/>
                                 <img src="/static/images/hf_sign.png"
                                      uib-tooltip="HF Pay" ng-if="order.channel=='hf'"/>
-                                <img src="/static/images/rpayplus.png"
+                                <img src="/static/images/rpayplus_sign.png"
                                      uib-tooltip="RPay+" ng-if="order.channel=='Rpay'"/>
                                 {{order.order_id}}
                             </td>
diff --git a/src/main/ui/static/analysis/templates/manage_customers_orders.html b/src/main/ui/static/analysis/templates/manage_customers_orders.html
index 531eadff2..bb65421f4 100644
--- a/src/main/ui/static/analysis/templates/manage_customers_orders.html
+++ b/src/main/ui/static/analysis/templates/manage_customers_orders.html
@@ -91,7 +91,7 @@
                                                    ng-click="params.channel='jd';doAnalysis(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
                                                    ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}"
                                                    ng-click="params.channel='RPAY';doAnalysis(1)">RPay +</a>
                                             </p>
                                         </div>
diff --git a/src/main/ui/static/analysis/templates/settlement_transactions.html b/src/main/ui/static/analysis/templates/settlement_transactions.html
index 247848535..7f19fc00e 100644
--- a/src/main/ui/static/analysis/templates/settlement_transactions.html
+++ b/src/main/ui/static/analysis/templates/settlement_transactions.html
@@ -50,7 +50,7 @@
                 </li>
                 <li ng-class="{active:ctrl.channel=='Rpay'}" ng-if="report.channels.Rpay">
                     <a role="button" ng-click="ctrl.channel='Rpay';channelAndDayOfAnalysis()" title="RPAY">
-                        <img src="/static/images/rpayplus.png" class="channel-icon-lg">
+                        <img src="/static/images/rpayplus_sign_lg.png" class="channel-icon-lg">
                     </a>
                 </li>
             </ul>
diff --git a/src/main/ui/static/analysis/templates/trans_analysis.html b/src/main/ui/static/analysis/templates/trans_analysis.html
index 14d91b836..4918d98d9 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis.html
@@ -98,7 +98,7 @@
                                                    ng-click="params.channel='jd';doAnalysis(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
                                                    ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}"
                                                    ng-click="params.channel='RPAY';doAnalysis(1)">RPay +</a>
                                             </p>
                                         </div>
diff --git a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
index 7c393b9d2..7896d249a 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
@@ -68,7 +68,7 @@
                                                    ng-click="params.channel='jd';doAnalysis(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
                                                    ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}"
                                                    ng-click="params.channel='RPAY';doAnalysis(1)">RPay +</a>
                                             </p>
                                         </div>
diff --git a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
index 6267766b8..5f4be2c4e 100644
--- a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
+++ b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
@@ -32,7 +32,7 @@
                                                    ng-click="params.channel='jd';loadTradeLogs()">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
                                                    ng-click="params.channel='hf';loadTradeLogs()">HF Pay</a>
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}"
                                                    ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +</a>
                                             </p>
                                         </div>
diff --git a/src/main/ui/static/commons/services/clearingDetailService.js b/src/main/ui/static/commons/services/clearingDetailService.js
index c77d3fe80..fc23d7390 100644
--- a/src/main/ui/static/commons/services/clearingDetailService.js
+++ b/src/main/ui/static/commons/services/clearingDetailService.js
@@ -61,7 +61,7 @@ define(['../app','decimal'], function (app,Decimal) {
                 case 'hf':
                     return '/static/images/hf_sign_lg.png';
                 case 'Rpay':
-                    return '/static/images/rpayplus.png';
+                    return '/static/images/rpayplus_sign_lg.png';
             }
         }
     });
diff --git a/src/main/ui/static/commons/templates/order_detail.html b/src/main/ui/static/commons/templates/order_detail.html
index 3184f16b2..3c63f639c 100644
--- a/src/main/ui/static/commons/templates/order_detail.html
+++ b/src/main/ui/static/commons/templates/order_detail.html
@@ -45,7 +45,7 @@
                                  uib-tooltip="JD Pay" ng-if="order.channel=='jd'"/>
                             <img src="/static/images/hf_sign.png"
                                  uib-tooltip="HF Pay" ng-if="order.channel=='hf'"/>
-                            <img src="/static/images/rpayplus.png"
+                            <img src="/static/images/rpayplus_sign.png"
                                  uib-tooltip="RPay+" ng-if="order.channel=='Rpay'"/>
                             {{order.order_id}}
                             </td>
diff --git a/src/main/ui/static/config/bdprize/bdprize.js b/src/main/ui/static/config/bdprize/bdprize.js
index 3c418044d..6b5fa2f4c 100644
--- a/src/main/ui/static/config/bdprize/bdprize.js
+++ b/src/main/ui/static/config/bdprize/bdprize.js
@@ -393,7 +393,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) {
                 case 'hf':
                     return '/static/images/hf_sign_lg.png';
                 case 'Rpay':
-                    return '/static/images/rpayplus.png';
+                    return '/static/images/rpayplus_sign_lg.png';
             }
         }
     });
diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html b/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html
index a97dd0384..5c49583b6 100644
--- a/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html
+++ b/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html
@@ -135,7 +135,7 @@
         <div class="col-xs-4" ng-if="detail.RpayDetail">
             <div class="info-box" style="background: lightcyan">
                 <div class="info-box-icon" style="    background: bottom;">
-                    <img uib-tooltip="Rpay+" src="/static/images/rpayplus.png">
+                    <img uib-tooltip="Rpay+" src="/static/images/rpayplus_sign_lg.png">
                 </div>
                 <div class="info-box-content">
                     <h5>Transaction: ${{detail.RpayDetail.total_amount}}</h5>
@@ -187,7 +187,7 @@
                         <img ng-if="log.channel=='Bestpay'" uib-tooltip="Bestpay" src="/static/images/bestpay_sign_lg.png">
                         <img ng-if="log.channel=='jd'" uib-tooltip="Bestpay" src="/static/images/jd_sign_lg.png">
                         <img ng-if="log.channel=='hf'" uib-tooltip="Bestpay" src="/static/images/hf_sign_lg.png">
-                        <img ng-if="log.channel=='Rpay'" uib-tooltip="Rpay" src="/static/images/rpayplus.png">
+                        <img ng-if="log.channel=='Rpay'" uib-tooltip="Rpay" src="/static/images/rpayplus_sign_lg.png">
                     </td>
                 </tr>
                 </tbody>
diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
index 213408c10..4d314367a 100644
--- a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
+++ b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
@@ -110,7 +110,7 @@
             <div class="col-xs-4" ng-if="report.RpayReport">
                 <div class="info-box" style="background: lightcyan">
                     <div class="info-box-icon" style="    background: bottom;">
-                        <img uib-tooltip="Rpay+" src="/static/images/rpayplus.png">
+                        <img uib-tooltip="Rpay+" src="/static/images/rpayplus_sign_lg.png">
                     </div>
                     <div class="info-box-content">
                         <h5>BD Total Commission: ${{report.RpayReport.total_prize}}</h5>
diff --git a/src/main/ui/static/images/rpayplus_sign.png b/src/main/ui/static/images/rpayplus_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c53e791cabe78375d5c7ea86cf24082ca632a77
GIT binary patch
literal 1566
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc&_u!9QqR!T
z(8R(}N5ROz&{*HVSl`fC*U-qyz|zXlQ~?T<fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf`)Hma%LWg
zuL;)R>ucqiS6q^qmz?V9Vygr+LN7Bj#md;t+|j_&*vQGm$=T4*)xyHa)WE{o&Begf
z%+T4`#Sy00B|o_|H#M&WrZ)wl*BGZ>P+G_>0NU)5T9jFqn&MWJpQ`}&vsES*w>UbP
z7@Hcp8UoF8!tNG`-V`iuf$9bM1G`>*pkwqwF^d$_Fd<;_0Wsm}7RZ68{M0;PaxVg=
z>nmB2!VC;d6FprVLn?0N1jl-a1d9B7cW0(-*;)H*|F>*#Fce}oJvgCm!FCU2C80N-
zRXmsEx|BMW$Z<6vnODWJ_{GBZe+%U&u2^#D)xqgZyu7B@L(8MX%gf5s^3vaJdmJVA
zqs{pFyy|m1pIf(|HQU;_q`hFygmxc6rUah<odSZJ?km1s<2B#ArTE>#Q;GU*iR{iR
zPak4C{i$)fSmR2qHy846cwfwk3#)0{W4V|s%;V!S{n?N07lutce0!Jtt7k>WB|jca
zl*qR`#c-=n>c!cw9pCsH!l$S@F!D6bxLX?GGu5Ok;WlUDIkuzwh4x+0US@8}U96_?
zfBLVy?wM<M^R|AH@+(?yvfStYUg-x%SvM{C(XKC`ZMgDzoDJ*y##)1UypAr@C;s`z
zd|~U3Np-vaYIm&p7G|)XFT(85UE3MimQ6eN9#81=^^lLRmOk`+ed5B!+#B2V7e0A<
zfS2Kw_<D`0t1Rt0pYHBokh{9+W2S`m_xWDCx9#QHvx4E{_xW?b2Zu?o@}7R^<+7KT
zj$61FeUYxn<NPx1Sjf~PeI3USp6-5{dh<I^QKzAzX|^KE+I4I<W9MG@ZgMa<Ui<Av
z_2v!F#TPycU$?2R^vEo}1DiMV-Ml+@o$j|ErqinOmwKI_P|B?F({h8_vIHxM*)1Py
zIF7B}UUFc;lbi+*mGIi@+y~633ADxwW>|Ebcv@E>l@<6Si9suM`!nb4$$}*}8M{{f
z_<V<9gU%+^6jQrJ)7`}P^*L`yWAfX5Y0>IQ4znuXop*n9w_^_D@sl&_*H&>0DKGAb
z+36_~b~!~g$l2{Tqgr?PoY);+r!tpiZfN2bn5gmKV#+a-rAFD8SQdZ(>}2n9>8+#u
y@7?FFbGo0jJRSS+jA>a;_S@4f>@Ab)StJ-vbxX7v@mW3umDrxHelF{r5}E)lY+L{U

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/rpayplus.png b/src/main/ui/static/images/rpayplus_sign_lg.png
similarity index 100%
rename from src/main/ui/static/images/rpayplus.png
rename to src/main/ui/static/images/rpayplus_sign_lg.png
diff --git a/src/main/ui/static/invoice/templates/invoice_assistant.html b/src/main/ui/static/invoice/templates/invoice_assistant.html
index a477b413a..d00a3a693 100644
--- a/src/main/ui/static/invoice/templates/invoice_assistant.html
+++ b/src/main/ui/static/invoice/templates/invoice_assistant.html
@@ -206,7 +206,7 @@
                                          uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                     <img src="/static/images/hf_sign.png"
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
-                                    <img src="/static/images/rpayplus.png"
+                                    <img src="/static/images/rpayplus_sign.png"
                                          uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
                                     {{trade.order_id2}}
                                 </td>
diff --git a/src/main/ui/static/payment/custom/templates/custom.html b/src/main/ui/static/payment/custom/templates/custom.html
index c4b3299e2..c3e911d21 100644
--- a/src/main/ui/static/payment/custom/templates/custom.html
+++ b/src/main/ui/static/payment/custom/templates/custom.html
@@ -101,7 +101,7 @@
                                                  uib-tooltip="JD Pay" ng-if="order.channel=='jd'"/>
                                             <img src="/static/images/hf_sign.png"
                                                  uib-tooltip="HF Pay" ng-if="order.channel=='hf'"/>
-                                            <img src="/static/images/rpayplus.png"
+                                            <img src="/static/images/rpayplus_sign.png"
                                                  uib-tooltip="RPay+" ng-if="order.channel=='Rpay'"/>
                                             {{order.order_id}}
                                     </td>
diff --git a/src/main/ui/static/payment/invoice/templates/invoice.html b/src/main/ui/static/payment/invoice/templates/invoice.html
index 6a49339c8..a26005322 100644
--- a/src/main/ui/static/payment/invoice/templates/invoice.html
+++ b/src/main/ui/static/payment/invoice/templates/invoice.html
@@ -200,7 +200,7 @@
                                          uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                     <img src="/static/images/hf_sign.png"
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
-                                    <img src="/static/images/rpayplus.png"
+                                    <img src="/static/images/rpayplus_sign.png"
                                          uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
                                     {{trade.order_id2}}
                                 </td>
diff --git a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
index 0939919a9..ea3913570 100644
--- a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
+++ b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
@@ -86,7 +86,7 @@
                            ng-click="params.channel='JD';loadTradeLogs(1)">JDpay</a> |
                         <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
                            ng-click="params.channel='HF';loadTradeLogs(1)">HFpay</a> |
-                        <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                        <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}"
                            ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +</a>
                     </p>
                 </div>
@@ -187,7 +187,7 @@
                         <img src="/static/images/alipay_sign.png" uib-tooltip="AlipayOnline" ng-if="trade.channel=='AlipayOnline'"/>
                         <img src="/static/images/jd_sign.png" uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                         <img src="/static/images/hf_sign.png" uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
-                        <img src="/static/images/rpayplus.png" uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
+                        <img src="/static/images/rpayplus_sign.png" uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
                         {{trade.order_id}}
                     </td>
                     <td>
diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html
index 7d5d17fe9..915719219 100644
--- a/src/main/ui/static/payment/tradelog/templates/balance_report.html
+++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html
@@ -96,7 +96,7 @@
                                                    ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
                                                    ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}"
                                                    ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +</a>
                                             </p>
                                         </div>
@@ -296,7 +296,7 @@
                                          uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                     <img src="/static/images/hf_sign.png"
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
-                                    <img src="/static/images/rpayplus.png"
+                                    <img src="/static/images/rpayplus_sign.png"
                                          uib-tooltip="RPay" ng-if="trade.channel=='Rpay'"/>
                                     {{trade.order_id2}}
                                 </td>
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
index 1d1f07f0e..527e66e50 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
@@ -7,7 +7,7 @@
             <ul class="nav nav-pills">
                 <li ng-class="{active:ctrl.channel==null}">
                     <a role="button" ng-click="ctrl.channel=null;channelAndDayOfAnalysis()" title="All">
-                        <img src="/static/images/rpayplus.png">
+                        <img src="/static/images/rpayplus_sign_lg.png">
                     </a>
                 </li>
                 <li ng-class="{active:ctrl.channel=='Wechat'}" ng-if="report.channels.Wechat">
@@ -42,7 +42,7 @@
                 </li>
                 <li ng-class="{active:ctrl.channel=='Rpay'}" ng-if="report.channels.Rpay">
                     <a role="button" ng-click="ctrl.channel='Rpay';channelAndDayOfAnalysis()" title="Rpay Pay">
-                        <img src="/static/images/rpayplus.png">
+                        <img src="/static/images/rpayplus_sign_lg.png">
                     </a>
                 </li>
             </ul>
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
index efb867200..41ea8d8a6 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
@@ -96,7 +96,7 @@
                                                    ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
                                                    ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a>
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='Rpay'}"
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}"
                                                    ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay+</a>
                                             </p>
                                         </div>
@@ -324,7 +324,7 @@
                                      <img src="/static/images/alipay_sign.png" uib-tooltip="AlipayOnline" alt="AlipayOnline" ng-if="trade.channel=='AlipayOnline'"/>
                                      <img src="/static/images/jd_sign.png" uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                      <img src="/static/images/hf_sign.png" uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
-                                     <img src="/static/images/rpayplus.png" uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
+                                     <img src="/static/images/rpayplus_sign.png" uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
                                      {{trade.order_id}}
                                  </td>
                                  <td>
diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
index 13496d1a2..e17a89559 100644
--- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
@@ -134,7 +134,7 @@
                                                    ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
                                                    ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}"
                                                    ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +</a>
                                             </p>
                                         </div>
@@ -353,7 +353,7 @@
                                          uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                     <img src="/static/images/hf_sign.png"
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
-                                    <img src="/static/images/rpayplus.png"
+                                    <img src="/static/images/rpayplus_sign.png"
                                          uib-tooltip="Royal Pay" ng-if="trade.channel=='Rpay'"/>
                                     {{trade.order_id}}
                                 </td>

From e9173949e1f00d055f6db94174ae0c4577ac5adf Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Thu, 20 Sep 2018 15:06:14 +0800
Subject: [PATCH 043/103] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/static/templates/payment/success.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/ui/static/templates/payment/success.css b/src/main/ui/static/templates/payment/success.css
index c68ad7747..974fbb4ea 100644
--- a/src/main/ui/static/templates/payment/success.css
+++ b/src/main/ui/static/templates/payment/success.css
@@ -352,7 +352,7 @@
 }
 .points-dialog .dialog-content{
     margin: auto;
-    width: 80%;
+    width: 90%;
     display: block;
     position: relative;
     margin-top: 100px;
@@ -383,12 +383,12 @@
     width: 100%;
     font-size: 14px;
     color: rgb(157, 255, 221);
-    margin-bottom: 24px;
+    margin-bottom: 10px;
 }
 
 .points-content .coin{
-    width: 80px;
-    height: 80px;
+    width: 50px;
+    height: 50px;
     position: relative;
     background: url(/static/images/star.png) no-repeat;
     background-size: contain;

From 661df49a2c451601b8f03596828cada1ed15ed88 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 20 Sep 2018 15:08:38 +0800
Subject: [PATCH 044/103] fix rpay+ icon

---
 .../ui/static/analysis/templates/manage_customers_orders.html   | 2 +-
 src/main/ui/static/analysis/templates/trans_analysis.html       | 2 +-
 .../ui/static/analysis/templates/trans_analysis_monthly.html    | 2 +-
 .../static/analysis/templates/transaction_amount_Analysis.html  | 2 +-
 .../ui/static/payment/partner/templates/partner_pay_logs.html   | 2 +-
 .../ui/static/payment/tradelog/templates/balance_report.html    | 2 +-
 .../static/payment/tradelog/templates/partner_trade_logs.html   | 2 +-
 src/main/ui/static/payment/tradelog/templates/trade_logs.html   | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/ui/static/analysis/templates/manage_customers_orders.html b/src/main/ui/static/analysis/templates/manage_customers_orders.html
index 531eadff2..bb65421f4 100644
--- a/src/main/ui/static/analysis/templates/manage_customers_orders.html
+++ b/src/main/ui/static/analysis/templates/manage_customers_orders.html
@@ -91,7 +91,7 @@
                                                    ng-click="params.channel='jd';doAnalysis(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
                                                    ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}"
                                                    ng-click="params.channel='RPAY';doAnalysis(1)">RPay +</a>
                                             </p>
                                         </div>
diff --git a/src/main/ui/static/analysis/templates/trans_analysis.html b/src/main/ui/static/analysis/templates/trans_analysis.html
index 14d91b836..4918d98d9 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis.html
@@ -98,7 +98,7 @@
                                                    ng-click="params.channel='jd';doAnalysis(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
                                                    ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}"
                                                    ng-click="params.channel='RPAY';doAnalysis(1)">RPay +</a>
                                             </p>
                                         </div>
diff --git a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
index 7c393b9d2..7896d249a 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
@@ -68,7 +68,7 @@
                                                    ng-click="params.channel='jd';doAnalysis(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
                                                    ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}"
                                                    ng-click="params.channel='RPAY';doAnalysis(1)">RPay +</a>
                                             </p>
                                         </div>
diff --git a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
index 6267766b8..5f4be2c4e 100644
--- a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
+++ b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
@@ -32,7 +32,7 @@
                                                    ng-click="params.channel='jd';loadTradeLogs()">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
                                                    ng-click="params.channel='hf';loadTradeLogs()">HF Pay</a>
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}"
                                                    ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +</a>
                                             </p>
                                         </div>
diff --git a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
index fc92231f4..ea3913570 100644
--- a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
+++ b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
@@ -86,7 +86,7 @@
                            ng-click="params.channel='JD';loadTradeLogs(1)">JDpay</a> |
                         <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
                            ng-click="params.channel='HF';loadTradeLogs(1)">HFpay</a> |
-                        <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                        <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}"
                            ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +</a>
                     </p>
                 </div>
diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html
index 412309d68..915719219 100644
--- a/src/main/ui/static/payment/tradelog/templates/balance_report.html
+++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html
@@ -96,7 +96,7 @@
                                                    ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
                                                    ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}"
                                                    ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +</a>
                                             </p>
                                         </div>
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
index 4d1b06b1a..41ea8d8a6 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
@@ -96,7 +96,7 @@
                                                    ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
                                                    ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a>
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='Rpay'}"
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}"
                                                    ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay+</a>
                                             </p>
                                         </div>
diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
index 38cc5ba87..e17a89559 100644
--- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
@@ -134,7 +134,7 @@
                                                    ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
                                                    ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}"
                                                    ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +</a>
                                             </p>
                                         </div>

From 66ead63d3819943760a7b28250a9bc6630d4685a Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Thu, 20 Sep 2018 19:32:20 +0800
Subject: [PATCH 045/103] rpay

---
 .../commons/templates/order_detail.html       |   2 +-
 .../images/rpay/icon_success_red_186x186.png  | Bin 4930 -> 1925 bytes
 .../ui/static/images/rpay/rpay_horizental.png | Bin 8157 -> 2362 bytes
 .../payment/invoice/templates/invoice.html    |   2 +-
 .../partner/templates/partner_pay_logs.html   |   3 ++-
 .../templates/partner_trade_detail_edit.html  |   2 +-
 .../templates/partner_trade_logs.html         |   3 ++-
 .../tradelog/templates/trade_logs.html        |   3 ++-
 .../templates/vipcustomer_detail.html         |   3 ++-
 9 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/ui/static/commons/templates/order_detail.html b/src/main/ui/static/commons/templates/order_detail.html
index 3c63f639c..a73954b98 100644
--- a/src/main/ui/static/commons/templates/order_detail.html
+++ b/src/main/ui/static/commons/templates/order_detail.html
@@ -122,7 +122,7 @@
                         <p class="form-control-static" ng-bind="order.customer_payment_amount|currency:order.currency+' '"></p>
                     </div>
                 </div>
-                <div class="form-group" ng-if="order.status>=5 && order.channel!='hf'">
+                <div class="form-group" ng-if="order.status>=5 && (order.channel!='hf'||order.channel!='Rpay')">
                     <label class="control-label col-xs-3">Exchange Rate</label>
                     <div class="col-xs-9">
                         <p class="form-control-static" ng-bind="order.exchange_rate"></p>
diff --git a/src/main/ui/static/images/rpay/icon_success_red_186x186.png b/src/main/ui/static/images/rpay/icon_success_red_186x186.png
index 340781e95141fc3211327284de8491c6ce24ca3b..398567d1c3d9d45dfa32a3d0d202e36463dde8c1 100644
GIT binary patch
literal 1925
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
Q`fC9!Ft#SGD6f>i0gCOPt^fc4

literal 4930
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
M8d)0FBCf^%524%i?f?J)

diff --git a/src/main/ui/static/images/rpay/rpay_horizental.png b/src/main/ui/static/images/rpay/rpay_horizental.png
index 3af67712923a52c8039bb022ce9b96218990f5a2..06b240e48656ece5fb8b994e91fa134a317f7970 100644
GIT binary patch
literal 2362
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
JDvx@_{R7|FfuR5Z

literal 8157
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
D-^`TN

diff --git a/src/main/ui/static/payment/invoice/templates/invoice.html b/src/main/ui/static/payment/invoice/templates/invoice.html
index a26005322..90816babf 100644
--- a/src/main/ui/static/payment/invoice/templates/invoice.html
+++ b/src/main/ui/static/payment/invoice/templates/invoice.html
@@ -213,7 +213,7 @@
                                     <p ng-if="trade.trans_type=='clearing'">
                                         -
                                     </p>
-                                    <p ng-if="trade.trans_type !='clearing' && trade.channel!='hf'">
+                                    <p ng-if="trade.trans_type !='clearing' && (order.channel!='hf'||order.channel!='Rpay')">
                                         {{trade.exchange_rate}}
                                     </p>
                                 </td>
diff --git a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
index ea3913570..38df75df9 100644
--- a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
+++ b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
@@ -198,7 +198,8 @@
                     <td ng-bind="trade.display_amount|currency:trade.currency"></td>
                     <td ng-bind="trade.clearing_amount|currency:'AUD '"></td>
                     <td>
-                        <span ng-if="trade.channel!='hf'" ng-bind="trade.exchange_rate"></span>
+                        <span ng-if="(trade.channel!='hf') || (trade.channel!='Rpay')" ng-bind="trade.exchange_rate"></span>
+                        <span ng-if="(trade.channel=='hf') || (trade.channel=='Rpay')" > - </span>
                     </td>
                     <td ng-bind="trade.status|tradeStatus"></td>
                     <td ng-bind="trade.create_time"></td>
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_detail_edit.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_detail_edit.html
index 978617150..d91c3e058 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_trade_detail_edit.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_trade_detail_edit.html
@@ -98,7 +98,7 @@
                             </table>
                         </div>
                     </div>
-                    <div class="form-group" ng-if="order.status>=5 && order.channel!='hf'">
+                    <div class="form-group" ng-if="order.status>=5 && (order.channel!='hf' || order.channel!='Rpay')">
                         <label class="control-label col-xs-3">Exchange Rate</label>
                         <div class="col-xs-9">
                             <p class="form-control-static" ng-bind="order.exchange_rate"></p>
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
index 41ea8d8a6..eb1d35318 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
@@ -336,7 +336,8 @@
                                  <td ng-bind="trade.clearing_amount|currency:'AUD '"></td>
                                  <td ng-bind="trade.settle_amount|currency:'AUD '"></td>
                                  <td>
-                                     <span ng-if="trade.channel!='hf'" ng-bind="trade.exchange_rate"></span>
+                                     <span ng-if="(trade.channel!='hf') || (trade.channel!='Rpay')" ng-bind="trade.exchange_rate"></span>
+                                     <span ng-if="(trade.channel=='hf') || (trade.channel=='Rpay')" > - </span>
                                  </td>
                                  <td ng-bind="trade.status|tradeStatus"></td>
                                  <td ng-bind="trade.create_time"></td>
diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
index e17a89559..957cc9da3 100644
--- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
@@ -365,7 +365,8 @@
                                 <td ng-bind="trade.display_amount|currency:trade.currency"></td>
                                 <td ng-bind="trade.clearing_amount|currency:'AUD'"></td>
                                 <td>
-                                    <span ng-if="trade.channel!='hf'" ng-bind="trade.exchange_rate"></span>
+                                    <span ng-if="(trade.channel!='hf') || (trade.channel!='Rpay')" ng-bind="trade.exchange_rate"></span>
+                                    <span ng-if="(trade.channel=='hf') || (trade.channel=='Rpay')" > - </span>
                                 </td>
                                 <td ng-bind="trade.status|tradeStatus"></td>
                                 <td ng-bind="trade.create_time"></td>
diff --git a/src/main/ui/static/payment/vipcustomer/templates/vipcustomer_detail.html b/src/main/ui/static/payment/vipcustomer/templates/vipcustomer_detail.html
index 8b0e25e48..dde8ad87b 100644
--- a/src/main/ui/static/payment/vipcustomer/templates/vipcustomer_detail.html
+++ b/src/main/ui/static/payment/vipcustomer/templates/vipcustomer_detail.html
@@ -126,7 +126,8 @@
                                         </td>
                                         <td ng-bind="trade.clearing_amount|currency:'AUD '"></td>
                                         <td>
-                                            <span ng-if="trade.channel!='hf'" ng-bind="trade.exchange_rate"></span>
+                                            <span ng-if="(trade.channel!='hf') || (trade.channel!='Rpay')" ng-bind="trade.exchange_rate"></span>
+                                            <span ng-if="(trade.channel=='hf') || (trade.channel=='Rpay')" > - </span>
                                         </td>
                                         <td ng-bind="trade.status|tradeStatus"></td>
                                         <td ng-bind="trade.create_time"></td>

From 5718465f3fc1ac047cbb27916eddf273d68f3991 Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Thu, 20 Sep 2018 19:38:02 +0800
Subject: [PATCH 046/103] rpay

---
 .../ui/static/payment/partner/templates/partner_pay_logs.html   | 2 +-
 .../static/payment/tradelog/templates/partner_trade_logs.html   | 2 +-
 src/main/ui/static/payment/tradelog/templates/trade_logs.html   | 2 +-
 .../payment/vipcustomer/templates/vipcustomer_detail.html       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
index 38df75df9..630f9d6ab 100644
--- a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
+++ b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
@@ -198,7 +198,7 @@
                     <td ng-bind="trade.display_amount|currency:trade.currency"></td>
                     <td ng-bind="trade.clearing_amount|currency:'AUD '"></td>
                     <td>
-                        <span ng-if="(trade.channel!='hf') || (trade.channel!='Rpay')" ng-bind="trade.exchange_rate"></span>
+                        <span ng-if="(trade.channel!='hf')  &&  (trade.channel!='Rpay')" ng-bind="trade.exchange_rate"></span>
                         <span ng-if="(trade.channel=='hf') || (trade.channel=='Rpay')" > - </span>
                     </td>
                     <td ng-bind="trade.status|tradeStatus"></td>
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
index eb1d35318..b69d79e45 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
@@ -336,7 +336,7 @@
                                  <td ng-bind="trade.clearing_amount|currency:'AUD '"></td>
                                  <td ng-bind="trade.settle_amount|currency:'AUD '"></td>
                                  <td>
-                                     <span ng-if="(trade.channel!='hf') || (trade.channel!='Rpay')" ng-bind="trade.exchange_rate"></span>
+                                     <span ng-if="(trade.channel!='hf')  &&  (trade.channel!='Rpay')" ng-bind="trade.exchange_rate"></span>
                                      <span ng-if="(trade.channel=='hf') || (trade.channel=='Rpay')" > - </span>
                                  </td>
                                  <td ng-bind="trade.status|tradeStatus"></td>
diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
index 957cc9da3..977125376 100644
--- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
@@ -365,7 +365,7 @@
                                 <td ng-bind="trade.display_amount|currency:trade.currency"></td>
                                 <td ng-bind="trade.clearing_amount|currency:'AUD'"></td>
                                 <td>
-                                    <span ng-if="(trade.channel!='hf') || (trade.channel!='Rpay')" ng-bind="trade.exchange_rate"></span>
+                                    <span ng-if="(trade.channel!='hf')  &&  (trade.channel!='Rpay')" ng-bind="trade.exchange_rate"></span>
                                     <span ng-if="(trade.channel=='hf') || (trade.channel=='Rpay')" > - </span>
                                 </td>
                                 <td ng-bind="trade.status|tradeStatus"></td>
diff --git a/src/main/ui/static/payment/vipcustomer/templates/vipcustomer_detail.html b/src/main/ui/static/payment/vipcustomer/templates/vipcustomer_detail.html
index dde8ad87b..23c9510c8 100644
--- a/src/main/ui/static/payment/vipcustomer/templates/vipcustomer_detail.html
+++ b/src/main/ui/static/payment/vipcustomer/templates/vipcustomer_detail.html
@@ -126,7 +126,7 @@
                                         </td>
                                         <td ng-bind="trade.clearing_amount|currency:'AUD '"></td>
                                         <td>
-                                            <span ng-if="(trade.channel!='hf') || (trade.channel!='Rpay')" ng-bind="trade.exchange_rate"></span>
+                                            <span ng-if="(trade.channel!='hf')  &&  (trade.channel!='Rpay')" ng-bind="trade.exchange_rate"></span>
                                             <span ng-if="(trade.channel=='hf') || (trade.channel=='Rpay')" > - </span>
                                         </td>
                                         <td ng-bind="trade.status|tradeStatus"></td>

From fed8e1f8e9610c5672eeb25ce3c504e0be5cbad6 Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Thu, 20 Sep 2018 20:32:18 +0800
Subject: [PATCH 047/103] =?UTF-8?q?[fix]=E6=B7=BB=E5=8A=A0Rpay+=E4=BA=A4?=
 =?UTF-8?q?=E6=98=93=E9=A2=9D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/static/analysis/templates/trans_analysis.html | 8 ++++----
 .../static/analysis/templates/trans_analysis_monthly.html | 8 ++++----
 src/main/ui/static/dashboard/templates/dashboard.html     | 6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/ui/static/analysis/templates/trans_analysis.html b/src/main/ui/static/analysis/templates/trans_analysis.html
index 4918d98d9..9fac48e1a 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis.html
@@ -199,17 +199,17 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- Rpay+显示交易额分析，先注释掉，日后可能需要显示
+                            <!-- Rpay+显示交易额分析-->
                             <div class="col-sm-2 col-xs-6">
                                 <div class="description-block">
-                                    <div class="description-header text-bold"><img src="/static/images/rpayplus.png"/>R Pay</div>
+                                    <div class="description-header text-bold"><img src="/static/images/rpayplus_sign.png"/>RPay+</div>
                                     <div class="description-text text-red">
                                         <label class="description-text"
                                                ng-bind="totalChannelAmount.rpayamount|currency: ' $ '"></label>
                                     </div>
                                 </div>
                             </div>
-                            -->
+
                         </div>
                         <!--<table class="table">
                             <tr>
@@ -230,7 +230,7 @@
                                     <img src="/static/images/jd_sign.png"/>
                                     JD Pay:{{totalChannelAmount.jdPayAmount|currency: ' $ '}}</th>
                                 <th>
-                                    <img src="/static/images/rpayplus.png"/>
+                                    <img src="/static/images/rpayplus_sign.png"/>
                                     R Pay:{{totalChannelAmount.rpayamount|currency: ' $ '}}</th>
                                 <th>
                                     <img src="/static/images/hf_sign.png"/>
diff --git a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
index 7896d249a..624069fa8 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
@@ -160,17 +160,17 @@
                                 </div>
                             </div>
 
-                            <!-- 显示Rpay+交易额分析，先注释掉，日后可能需要显示
+                            <!-- 显示Rpay+交易额分析-->
                             <div class="col-sm-2 col-xs-6">
                                 <div class="description-block">
-                                    <div class="description-header text-bold"><img src="/static/images/rpayplus.png"/>R Pay</div>
+                                    <div class="description-header text-bold"><img src="/static/images/rpayplus_sign.png"/>RPay+</div>
                                     <div class="description-text">
                                         <label class="description-text text-red"
                                                ng-bind="totalChannelAmount.rpayamount|currency: ' $ '"></label>
                                     </div>
                                 </div>
                             </div>
-                            -->
+
                         </div>
                       <!--  <table class="table">
                             <tr>
@@ -193,7 +193,7 @@
                                     <img src="/static/images/hf_sign.png"/>
                                     JD Pay:{{totalChannelAmount.hfPayAmount|currency: ' $ '}}</th>
                                 <th>
-                                    <img src="/static/images/rpayplus.png"/>
+                                    <img src="/static/images/rpayplus_sign.png"/>
                                     R Pay:{{totalChannelAmount.rpayamount|currency: ' $ '}}</th>
                             </tr>
                         </table>-->
diff --git a/src/main/ui/static/dashboard/templates/dashboard.html b/src/main/ui/static/dashboard/templates/dashboard.html
index 55c56f2fa..d59afe063 100644
--- a/src/main/ui/static/dashboard/templates/dashboard.html
+++ b/src/main/ui/static/dashboard/templates/dashboard.html
@@ -160,7 +160,7 @@
                     </div>
                 </div>
 
-                <!-- dashboard显示Rpay+交易额，先注释掉，日后可能需要显示
+                <!-- dashboard显示Rpay+交易额-->
                 <div class="col-sm-4 col-xs-6">
                     <div class="description-block">
                         <div class="description-text">交易额:
@@ -171,10 +171,10 @@
                             <label class="description-text text-red"
                                    ng-bind="totalChannelAmount.rpay_order_count"></label>
                         </div>
-                        <div class="description-header text-bold"><img src="/static/images/rpayplus.png"/>R</div>
+                        <div class="description-header text-bold"><img src="/static/images/rpayplus_sign.png"/>Rpay+</div>
                     </div>
                 </div>
-                -->
+
 
             </div>
         </div>

From e6564c9ada9c2b739841e6ad1c30cbc9d7fd3e17 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 21 Sep 2018 13:30:53 +0800
Subject: [PATCH 048/103] fix rpay+ icon

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

diff --git a/src/main/ui/static/templates/payment/v1/payment.css b/src/main/ui/static/templates/payment/v1/payment.css
index 5c535ec04..73c482eed 100644
--- a/src/main/ui/static/templates/payment/v1/payment.css
+++ b/src/main/ui/static/templates/payment/v1/payment.css
@@ -366,7 +366,7 @@ input.value:focus {
     background-color: #108ee9;
 }
 
-.button_sp_area.alipay .paynow {
+.button_sp_area.rpay .paynow {
     background-color: #FF2D55;
 }
 

From 43729baff0e231fb1da6b7b3c2f7f34384182273 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 21 Sep 2018 13:39:57 +0800
Subject: [PATCH 049/103] fix rpay+  payment.css

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

diff --git a/src/main/ui/static/templates/payment/v1/payment.css b/src/main/ui/static/templates/payment/v1/payment.css
index 5c535ec04..73c482eed 100644
--- a/src/main/ui/static/templates/payment/v1/payment.css
+++ b/src/main/ui/static/templates/payment/v1/payment.css
@@ -366,7 +366,7 @@ input.value:focus {
     background-color: #108ee9;
 }
 
-.button_sp_area.alipay .paynow {
+.button_sp_area.rpay .paynow {
     background-color: #FF2D55;
 }
 

From 351efaaec252f4198b55c26430ff44b55f69bfb3 Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Fri, 21 Sep 2018 18:46:56 +0800
Subject: [PATCH 050/103] =?UTF-8?q?=E5=BC=80=E6=94=BE=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E5=95=86=E6=88=B7=E5=8F=82=E4=B8=8E=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impls/CustomerLotteryCountServiceImpl.java | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerLotteryCountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerLotteryCountServiceImpl.java
index 4a20c7247..fb2296368 100644
--- a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerLotteryCountServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerLotteryCountServiceImpl.java
@@ -17,6 +17,9 @@ import org.springframework.web.util.UriComponentsBuilder;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 @Service
 public class CustomerLotteryCountServiceImpl implements ApplicationListener<AfterPaymentFinishEvent> {
@@ -39,9 +42,20 @@ public class CustomerLotteryCountServiceImpl implements ApplicationListener<Afte
     @Override
     public void onApplicationEvent(AfterPaymentFinishEvent event) {
         final JSONObject order = event.getFinishedEvent().getOrder();
-        //只允许pine商户参与该活动
+        //判断是否是pine测试商户，若不是则判断是否在活动时间
         if (order.getIntValue("client_id") != 9) {
-            return;
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+            Date newDay = new Date();
+            try {
+                if (newDay.compareTo(sdf.parse("2018-09-24 00:00:00")) < 0) {
+                    return;
+                }
+                if (newDay.compareTo(sdf.parse("2018-10-15 00:00:00")) > 0) {
+                    return;
+                }
+            } catch (ParseException e) {
+
+            }
         }
         BigDecimal clearAmount = event.getFinishedEvent().getAudFee();
         String channel = order.getString("channel");

From c4404978dad633c90042a9b676ddef07c4681ffb Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Sat, 22 Sep 2018 08:37:28 +0800
Subject: [PATCH 051/103] fix

---
 .../manage/mappers/risk/RiskAttentionMerchantsMapper.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsMapper.java
index b97ddb822..62b3f0ed7 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsMapper.java
@@ -34,11 +34,11 @@ public interface RiskAttentionMerchantsMapper {
     PageList<JSONObject> query(JSONObject params, PageBounds pagination);
 
     @Select("SELECT client_moniker FROM risk_attention_merchants " +
-            "WHERE (abn = #{abn} ) OR (acn = #{acn} ) " +
+            "WHERE ((abn = #{abn} ) OR (acn = #{acn} ) " +
             "   OR (contact_phone = #{contact_phone} ) " +
             "   OR (contact_person = #{contact_person} ) " +
             "   OR (client_moniker = #{client_moniker} ) " +
-            "   OR (bank_account_no = #{bank_account_no} ) AND is_valid=1")
+            "   OR (bank_account_no = #{bank_account_no} )) AND is_valid=1")
     List<JSONObject> listRiskySimilarMerchants(JSONObject params);
 
 }

From 825b41a8d2c319585a115867feb54251eb34ae84 Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Mon, 24 Sep 2018 00:25:14 +1000
Subject: [PATCH 052/103] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/impls/CustomerPointsServiceImp.java      | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerPointsServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerPointsServiceImp.java
index 3cd2e8dad..750b48835 100644
--- a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerPointsServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerPointsServiceImp.java
@@ -23,6 +23,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
@@ -284,7 +286,18 @@ public class CustomerPointsServiceImp implements CustomerPointsService {
     public BigDecimal checkLotteryAfterPay(String order_id) {
         JSONObject order = transactionAnalysisMapper.getOrderClearAmount(order_id);
         if (order.getIntValue("client_id") != 9) {
-            return BigDecimal.valueOf(0);
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+            Date newDay = new Date();
+            try {
+                if (newDay.compareTo(sdf.parse("2018-09-24 00:00:00")) < 0) {
+                    return BigDecimal.valueOf(0);
+                }
+                if (newDay.compareTo(sdf.parse("2018-10-15 00:00:00")) > 0) {
+                    return BigDecimal.valueOf(0);
+                }
+            } catch (ParseException e) {
+
+            }
         }
         return order.getBigDecimal("clearing_amount");
     }

From ed1b811eb8e5f589ac95947cd4653fbeb31e31a0 Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Sun, 23 Sep 2018 22:43:42 +0800
Subject: [PATCH 053/103] =?UTF-8?q?=E6=B8=85=E7=AE=97=E9=A2=84=E4=BC=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/analysis/core/PlatformClearService.java    |  2 ++
 .../core/impls/PlatformClearAnalysisServiceImpl.java  | 11 +++++++++--
 .../payment/manage/task/SettleEstimateTaskManger.java |  2 +-
 .../manage/mappers/log/PlatformSettlementMapper.xml   |  6 +++---
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/PlatformClearService.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/PlatformClearService.java
index a6444e4af..21049cd1f 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/PlatformClearService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/PlatformClearService.java
@@ -14,5 +14,7 @@ public interface PlatformClearService {
 
     void generateSettleLogs();
 
+    void generateAliPaySettleLogs();
+
     void doVerifyHFSettleLog(JSONObject param);
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PlatformClearAnalysisServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PlatformClearAnalysisServiceImpl.java
index 9e9064a3e..83a03f191 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PlatformClearAnalysisServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PlatformClearAnalysisServiceImpl.java
@@ -127,6 +127,13 @@ public class PlatformClearAnalysisServiceImpl implements PlatformClearService {
         generateAlipayOnlineSettleLogs();
     }
 
+    @Override
+    @Transactional
+    public void generateAliPaySettleLogs() {
+        generateAlipaySettleLogs();
+        generateAlipayOnlineSettleLogs();
+    }
+
     @Transactional
     public void generateWechatSettleLogs() {
         try {
@@ -138,7 +145,7 @@ public class PlatformClearAnalysisServiceImpl implements PlatformClearService {
         }
     }
 
-    public void generateAlipaySettleLogs() {
+    private void generateAlipaySettleLogs() {
         try {
             List<Date> dateList = TimeZoneUtils.getStatetime();
             for (Date dateStr : dateList) {
@@ -154,7 +161,7 @@ public class PlatformClearAnalysisServiceImpl implements PlatformClearService {
 
     }
 
-    public void generateAlipayOnlineSettleLogs() {
+    private void generateAlipayOnlineSettleLogs() {
         try {
             List<Date> dateList = TimeZoneUtils.getStatetime();
             for (Date dateStr : dateList) {
diff --git a/src/main/java/au/com/royalpay/payment/manage/task/SettleEstimateTaskManger.java b/src/main/java/au/com/royalpay/payment/manage/task/SettleEstimateTaskManger.java
index d7d38327a..d1b69b508 100644
--- a/src/main/java/au/com/royalpay/payment/manage/task/SettleEstimateTaskManger.java
+++ b/src/main/java/au/com/royalpay/payment/manage/task/SettleEstimateTaskManger.java
@@ -42,6 +42,6 @@ public class SettleEstimateTaskManger {
 
     @Scheduled(cron = "0 0 10 * * ?")
     public void generateSettleLogs2() {
-        synchronizedScheduler.executeProcess("manage_task:genSettleLogappli2", 120_000, () -> platformClearService.generateSettleLogs());
+        synchronizedScheduler.executeProcess("manage_task:generateAliPaySettleLog", 120_000, () -> platformClearService.generateAliPaySettleLogs());
     }
 }
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/log/PlatformSettlementMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/log/PlatformSettlementMapper.xml
index c65eaf3dc..98529f116 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/log/PlatformSettlementMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/log/PlatformSettlementMapper.xml
@@ -18,7 +18,7 @@
         FROM
         pmt_transactions
         WHERE
-        channel = #{channel}
+        order_channel = #{channel}
         AND transaction_type = #{transaction_type}
         AND transaction_time >= #{start_date}
         AND #{end_date} > transaction_time
@@ -33,7 +33,7 @@
                                              ELSE 0 END),
                   0.00) ali_charge_amount
            FROM pmt_transactions
-           WHERE channel =  #{channel}
+           WHERE order_channel =  #{channel}
            AND transaction_time >= #{start_date}
            AND #{end_date} > transaction_time
            AND system_generate = 0
@@ -47,7 +47,7 @@
         FROM
         pmt_transactions
         WHERE
-        channel = #{channel}
+        order_channel = #{channel}
         AND transaction_type = #{transaction_type}
         AND transaction_time >= #{start_date}
         AND #{end_date} > transaction_time

From db7f25ec816cf215f9f35d8014ff51a14e1d8465 Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Sun, 23 Sep 2018 22:46:10 +0800
Subject: [PATCH 054/103] =?UTF-8?q?=E6=8A=BD=E5=A5=96=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/impls/CustomerPointsServiceImp.java      | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerPointsServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerPointsServiceImp.java
index 3cd2e8dad..750b48835 100644
--- a/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerPointsServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/customers/core/impls/CustomerPointsServiceImp.java
@@ -23,6 +23,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
@@ -284,7 +286,18 @@ public class CustomerPointsServiceImp implements CustomerPointsService {
     public BigDecimal checkLotteryAfterPay(String order_id) {
         JSONObject order = transactionAnalysisMapper.getOrderClearAmount(order_id);
         if (order.getIntValue("client_id") != 9) {
-            return BigDecimal.valueOf(0);
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+            Date newDay = new Date();
+            try {
+                if (newDay.compareTo(sdf.parse("2018-09-24 00:00:00")) < 0) {
+                    return BigDecimal.valueOf(0);
+                }
+                if (newDay.compareTo(sdf.parse("2018-10-15 00:00:00")) > 0) {
+                    return BigDecimal.valueOf(0);
+                }
+            } catch (ParseException e) {
+
+            }
         }
         return order.getBigDecimal("clearing_amount");
     }

From eb24dd7ad408094c22d0ac84779816ff97765277 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 25 Sep 2018 11:07:38 +0800
Subject: [PATCH 055/103] fix wx_settlements orderby desc

---
 .../ui/static/config/devtools/templates/wx_settlements.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/ui/static/config/devtools/templates/wx_settlements.html b/src/main/ui/static/config/devtools/templates/wx_settlements.html
index 368c87bf2..dacfa0a9b 100644
--- a/src/main/ui/static/config/devtools/templates/wx_settlements.html
+++ b/src/main/ui/static/config/devtools/templates/wx_settlements.html
@@ -53,7 +53,7 @@
                 </tr>
                 </thead>
                 <tbody>
-                <tr ng-repeat="log in settleLogs">
+                <tr ng-repeat="log in settleLogs | orderBy:'-settlementDate':desc">
                     <td ng-bind="log.startString"></td>
                     <td ng-bind="log.endString"></td>
                     <td ng-bind="log.settlementDateString"></td>

From f19f84f735023f4e855f05322fe790867cef48c4 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 25 Sep 2018 11:08:11 +0800
Subject: [PATCH 056/103] fix wx_settlements orderby desc

---
 .../ui/static/config/devtools/templates/wx_settlements.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/ui/static/config/devtools/templates/wx_settlements.html b/src/main/ui/static/config/devtools/templates/wx_settlements.html
index 368c87bf2..dacfa0a9b 100644
--- a/src/main/ui/static/config/devtools/templates/wx_settlements.html
+++ b/src/main/ui/static/config/devtools/templates/wx_settlements.html
@@ -53,7 +53,7 @@
                 </tr>
                 </thead>
                 <tbody>
-                <tr ng-repeat="log in settleLogs">
+                <tr ng-repeat="log in settleLogs | orderBy:'-settlementDate':desc">
                     <td ng-bind="log.startString"></td>
                     <td ng-bind="log.endString"></td>
                     <td ng-bind="log.settlementDateString"></td>

From 188a5adf16e850cb04d71667bd3969ebc0d25c7b Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 25 Sep 2018 11:26:46 +0800
Subject: [PATCH 057/103] add client_partner_detail googleMap

---
 src/main/ui/static/payment/partner/partner.js       |  7 +++++++
 .../partner/templates/client_partner_detail.html    | 13 +++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/main/ui/static/payment/partner/partner.js b/src/main/ui/static/payment/partner/partner.js
index 275b1190e..e4cdb0451 100644
--- a/src/main/ui/static/payment/partner/partner.js
+++ b/src/main/ui/static/payment/partner/partner.js
@@ -70,6 +70,13 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct
         $scope.partner = partner.data;
         $scope.partner.partner_type = $scope.partner.website ? 'website' : 'photo';
 
+        $scope.getMerchantLocation = function () {
+            $http.get('/sys/partners/' + $scope.partner.client_moniker + '/location').then(function (resp) {
+                $scope.merchant_location = resp.data;
+            });
+        };
+        $scope.getMerchantLocation();
+
         $scope.uploadLogo = function (file) {
             if (file != null) {
                 if (file.size > 1 * 1024 * 1024) {
diff --git a/src/main/ui/static/payment/partner/templates/client_partner_detail.html b/src/main/ui/static/payment/partner/templates/client_partner_detail.html
index 9c8ebcfa4..44ee74b66 100644
--- a/src/main/ui/static/payment/partner/templates/client_partner_detail.html
+++ b/src/main/ui/static/payment/partner/templates/client_partner_detail.html
@@ -303,6 +303,19 @@
                                 </div>
                             </div>
                         </div>
+                        <span id="merchant_location" hidden>{{merchant_location}}</span>
+                        <div class="panel panel-default">
+                            <div class="panel-heading" style="font-size: larger">Location
+                                <span id="editmap" hidden>false</span>
+                                <span id="add_view" hidden>false</span>
+                            </div>
+                            <div class="form-group">
+                                <div class="embed-responsive" style="height: 300px;">
+                                    <iframe id="merchant_detail" name="merchant_detail" class="embed-responsive-item"
+                                            src="one_locations.html"></iframe>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                     <div ng-show="partner.source == 4 && (partner.approve_result !=3 && partner.approve_result !=1)">
                         <form class="form-horizontal" novalidate name="partnerForm">

From 8e0d916897443122f9bbde5af08500bd4d04a7b5 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 25 Sep 2018 11:27:35 +0800
Subject: [PATCH 058/103] add client_partner_detail googleMap

---
 src/main/ui/static/payment/partner/partner.js       |  7 +++++++
 .../partner/templates/client_partner_detail.html    | 13 +++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/main/ui/static/payment/partner/partner.js b/src/main/ui/static/payment/partner/partner.js
index 275b1190e..e4cdb0451 100644
--- a/src/main/ui/static/payment/partner/partner.js
+++ b/src/main/ui/static/payment/partner/partner.js
@@ -70,6 +70,13 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct
         $scope.partner = partner.data;
         $scope.partner.partner_type = $scope.partner.website ? 'website' : 'photo';
 
+        $scope.getMerchantLocation = function () {
+            $http.get('/sys/partners/' + $scope.partner.client_moniker + '/location').then(function (resp) {
+                $scope.merchant_location = resp.data;
+            });
+        };
+        $scope.getMerchantLocation();
+
         $scope.uploadLogo = function (file) {
             if (file != null) {
                 if (file.size > 1 * 1024 * 1024) {
diff --git a/src/main/ui/static/payment/partner/templates/client_partner_detail.html b/src/main/ui/static/payment/partner/templates/client_partner_detail.html
index 9c8ebcfa4..44ee74b66 100644
--- a/src/main/ui/static/payment/partner/templates/client_partner_detail.html
+++ b/src/main/ui/static/payment/partner/templates/client_partner_detail.html
@@ -303,6 +303,19 @@
                                 </div>
                             </div>
                         </div>
+                        <span id="merchant_location" hidden>{{merchant_location}}</span>
+                        <div class="panel panel-default">
+                            <div class="panel-heading" style="font-size: larger">Location
+                                <span id="editmap" hidden>false</span>
+                                <span id="add_view" hidden>false</span>
+                            </div>
+                            <div class="form-group">
+                                <div class="embed-responsive" style="height: 300px;">
+                                    <iframe id="merchant_detail" name="merchant_detail" class="embed-responsive-item"
+                                            src="one_locations.html"></iframe>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                     <div ng-show="partner.source == 4 && (partner.approve_result !=3 && partner.approve_result !=1)">
                         <form class="form-horizontal" novalidate name="partnerForm">

From a6ea30b8cadbccfac26844a85de5b33dbd6a3f56 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 25 Sep 2018 12:22:17 +0800
Subject: [PATCH 059/103] add client_partner_detail googleMap

---
 src/main/ui/static/invoice/templates/invoice_assistant.html     | 2 +-
 src/main/ui/static/payment/invoice/templates/invoice.html       | 2 +-
 .../ui/static/payment/tradelog/templates/balance_report.html    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/ui/static/invoice/templates/invoice_assistant.html b/src/main/ui/static/invoice/templates/invoice_assistant.html
index d00a3a693..40315fcc0 100644
--- a/src/main/ui/static/invoice/templates/invoice_assistant.html
+++ b/src/main/ui/static/invoice/templates/invoice_assistant.html
@@ -239,7 +239,7 @@
                                         -
                                     </p>
                                 </td>
-                                <td ng-bind="trade.order_detail||trade.remark"></td>
+                                <td ng-bind="trade.order_detail"></td>
                             </tr>
                             </tbody>
                         </table>
diff --git a/src/main/ui/static/payment/invoice/templates/invoice.html b/src/main/ui/static/payment/invoice/templates/invoice.html
index 90816babf..c045936f1 100644
--- a/src/main/ui/static/payment/invoice/templates/invoice.html
+++ b/src/main/ui/static/payment/invoice/templates/invoice.html
@@ -233,7 +233,7 @@
                                         -
                                     </p>
                                 </td>
-                                <td ng-bind="trade.order_detail||trade.remark"></td>
+                                <td ng-bind="trade.order_detail"></td>
                             </tr>
                             </tbody>
                         </table>
diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html
index 915719219..c6acfce95 100644
--- a/src/main/ui/static/payment/tradelog/templates/balance_report.html
+++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html
@@ -345,7 +345,7 @@
                                         -
                                     </p>
                                 </td>
-                                <td ng-bind="trade.order_detail||trade.remark"></td>
+                                <td ng-bind="trade.order_detail"></td>
                             </tr>
                             </tbody>
                         </table>

From 1685078ae6cfa1ac78a4b26c9adba31954ed0ff5 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 25 Sep 2018 12:23:16 +0800
Subject: [PATCH 060/103] fix  trade.order_detail||trade.remark

---
 src/main/ui/static/invoice/templates/invoice_assistant.html     | 2 +-
 src/main/ui/static/payment/invoice/templates/invoice.html       | 2 +-
 .../ui/static/payment/tradelog/templates/balance_report.html    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/ui/static/invoice/templates/invoice_assistant.html b/src/main/ui/static/invoice/templates/invoice_assistant.html
index d00a3a693..40315fcc0 100644
--- a/src/main/ui/static/invoice/templates/invoice_assistant.html
+++ b/src/main/ui/static/invoice/templates/invoice_assistant.html
@@ -239,7 +239,7 @@
                                         -
                                     </p>
                                 </td>
-                                <td ng-bind="trade.order_detail||trade.remark"></td>
+                                <td ng-bind="trade.order_detail"></td>
                             </tr>
                             </tbody>
                         </table>
diff --git a/src/main/ui/static/payment/invoice/templates/invoice.html b/src/main/ui/static/payment/invoice/templates/invoice.html
index 90816babf..c045936f1 100644
--- a/src/main/ui/static/payment/invoice/templates/invoice.html
+++ b/src/main/ui/static/payment/invoice/templates/invoice.html
@@ -233,7 +233,7 @@
                                         -
                                     </p>
                                 </td>
-                                <td ng-bind="trade.order_detail||trade.remark"></td>
+                                <td ng-bind="trade.order_detail"></td>
                             </tr>
                             </tbody>
                         </table>
diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html
index 915719219..c6acfce95 100644
--- a/src/main/ui/static/payment/tradelog/templates/balance_report.html
+++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html
@@ -345,7 +345,7 @@
                                         -
                                     </p>
                                 </td>
-                                <td ng-bind="trade.order_detail||trade.remark"></td>
+                                <td ng-bind="trade.order_detail"></td>
                             </tr>
                             </tbody>
                         </table>

From 6810f1d53af504ba86026437dda3d018ecf2735b Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 25 Sep 2018 14:02:42 +0800
Subject: [PATCH 061/103] fix rpay - remark_alter

---
 src/main/ui/static/templates/rpay/v1/payment.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/ui/static/templates/rpay/v1/payment.js b/src/main/ui/static/templates/rpay/v1/payment.js
index 7cbd9ff0a..2162eae11 100644
--- a/src/main/ui/static/templates/rpay/v1/payment.js
+++ b/src/main/ui/static/templates/rpay/v1/payment.js
@@ -215,7 +215,7 @@ $(function () {
         showWeuiDialog(config);
     });
 
-    $('#key_P').click(function () {
+/*    $('#key_P').click(function () {
         if (window.requireRemark) {
             if (!dataCache.remark) {
                 var config = {
@@ -226,7 +226,7 @@ $(function () {
             }
 
         }
-    });
+    });*/
 
     $('#key_P').bind('touchstart', function () {
         if (window.requireRemark) {

From 6ea7c26d9684834102b2103d8c45767fba52731e Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 25 Sep 2018 14:03:19 +0800
Subject: [PATCH 062/103] fix rpay - remark_alter

---
 src/main/ui/static/templates/rpay/v1/payment.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/ui/static/templates/rpay/v1/payment.js b/src/main/ui/static/templates/rpay/v1/payment.js
index 7cbd9ff0a..2162eae11 100644
--- a/src/main/ui/static/templates/rpay/v1/payment.js
+++ b/src/main/ui/static/templates/rpay/v1/payment.js
@@ -215,7 +215,7 @@ $(function () {
         showWeuiDialog(config);
     });
 
-    $('#key_P').click(function () {
+/*    $('#key_P').click(function () {
         if (window.requireRemark) {
             if (!dataCache.remark) {
                 var config = {
@@ -226,7 +226,7 @@ $(function () {
             }
 
         }
-    });
+    });*/
 
     $('#key_P').bind('touchstart', function () {
         if (window.requireRemark) {

From eac17d2434df830a79198d65e570feb26f0dd811 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 25 Sep 2018 14:10:51 +0800
Subject: [PATCH 063/103] fix rpay - remark_alter

---
 src/main/ui/static/templates/rpay/v1/payment.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/ui/static/templates/rpay/v1/payment.js b/src/main/ui/static/templates/rpay/v1/payment.js
index 2162eae11..a63f252b7 100644
--- a/src/main/ui/static/templates/rpay/v1/payment.js
+++ b/src/main/ui/static/templates/rpay/v1/payment.js
@@ -215,18 +215,18 @@ $(function () {
         showWeuiDialog(config);
     });
 
-/*    $('#key_P').click(function () {
+    $('#key_P').click(function () {
         if (window.requireRemark) {
             if (!dataCache.remark) {
                 var config = {
-                    title: '请先输入备注',
+                    title: 'Please enter the remarks first',
                     template: ''
                 };
                 showWeuiDialog(config);
             }
 
         }
-    });*/
+    });
 
     $('#key_P').bind('touchstart', function () {
         if (window.requireRemark) {

From 80049f966e927f0d241563cdb04b8e48dc6a9666 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 25 Sep 2018 14:11:30 +0800
Subject: [PATCH 064/103] fix rpay - remark_alter

---
 src/main/ui/static/templates/rpay/v1/payment.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/ui/static/templates/rpay/v1/payment.js b/src/main/ui/static/templates/rpay/v1/payment.js
index 2162eae11..a63f252b7 100644
--- a/src/main/ui/static/templates/rpay/v1/payment.js
+++ b/src/main/ui/static/templates/rpay/v1/payment.js
@@ -215,18 +215,18 @@ $(function () {
         showWeuiDialog(config);
     });
 
-/*    $('#key_P').click(function () {
+    $('#key_P').click(function () {
         if (window.requireRemark) {
             if (!dataCache.remark) {
                 var config = {
-                    title: '请先输入备注',
+                    title: 'Please enter the remarks first',
                     template: ''
                 };
                 showWeuiDialog(config);
             }
 
         }
-    });*/
+    });
 
     $('#key_P').bind('touchstart', function () {
         if (window.requireRemark) {

From 053d85d61e173ff3015802cf4dbea4c8fed0fc43 Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Wed, 26 Sep 2018 11:09:29 +0800
Subject: [PATCH 065/103] =?UTF-8?q?[fix]notify=20log=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=8F=8A?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/logview/beans/NotifyQueryBean.java | 17 ++++++++++
 .../mappers/log/NotifyErrorLogMapper.xml      | 32 +++++++++++++++++++
 .../config/logview/templates/notify_log.html  | 19 ++++++++++-
 3 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/logview/beans/NotifyQueryBean.java b/src/main/java/au/com/royalpay/payment/manage/logview/beans/NotifyQueryBean.java
index 725f63337..72ec88677 100644
--- a/src/main/java/au/com/royalpay/payment/manage/logview/beans/NotifyQueryBean.java
+++ b/src/main/java/au/com/royalpay/payment/manage/logview/beans/NotifyQueryBean.java
@@ -15,6 +15,10 @@ public class NotifyQueryBean {
     private int page = 1;
     private int limit = 20;
     private String moniker;
+
+    // 新增orderId查询字段
+    private String orderId;
+
     private String clientOrderId;
     private String date;
     private Boolean success;
@@ -24,6 +28,11 @@ public class NotifyQueryBean {
         if (StringUtils.isNotEmpty(moniker)) {
             param.put("client_moniker", moniker);
         }
+
+        if (StringUtils.isNotEmpty(orderId)) {
+            param.put("order_id", orderId);
+        }
+
         if (StringUtils.isNotEmpty(clientOrderId)) {
             param.put("client_order_id", clientOrderId);
         }
@@ -88,4 +97,12 @@ public class NotifyQueryBean {
     public void setSuccess(Boolean success) {
         this.success = success;
     }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
 }
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/log/NotifyErrorLogMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/log/NotifyErrorLogMapper.xml
index 66e84f217..3e17fbc8e 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/log/NotifyErrorLogMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/log/NotifyErrorLogMapper.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="au.com.royalpay.payment.manage.mappers.log.NotifyErrorLogMapper">
+    <!--
+    原来的SQL语句
     <select id="listErrorLogs" resultType="com.alibaba.fastjson.JSONObject">
         SELECT l.* FROM log_notify_error l
         <if test="client_moniker!=null">
@@ -14,6 +16,36 @@
             <if test="success!=null">and l.success=#{success}</if>
         </where>
     </select>
+    -->
+
+    <!-- 新增client_order_id字段，SQL语句修改如下 -->
+    <select id="listErrorLogs" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT lne.*, po.client_order_id
+        FROM log_notify_error lne
+        INNER JOIN pmt_orders po
+        ON lne.order_id = po.order_id
+        <if test = "client_moniker != null">
+            INNER JOIN sys_clients sc
+            ON sc.client_id = lne.client_id
+            AND sc.is_valid = 1
+            AND sc.client_moniker = #{client_moniker}
+        </if>
+        <where>
+            <if test = "order_id != null">
+                lne.order_id = #{order_id}
+            </if>
+            <if test = "client_order_id != null">
+                AND po.client_order_id = #{client_order_id}
+            </if>
+            <if test = "date != null">
+                AND DATE(lne.addtime) = DATE(#{date})
+            </if>
+            <if test = "success != null">
+                AND lne.success = #{success}
+            </if>
+        </where>
+    </select>
+
     <select id="listUnsentOrders" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
             order_id,
diff --git a/src/main/ui/static/config/logview/templates/notify_log.html b/src/main/ui/static/config/logview/templates/notify_log.html
index d59ace1a8..38c66e3dd 100644
--- a/src/main/ui/static/config/logview/templates/notify_log.html
+++ b/src/main/ui/static/config/logview/templates/notify_log.html
@@ -24,6 +24,21 @@
                                        is-open="dtCtrl.open" ng-click="dtCtrl.open=true">
                             </div>
                         </div>
+
+                        <!-- 新增orderId查询条件 -->
+                        <div class="form-group">
+                            <label class="control-label col-sm-3"
+                                   for="orderIdInput">
+                                Order ID
+                            </label>
+                            <div class="col-sm-7">
+                                <input class="form-control"
+                                       type="text"
+                                       ng-model="params.orderId"
+                                       id="orderIdInput">
+                            </div>
+                        </div>
+
                         <div class="form-group">
                             <label class="control-label col-sm-3" for="clientOrderIdInput">Client Order ID</label>
                             <div class="col-sm-7">
@@ -61,6 +76,7 @@
                         <tr>
                             <th>Time</th>
                             <th>Order ID</th>
+                            <th>Client Order ID</th>
                             <th>Notify Url</th>
                             <th>Success</th>
                             <th>Http Code</th>
@@ -71,7 +87,8 @@
                         <tr ng-repeat="log in notifyLogs">
                             <td ng-bind="log.addtime|date:'yyyy-MM-dd HH:mm:ss'"></td>
                             <td ng-bind="log.order_id"></td>
-                            <td ng-bind="log.notify_url|limitTo:50" title="{{log.notify_url}}"></td>
+                            <td ng-bind="log.client_order_id"></td>
+                            <td ng-bind="log.notify_url" title="{{log.notify_url}}"></td>
                             <td ng-bind="log.success?'Yes':'No'" ng-class="{'text-success':log.success,'text-danger':!log.success}"></td>
                             <td ng-bind="log.http_code"></td>
                             <td ng-bind="log.err_msg|limitTo:10" title="{{log.err_msg}}"></td>

From 3959b7c0715b11069fb5e77a9a8b66eacb812d46 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 26 Sep 2018 14:08:32 +0800
Subject: [PATCH 066/103] add select_nap

---
 .../impls/CustomersAnalysisServiceImp.java    |  1 +
 .../analysis/mappers/OrderAnalysisMapper.xml  | 14 +++++++++++-
 .../ui/static/analysis/customer_analysis.js   |  1 +
 .../analysis/templates/customer_analysis.html | 22 +++++++++++++++++++
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java
index 62d967da8..88e26c0d1 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java
@@ -78,6 +78,7 @@ public class CustomersAnalysisServiceImp implements CustomersAnalysisService {
         PageList<JSONObject> logs = orderAnalysisMapper.listCustomersData(params, new PageBounds(page, limit, Order.formString("amount.desc")));
         JSONObject result = PageListUtils.buildPageListResult(logs);
         result.put("analysis", orderAnalysisMapper.listCustomersDataAnalysis(params));
+        result.put("openid_type", params.getIntValue("openid_type"));
         return result;
     }
 
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml
index d8c12acdc..81cee3fb0 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml
@@ -197,10 +197,16 @@
     </select>
 
     <select id="listCustomersData" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT o.customer_id,sum(if(t.transaction_type='Credit',t.clearing_amount,0)) amount,
+        SELECT r.nickname,r.headimg,o.customer_id,sum(if(t.transaction_type='Credit',t.clearing_amount,0)) amount,
         COUNT(DISTINCT o.order_id) orders,max(t.clearing_amount) max_order
         FROM pmt_orders o
         INNER JOIN pmt_transactions t on t.order_id=o.order_id and t.system_generate=0 and (t.transaction_type='Credit' or t.transaction_type>0)
+        <if test="openid_type==4">
+            LEFT JOIN sys_customer_relation r on r.globalpay_openid = o.customer_id
+        </if>
+        <if test="openid_type==0 or openid_type==1">
+            LEFT JOIN sys_customer_relation r on r.wechat_openid = o.customer_id
+        </if>
         <where>
             <if test="begin!=null">and o.create_time &gt;= #{begin}</if>
             <if test="end!=null">and o.create_time &lt; #{end}</if>
@@ -216,6 +222,9 @@
             <if test="openid_type==3">
                 and o.channel='Bestpay'
             </if>
+            <if test="openid_type==4">
+                AND o.customer_id LIKE 'olH%' and o.channel='Wechat'
+            </if>
             <if test="customer_id!=null">
                 and o.customer_id=#{customer_id}
             </if>
@@ -245,6 +254,9 @@
             <if test="openid_type==3">
                 and o.channel='Bestpay'
             </if>
+            <if test="openid_type==4">
+                AND customer_id LIKE 'olH%'
+            </if>
             <if test="customer_id!=null">
                 and o.customer_id=#{customer_id}
             </if>
diff --git a/src/main/ui/static/analysis/customer_analysis.js b/src/main/ui/static/analysis/customer_analysis.js
index e7c2f4a9e..826c70478 100644
--- a/src/main/ui/static/analysis/customer_analysis.js
+++ b/src/main/ui/static/analysis/customer_analysis.js
@@ -77,6 +77,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
             $http.get('/analysis/customers/ranking/'+$scope.params.openid_type, {params: params}).then(function (resp) {
                 $scope.customer_loading = false;
                 $scope.customers = resp.data.data;
+                $scope.customers_type = resp.data.openid_type;
                 $scope.customers_analysis = resp.data.analysis;
                 $scope.pagination = resp.data.pagination;
                 if($scope.customers.length>0){
diff --git a/src/main/ui/static/analysis/templates/customer_analysis.html b/src/main/ui/static/analysis/templates/customer_analysis.html
index db731d054..34029ebb7 100644
--- a/src/main/ui/static/analysis/templates/customer_analysis.html
+++ b/src/main/ui/static/analysis/templates/customer_analysis.html
@@ -22,6 +22,7 @@
                                     <option value='1'>白RoyalPay</option>
                                     <option value='2'>Alipay</option>
                                     <option value='3'>Bestpay</option>
+                                    <option value='4'>Nap</option>
                                 </select>
                             </div>
                             <div class="form-group col-xs-4 form-inline">
@@ -99,6 +100,7 @@
                         <table class="table table-striped">
                             <thead>
                             <tr>
+                                <th style="width: 200px">Nick Name</th>
                                 <th>Customer openId</th>
                                 <th>Amount(AUD)</th>
                              <!--   <th>Points</th>-->
@@ -110,6 +112,26 @@
                             <tr ng-repeat="customer in customers"
                                 ng-class="{'selectRow':order_params.customer_id==customer.customer_id}"
                                 ng-click="order_params.customer_id=customer.customer_id;listCustomerOrders()">
+                                <td style="width: 60px" ng-if="customers_type ==0 || customers_type==1">
+                                    <span>
+                                        <img style="height: 30px;width: 30px" class="img-circle" ng-src="{{customer.headimg||'static/images/royalpay_sign_ln.png'}}" />
+                                        {{customer.nickname}}
+                                    </span></td>
+                                <td style="width: 60px" ng-if="customers_type ==2">
+                                    <span>
+                                    <img style="height: 30px;width: 30px" class="img-circle" ng-src="{{customer.headimg||'static/images/alipay_sign.png'}}" />
+                                    {{customer.nickname}}
+                                    </span></td>
+                                <td style="width: 60px" ng-if="customers_type ==3">
+                                    <span>
+                                    <img style="height: 30px;width: 30px" class="img-circle" ng-src="{{customer.headimg||'static/images/bestpay_sign.png'}}" />
+                                 {{customer.nickname}}
+                                     </span></td>
+                                <td style="width: 60px" ng-if="customers_type ==4">
+                                    <span>
+                                    <img style="height: 30px;width: 30px" class="img-circle" ng-src="{{customer.headimg||'static/images/nap.png'}}" />
+                                    {{customer.nickname}}
+                                    </span></td>
                                 <td ng-bind="customer.customer_id"></td>
                                 <td ng-bind="customer.amount"></td>
                            <!--     <td ng-bind="customer.points"></td>-->

From 93719ed3196d8cd1c84d8f7bf99ce3030dc1642c Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 26 Sep 2018 14:12:48 +0800
Subject: [PATCH 067/103] add select_nap

---
 .../impls/CustomersAnalysisServiceImp.java    |   1 +
 .../analysis/mappers/OrderAnalysisMapper.xml  |  14 ++++++++++-
 .../ui/static/analysis/customer_analysis.js   |   1 +
 .../analysis/templates/customer_analysis.html |  22 ++++++++++++++++++
 src/main/ui/static/images/nap.png             | Bin 0 -> 1203 bytes
 .../ui/static/images/royalpay_sign_ln.png     | Bin 0 -> 1504 bytes
 6 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 src/main/ui/static/images/nap.png
 create mode 100644 src/main/ui/static/images/royalpay_sign_ln.png

diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java
index 62d967da8..88e26c0d1 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/CustomersAnalysisServiceImp.java
@@ -78,6 +78,7 @@ public class CustomersAnalysisServiceImp implements CustomersAnalysisService {
         PageList<JSONObject> logs = orderAnalysisMapper.listCustomersData(params, new PageBounds(page, limit, Order.formString("amount.desc")));
         JSONObject result = PageListUtils.buildPageListResult(logs);
         result.put("analysis", orderAnalysisMapper.listCustomersDataAnalysis(params));
+        result.put("openid_type", params.getIntValue("openid_type"));
         return result;
     }
 
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml
index d8c12acdc..81cee3fb0 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml
@@ -197,10 +197,16 @@
     </select>
 
     <select id="listCustomersData" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT o.customer_id,sum(if(t.transaction_type='Credit',t.clearing_amount,0)) amount,
+        SELECT r.nickname,r.headimg,o.customer_id,sum(if(t.transaction_type='Credit',t.clearing_amount,0)) amount,
         COUNT(DISTINCT o.order_id) orders,max(t.clearing_amount) max_order
         FROM pmt_orders o
         INNER JOIN pmt_transactions t on t.order_id=o.order_id and t.system_generate=0 and (t.transaction_type='Credit' or t.transaction_type>0)
+        <if test="openid_type==4">
+            LEFT JOIN sys_customer_relation r on r.globalpay_openid = o.customer_id
+        </if>
+        <if test="openid_type==0 or openid_type==1">
+            LEFT JOIN sys_customer_relation r on r.wechat_openid = o.customer_id
+        </if>
         <where>
             <if test="begin!=null">and o.create_time &gt;= #{begin}</if>
             <if test="end!=null">and o.create_time &lt; #{end}</if>
@@ -216,6 +222,9 @@
             <if test="openid_type==3">
                 and o.channel='Bestpay'
             </if>
+            <if test="openid_type==4">
+                AND o.customer_id LIKE 'olH%' and o.channel='Wechat'
+            </if>
             <if test="customer_id!=null">
                 and o.customer_id=#{customer_id}
             </if>
@@ -245,6 +254,9 @@
             <if test="openid_type==3">
                 and o.channel='Bestpay'
             </if>
+            <if test="openid_type==4">
+                AND customer_id LIKE 'olH%'
+            </if>
             <if test="customer_id!=null">
                 and o.customer_id=#{customer_id}
             </if>
diff --git a/src/main/ui/static/analysis/customer_analysis.js b/src/main/ui/static/analysis/customer_analysis.js
index e7c2f4a9e..826c70478 100644
--- a/src/main/ui/static/analysis/customer_analysis.js
+++ b/src/main/ui/static/analysis/customer_analysis.js
@@ -77,6 +77,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
             $http.get('/analysis/customers/ranking/'+$scope.params.openid_type, {params: params}).then(function (resp) {
                 $scope.customer_loading = false;
                 $scope.customers = resp.data.data;
+                $scope.customers_type = resp.data.openid_type;
                 $scope.customers_analysis = resp.data.analysis;
                 $scope.pagination = resp.data.pagination;
                 if($scope.customers.length>0){
diff --git a/src/main/ui/static/analysis/templates/customer_analysis.html b/src/main/ui/static/analysis/templates/customer_analysis.html
index db731d054..34029ebb7 100644
--- a/src/main/ui/static/analysis/templates/customer_analysis.html
+++ b/src/main/ui/static/analysis/templates/customer_analysis.html
@@ -22,6 +22,7 @@
                                     <option value='1'>白RoyalPay</option>
                                     <option value='2'>Alipay</option>
                                     <option value='3'>Bestpay</option>
+                                    <option value='4'>Nap</option>
                                 </select>
                             </div>
                             <div class="form-group col-xs-4 form-inline">
@@ -99,6 +100,7 @@
                         <table class="table table-striped">
                             <thead>
                             <tr>
+                                <th style="width: 200px">Nick Name</th>
                                 <th>Customer openId</th>
                                 <th>Amount(AUD)</th>
                              <!--   <th>Points</th>-->
@@ -110,6 +112,26 @@
                             <tr ng-repeat="customer in customers"
                                 ng-class="{'selectRow':order_params.customer_id==customer.customer_id}"
                                 ng-click="order_params.customer_id=customer.customer_id;listCustomerOrders()">
+                                <td style="width: 60px" ng-if="customers_type ==0 || customers_type==1">
+                                    <span>
+                                        <img style="height: 30px;width: 30px" class="img-circle" ng-src="{{customer.headimg||'static/images/royalpay_sign_ln.png'}}" />
+                                        {{customer.nickname}}
+                                    </span></td>
+                                <td style="width: 60px" ng-if="customers_type ==2">
+                                    <span>
+                                    <img style="height: 30px;width: 30px" class="img-circle" ng-src="{{customer.headimg||'static/images/alipay_sign.png'}}" />
+                                    {{customer.nickname}}
+                                    </span></td>
+                                <td style="width: 60px" ng-if="customers_type ==3">
+                                    <span>
+                                    <img style="height: 30px;width: 30px" class="img-circle" ng-src="{{customer.headimg||'static/images/bestpay_sign.png'}}" />
+                                 {{customer.nickname}}
+                                     </span></td>
+                                <td style="width: 60px" ng-if="customers_type ==4">
+                                    <span>
+                                    <img style="height: 30px;width: 30px" class="img-circle" ng-src="{{customer.headimg||'static/images/nap.png'}}" />
+                                    {{customer.nickname}}
+                                    </span></td>
                                 <td ng-bind="customer.customer_id"></td>
                                 <td ng-bind="customer.amount"></td>
                            <!--     <td ng-bind="customer.points"></td>-->
diff --git a/src/main/ui/static/images/nap.png b/src/main/ui/static/images/nap.png
new file mode 100644
index 0000000000000000000000000000000000000000..613b393fa21a6c7df6e338b0de8999da031822b1
GIT binary patch
literal 1203
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc&_u!9QqR!T
z(8R(}N5ROz&{*HVSl`fC*U-qyz|zXlQ~?T<fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf`)Hma%LWg
zuL;)R>ucqiS6q^qmz?V9Vygr+LN7Bj#mdOh+0fG2&Be*m%*4>p)xy!#+1$d!$=T7_
z#n8yq$pxm@B|o_|H#M&WrZ)wl*A=H;P+G_>0NU)5T9jFqn&MWJpQ`}&vsET;w>aT6
z52`l>w_BWX>eUB2MjsTjNHGl)0wy026P|8?9C*r4%>yR)B4E0nT)Zrjfq_xY)5S5Q
z;#Shb=pXmH8XFVU1Wp@IV3T7iv{Js%Anwp+!Cd)3Rd|9xvVwd^BhL?~M#lIV5*n-r
z41Ro(=eTD7<G=g~w&tJP72bT#SNQYqw1Az54BNf`fBx@(apeE|0&y0G#|IpR5;rhd
zGdDLHg!nODz4WV?hey87(BR7~<AMbh3omjU<ZEzy#hk#Q`GLVu-zksTfJwflZNo#h
z29ZNKER60evi0_~UO2ICw*<#S`Kp5-+F8{q9#~$unZq$VQ7Yk&LuH4mfqugcX*q+M
zbf@pqKE@|Dux^)>_;TI(Pxl+93E~a24l+y;vS<8zoIB{tLv@u82O3YbeNgw{Il{iu
zQH;Ime1g6LX9KU}vc#O6M;jcTEL4#E*uYca+Q_)xA&z5_iZwHf1cPjHdv)7Kb4O4y
N;_2$=vd$@?2>=tDlC}T<

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/royalpay_sign_ln.png b/src/main/ui/static/images/royalpay_sign_ln.png
new file mode 100644
index 0000000000000000000000000000000000000000..72178aee3c77710dc4c5818afa021185dbbeaeeb
GIT binary patch
literal 1504
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc&_u!9QqR!T
z(8R(}N5ROz&{*HVSl`fC*U-qyz|zXlQ~?T<fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf`)Hma%LWg
zuL;)R>ucqiS6q^qmz?V9Vygr+LN7Bj#mdOh+0fG2&C<!z%*4>p)xy!#+1$d!$=T7_
z#n8yq$pxm@B|o_|H#M&WrZ)wl*Ab^)P+G_>0NU)5T9jFqn&MWJpQ`}&vsET;x0vHJ
z52`l>w_7Z5>eUB2MjsTjNHGl)0wy026P|8?9C*r4%>yR)B4D~s|F8v^r<j60T^vIy
zZcUkdHs2>u;@JFZtFF2;5+aXRA9RXx+%VyWptO7-_kRcTH91?PJ6#U#6O4_Vcw<6I
zBd?g4opR>oNtrHEhNo6&N?tX*<Y#Ss{r#QdG@t2tpY9aDw|riE?z7$V+U5^y_&j$p
zT79iQuVNwYFyV1>t;tmuv4*)Tn-(Pg=Gt)V{mN_U%XJ%XXI0d*YacxM`O>o3NgsKZ
z+FyE6`|@b8=DB+56)xHfRW$_et+V_+dkWuokG<wgAFVN&-7YmrVM@^LrRm$3G{$9`
zR!?_j*`Itdp?UUn@9?-oG1JuMG4JD_Q#h%3{*s5cFReU%X??#%S?H}dM`pg*%kfC}
z(yd&-ye#(R{+{pSJu@dfIq`1sr60;Kf2i&;IHx@?V(zjgQErcuectgFg&6_A5?q@u
zuU?XE{G-5Mt2k=X1{<EUrcA#hUK*x-n>S&Z(WM8{PbSyTyb`seNwDeq!h($|waPp8
z8nXV5*xV9%bpE9p!3E10p6yebDRi>W(8=J+`KY@`*jSgH+<4n2xVoT<d&!x-wFlDP
zy_IMb-)(7odY5&!rsD}8$;`RGm#kC1G}rFa6RGYQ28VdR6dQA{`)SJZd+$eY(Fwi@
zGM*3Hzf?FpIyU9Q>}rJ_A6k;EHO{8YVNX2EtgXIei%>`jd*v}}iHkb}`L>1G_X{2Q
z^VQ^;RJirMBimM-EB27xr=5F4v)A^>mdrcf50;(r-_>!(`k7OB!jWBRTp7zM@7qL|
z7f1byPq?bBb91X+(2NJWAI;J(Is4?+%?szIwK#>We!nm3y5xK3gXYoMS9}7k|BEIt
Yr2aef|A=YAKTw(L>FVdQ&MBb@0JpV7ivR!s

literal 0
HcmV?d00001


From 441800b599704dfe6344d4656d7cd53ca5eb04e3 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 26 Sep 2018 14:15:14 +0800
Subject: [PATCH 068/103] add select_nap

---
 src/main/ui/static/images/nap.png              | Bin 0 -> 1203 bytes
 src/main/ui/static/images/royalpay_sign_ln.png | Bin 0 -> 1504 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/main/ui/static/images/nap.png
 create mode 100644 src/main/ui/static/images/royalpay_sign_ln.png

diff --git a/src/main/ui/static/images/nap.png b/src/main/ui/static/images/nap.png
new file mode 100644
index 0000000000000000000000000000000000000000..613b393fa21a6c7df6e338b0de8999da031822b1
GIT binary patch
literal 1203
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc&_u!9QqR!T
z(8R(}N5ROz&{*HVSl`fC*U-qyz|zXlQ~?T<fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf`)Hma%LWg
zuL;)R>ucqiS6q^qmz?V9Vygr+LN7Bj#mdOh+0fG2&Be*m%*4>p)xy!#+1$d!$=T7_
z#n8yq$pxm@B|o_|H#M&WrZ)wl*A=H;P+G_>0NU)5T9jFqn&MWJpQ`}&vsET;w>aT6
z52`l>w_BWX>eUB2MjsTjNHGl)0wy026P|8?9C*r4%>yR)B4E0nT)Zrjfq_xY)5S5Q
z;#Shb=pXmH8XFVU1Wp@IV3T7iv{Js%Anwp+!Cd)3Rd|9xvVwd^BhL?~M#lIV5*n-r
z41Ro(=eTD7<G=g~w&tJP72bT#SNQYqw1Az54BNf`fBx@(apeE|0&y0G#|IpR5;rhd
zGdDLHg!nODz4WV?hey87(BR7~<AMbh3omjU<ZEzy#hk#Q`GLVu-zksTfJwflZNo#h
z29ZNKER60evi0_~UO2ICw*<#S`Kp5-+F8{q9#~$unZq$VQ7Yk&LuH4mfqugcX*q+M
zbf@pqKE@|Dux^)>_;TI(Pxl+93E~a24l+y;vS<8zoIB{tLv@u82O3YbeNgw{Il{iu
zQH;Ime1g6LX9KU}vc#O6M;jcTEL4#E*uYca+Q_)xA&z5_iZwHf1cPjHdv)7Kb4O4y
N;_2$=vd$@?2>=tDlC}T<

literal 0
HcmV?d00001

diff --git a/src/main/ui/static/images/royalpay_sign_ln.png b/src/main/ui/static/images/royalpay_sign_ln.png
new file mode 100644
index 0000000000000000000000000000000000000000..72178aee3c77710dc4c5818afa021185dbbeaeeb
GIT binary patch
literal 1504
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+n3Xd_B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc&_u!9QqR!T
z(8R(}N5ROz&{*HVSl`fC*U-qyz|zXlQ~?T<fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf`)Hma%LWg
zuL;)R>ucqiS6q^qmz?V9Vygr+LN7Bj#mdOh+0fG2&C<!z%*4>p)xy!#+1$d!$=T7_
z#n8yq$pxm@B|o_|H#M&WrZ)wl*Ab^)P+G_>0NU)5T9jFqn&MWJpQ`}&vsET;x0vHJ
z52`l>w_7Z5>eUB2MjsTjNHGl)0wy026P|8?9C*r4%>yR)B4D~s|F8v^r<j60T^vIy
zZcUkdHs2>u;@JFZtFF2;5+aXRA9RXx+%VyWptO7-_kRcTH91?PJ6#U#6O4_Vcw<6I
zBd?g4opR>oNtrHEhNo6&N?tX*<Y#Ss{r#QdG@t2tpY9aDw|riE?z7$V+U5^y_&j$p
zT79iQuVNwYFyV1>t;tmuv4*)Tn-(Pg=Gt)V{mN_U%XJ%XXI0d*YacxM`O>o3NgsKZ
z+FyE6`|@b8=DB+56)xHfRW$_et+V_+dkWuokG<wgAFVN&-7YmrVM@^LrRm$3G{$9`
zR!?_j*`Itdp?UUn@9?-oG1JuMG4JD_Q#h%3{*s5cFReU%X??#%S?H}dM`pg*%kfC}
z(yd&-ye#(R{+{pSJu@dfIq`1sr60;Kf2i&;IHx@?V(zjgQErcuectgFg&6_A5?q@u
zuU?XE{G-5Mt2k=X1{<EUrcA#hUK*x-n>S&Z(WM8{PbSyTyb`seNwDeq!h($|waPp8
z8nXV5*xV9%bpE9p!3E10p6yebDRi>W(8=J+`KY@`*jSgH+<4n2xVoT<d&!x-wFlDP
zy_IMb-)(7odY5&!rsD}8$;`RGm#kC1G}rFa6RGYQ28VdR6dQA{`)SJZd+$eY(Fwi@
zGM*3Hzf?FpIyU9Q>}rJ_A6k;EHO{8YVNX2EtgXIei%>`jd*v}}iHkb}`L>1G_X{2Q
z^VQ^;RJirMBimM-EB27xr=5F4v)A^>mdrcf50;(r-_>!(`k7OB!jWBRTp7zM@7qL|
z7f1byPq?bBb91X+(2NJWAI;J(Is4?+%?szIwK#>We!nm3y5xK3gXYoMS9}7k|BEIt
Yr2aef|A=YAKTw(L>FVdQ&MBb@0JpV7ivR!s

literal 0
HcmV?d00001


From a8a1abda94c2664ddfcb7710d35257ed202ce168 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 26 Sep 2018 14:23:29 +0800
Subject: [PATCH 069/103] pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index adaacec07..cfb6e206d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>au.com.royalpay.payment</groupId>
         <artifactId>payment-parent</artifactId>
-        <version>0.2.0</version>
+        <version>0.2.0-dev</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

From aa2e4bc37eaa1abd3f644a38a176f531135aab7d Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 26 Sep 2018 14:30:53 +0800
Subject: [PATCH 070/103] fix select_nap

---
 .../payment/manage/analysis/mappers/OrderAnalysisMapper.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml
index 81cee3fb0..6c3265277 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml
@@ -204,7 +204,7 @@
         <if test="openid_type==4">
             LEFT JOIN sys_customer_relation r on r.globalpay_openid = o.customer_id
         </if>
-        <if test="openid_type==0 or openid_type==1">
+        <if test="openid_type!=4">
             LEFT JOIN sys_customer_relation r on r.wechat_openid = o.customer_id
         </if>
         <where>

From 4f4306ba33d5a72f595170e6362192ad8c037552 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 26 Sep 2018 14:31:48 +0800
Subject: [PATCH 071/103] fix select_nap

---
 .../payment/manage/analysis/mappers/OrderAnalysisMapper.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml
index 81cee3fb0..6c3265277 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.xml
@@ -204,7 +204,7 @@
         <if test="openid_type==4">
             LEFT JOIN sys_customer_relation r on r.globalpay_openid = o.customer_id
         </if>
-        <if test="openid_type==0 or openid_type==1">
+        <if test="openid_type!=4">
             LEFT JOIN sys_customer_relation r on r.wechat_openid = o.customer_id
         </if>
         <where>

From 562840cedaa43534a0dfbb5cfd98dee9ea7e71f4 Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Wed, 26 Sep 2018 16:21:51 +0800
Subject: [PATCH 072/103] =?UTF-8?q?[fix]=E5=95=86=E6=88=B7=E7=AB=AF?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=A7=98=E9=92=A5=E6=94=AF=E6=8C=81=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/static/payment/partner/partner.js | 22 +++++++++++++++++--
 .../templates/client_payment_info.html        | 10 ++++++++-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/main/ui/static/payment/partner/partner.js b/src/main/ui/static/payment/partner/partner.js
index e4cdb0451..7096890c6 100644
--- a/src/main/ui/static/payment/partner/partner.js
+++ b/src/main/ui/static/payment/partner/partner.js
@@ -560,7 +560,7 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct
         };
     }]);
 
-    app.controller('clientPaymentInfoCtrl', ['$scope', '$http', 'commonDialog', function ($scope, $http, commonDialog) {
+    app.controller('clientPaymentInfoCtrl', ['$scope', '$http', '$state', 'commonDialog', function ($scope, $http, $state, commonDialog) {
         $scope.paymentInfo = $scope.partner;
         $scope.old_customer_surcharge_rate = angular.copy($scope.partner.customer_surcharge_rate);
         $scope.qrConfig = {currency: 'AUD'};
@@ -829,7 +829,25 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct
             $scope.bankshow = false;
         };
 
-
+        // 新增需求，商户端刷新支付秘钥
+        $scope.refreshCredential = function () {
+            commonDialog.confirm({
+                title: 'Warning',
+                content: 'Refresh Credential will expire the current one, ' +
+                         'which will cause the current payment service disabled. ' +
+                         'Are you sure going on?'
+            }).then(function () {
+                $http.put('/sys/partners/' + $scope.partner.client_moniker + '/credential_code').then(function () {
+                    $state.reload();
+                }, function (resp) {
+                    commonDialog.alert({
+                        title: 'Error',
+                        content: resp.data.message,
+                        type: 'error'
+                    })
+                })
+            })
+        };
 
     }]);
     app.controller('clientPaymentMaterialCtrl', ['$scope', '$http', 'partner', function ($scope, $http, partner) {
diff --git a/src/main/ui/static/payment/partner/templates/client_payment_info.html b/src/main/ui/static/payment/partner/templates/client_payment_info.html
index 534d6ca61..ad9158a14 100644
--- a/src/main/ui/static/payment/partner/templates/client_payment_info.html
+++ b/src/main/ui/static/payment/partner/templates/client_payment_info.html
@@ -87,7 +87,15 @@
             <div class="form-group">
                 <label class="control-label col-sm-2">Gateway Credential</label>
                 <div class="col-sm-10">
-                    <p class="form-control-static" ng-bind="partner.credential_code"></p>
+                    <p class="form-control-static">
+                        <span ng-bind="partner.credential_code"></span>
+                        <a role="button"
+                           ng-click="refreshCredential()"
+                           title="refresh"
+                           ng-if="'111'|withRole">
+                            <i class="fa fa-refresh"></i>
+                        </a>
+                    </p>
                 </div>
             </div>
         </div>

From 566ffb244608258cb5916323b101e66ae712f82d Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 26 Sep 2018 16:24:01 +0800
Subject: [PATCH 073/103] add modify sur

---
 .../dev/core/impl/ManualServiceimpl.java      |  9 +++++++
 .../core/impls/ClientManagerImpl.java         |  7 ++++++
 .../manage/task/PostponeClientTask.java       | 10 +++++++-
 .../partner/templates/partner_new_rate.html   | 24 -------------------
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java
index 501daac17..7f1236a4e 100644
--- a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java
@@ -1,7 +1,9 @@
 package au.com.royalpay.payment.manage.dev.core.impl;
 
+import au.com.royalpay.payment.channels.rpay.runtime.RpayApi;
 import au.com.royalpay.payment.manage.dev.core.ManualService;
 import au.com.royalpay.payment.manage.mappers.system.ClientAccountMapper;
+import au.com.royalpay.payment.manage.mappers.system.ClientMapper;
 import au.com.royalpay.payment.manage.mappers.system.ClientRateMapper;
 import au.com.royalpay.payment.manage.merchants.core.ClientModifySupport;
 import au.com.royalpay.payment.manage.merchants.entity.impls.SwitchPermissionModify;
@@ -40,6 +42,10 @@ public class ManualServiceimpl implements ManualService {
     private SynchronizedScheduler synchronizedScheduler;
     @Resource
     private ClientModifySupport clientModifySupport;
+    @Resource
+    private RpayApi rpayApi;
+    @Resource
+    private ClientMapper clientMapper;
 
     @Override
     public void clientPostpone() {
@@ -82,6 +88,9 @@ public class ManualServiceimpl implements ManualService {
                     record.put("manager_name", "System");
                     record.put("remark", "费率到期系统自动延期1年");
                     clientRateMapper.saveRate(record);
+                    if ("Rpay".equals(o.getString("rate_name"))) {
+                        rpayApi.modifySurchargeConfig(clientMapper.findClient(client_id));
+                    }
 
                 });
                 clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, p.getString("client_moniker"), "tax_in_surcharge", false));
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 1785bb42e..6d9da4f29 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
@@ -84,6 +84,7 @@ import au.com.royalpay.payment.manage.support.sms.SmsSender;
 import au.com.royalpay.payment.manage.system.core.ClientContractService;
 import au.com.royalpay.payment.manage.system.core.MailGunService;
 import au.com.royalpay.payment.manage.tradelog.beans.TradeLogQuery;
+import au.com.royalpay.payment.tools.CommonConsts;
 import au.com.royalpay.payment.tools.connections.attachment.core.AttachmentClient;
 import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApi;
 import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApiProvider;
@@ -1610,6 +1611,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         configNewClientRate(config, clientId, "hf", "hf_rate_value", org, "min_hf_rate");
         configNewClientRate(config, clientId, "Rpay", "Rpay_rate_value", org, "min_Rpay_rate");
 
+        rpayApi.modifySurchargeConfig(client);
+
     }
 
     private void configNewClientRate(JSONObject config, int clientId, String channel, String rateKey, JSONObject org, String rateValueKey) {
@@ -1651,6 +1654,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         configJson.put("manager_name", manager.getString("username"));
         configJson.put("update_time", new Date());
         clientRateMapper.updateConfig(configJson);
+        if ("Rpay".equals(configJson.getString("rate_name"))) {
+            rpayApi.modifySurchargeConfig(client);
+        }
         int clientId = client.getIntValue("client_id");
         JSONObject changeRate = merchantInfoProvider.clientCurrentRate(clientId, new Date(), "Wechat");
         int cleanDays = changeRate.getIntValue("clean_days");
@@ -3195,6 +3201,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             throw new InvalidShortIdException();
         }
         clientModifySupport.processClientConfigModify(new SwitchPermissionModify(account, clientMoniker, "skip_clearing", skip_clearing));
+        rpayApi.switchMerchantSettle(client);
     }
 
     @Override
diff --git a/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java b/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java
index 18a98a6d7..9b76c96d6 100644
--- a/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java
+++ b/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java
@@ -1,6 +1,8 @@
 package au.com.royalpay.payment.manage.task;
 
+import au.com.royalpay.payment.channels.rpay.runtime.RpayApi;
 import au.com.royalpay.payment.manage.mappers.system.ClientAccountMapper;
+import au.com.royalpay.payment.manage.mappers.system.ClientMapper;
 import au.com.royalpay.payment.manage.mappers.system.ClientRateMapper;
 import au.com.royalpay.payment.manage.mappers.system.ManagerMapper;
 import au.com.royalpay.payment.manage.merchants.core.ClientManager;
@@ -52,6 +54,10 @@ public class PostponeClientTask {
     private SynchronizedScheduler synchronizedScheduler;
     @Resource
     private ClientModifySupport clientModifySupport;
+    @Resource
+    private RpayApi rpayApi;
+    @Resource
+    private ClientMapper clientMapper;
 
     @Scheduled(cron = "0 30 8 * * ?")
     public void postponeClient() {
@@ -93,7 +99,9 @@ public class PostponeClientTask {
                     record.put("manager_name", "System");
                     record.put("remark", "费率到期系统自动延期1年");
                     clientRateMapper.saveRate(record);
-
+                    if ("Rpay".equals(o.getString("rate_name"))) {
+                        rpayApi.modifySurchargeConfig(clientMapper.findClient(client_id));
+                    }
                 });
                 clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, p.getString("client_moniker"), "tax_in_surcharge", false));
                 adminAccounts.forEach(o -> {
diff --git a/src/main/ui/static/payment/partner/templates/partner_new_rate.html b/src/main/ui/static/payment/partner/templates/partner_new_rate.html
index 19267e23d..fe0aa512f 100644
--- a/src/main/ui/static/payment/partner/templates/partner_new_rate.html
+++ b/src/main/ui/static/payment/partner/templates/partner_new_rate.html
@@ -160,30 +160,6 @@
                     </div>
                 </div>
 
-                <div class="form-group"
-                     ng-class="{'has-error':rate_form.hf_rate_value.$invalid && rate_form.hf_rate_value.$dirty}">
-                    <label class="control-label col-sm-4" for="Rpay_rate_value_input">Rpay+ Rate Value</label>
-                    <div class="col-sm-6">
-                        <div class="input-group">
-                            <input type="number" name="jd_rate_value" stringToNumber2 class="form-control" ng-model="rate.Rpay_rate_value"
-                                   min="0.6" max="2.2" step="0.1" id="Rpay_rate_value_input" required>
-                            <div class="input-group-addon">%</div>
-                        </div>
-                        <div ng-messages="rate_form.hf_rate_value.$error" ng-if="rate_form.hf_rate_value.$dirty">
-                            <div class="small text-danger" ng-message="max">
-                                <i class="glyphicon glyphicon-alert"></i> No more than 2.2%
-                            </div>
-                            <div class="small text-danger" ng-message="min">
-                                <i class="glyphicon glyphicon-alert"></i> No less than 0.6%
-                            </div>
-                            <div class="small text-danger" ng-message="required">
-                                <i class="glyphicon glyphicon-alert"></i> Required Field
-                            </div>
-                        </div>
-
-                    </div>
-                </div>
-
                 <div class="form-group">
                     <label class="control-label col-sm-4" for="active_time_input">Active Date</label>
                     <div class="col-sm-6">

From 6c616d57958e12de9f1f2256ad42174d6108d1b2 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 26 Sep 2018 17:23:37 +0800
Subject: [PATCH 074/103] fix modify sur

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

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 6d9da4f29..ebe26c005 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
@@ -1576,6 +1576,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     }
 
     @Override
+    @Transactional
     public void newConfigRate(JSONObject manager, String clientMoniker, JSONObject config) {
         JSONObject client = getClientInfoByMoniker(clientMoniker);
         if (client == null) {
@@ -1636,6 +1637,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     }
 
     @Override
+    @Transactional
     public void modifyRateConfig(JSONObject manager, String clientMoniker, int rateId, ClientRateConfig config) {
         JSONObject client = getClientInfoByMoniker(clientMoniker);
         if (client == null) {

From 9d0fb270fe4072cfef9d16b0a4834409f94f7523 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 26 Sep 2018 17:27:09 +0800
Subject: [PATCH 075/103] fix modify sur

---
 .../dev/core/impl/ManualServiceimpl.java      | 45 ++++++++++++-------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java
index 7f1236a4e..c5f08f985 100644
--- a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java
@@ -17,6 +17,7 @@ import org.apache.commons.lang3.time.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.Date;
@@ -76,27 +77,37 @@ public class ManualServiceimpl implements ManualService {
                     cleanDays = wechatRate.getIntValue("c_clean_days");
                 }
                 int finalCleanDays = cleanDays;
-                clientRates.forEach(o -> {
-                    JSONObject record = clientRateMapper.latestExpiryConfig(client_id, o.getString("rate_name"));
-                    record.remove("client_rate_id");
-                    record.put("active_time", now);
-                    record.put("manager_id", 0);
-                    record.put("expiry_time", yearTomorrow);
-                    record.put("create_time", now);
-                    record.put("update_time", now);
-                    record.put("clean_days", finalCleanDays);
-                    record.put("manager_name", "System");
-                    record.put("remark", "费率到期系统自动延期1年");
-                    clientRateMapper.saveRate(record);
-                    if ("Rpay".equals(o.getString("rate_name"))) {
-                        rpayApi.modifySurchargeConfig(clientMapper.findClient(client_id));
-                    }
 
-                });
-                clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, p.getString("client_moniker"), "tax_in_surcharge", false));
+                modifyClientRates(finalCleanDays,clientRates,client_id,p.getString("client_moniker"));
+
             });
         });
         logger.info("end doing client postpone");
 
     }
+
+    @Transactional
+    public void modifyClientRates(int finalCleanDays,List<JSONObject> clientRates,int client_id,String client_moniker) {
+        Date now = new Date();
+        Date tomorrow = DateUtils.addDays(now, 1);
+        Date yearTomorrow = DateUtils.addYears(tomorrow, 1);
+        clientRates.forEach(o -> {
+            JSONObject record = clientRateMapper.latestExpiryConfig(client_id, o.getString("rate_name"));
+            record.remove("client_rate_id");
+            record.put("active_time", now);
+            record.put("manager_id", 0);
+            record.put("expiry_time", yearTomorrow);
+            record.put("create_time", now);
+            record.put("update_time", now);
+            record.put("clean_days", finalCleanDays);
+            record.put("manager_name", "System");
+            record.put("remark", "费率到期系统自动延期1年");
+            clientRateMapper.saveRate(record);
+            if ("Rpay".equals(o.getString("rate_name"))) {
+                rpayApi.modifySurchargeConfig(clientMapper.findClient(client_id));
+            }
+
+        });
+        clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, client_moniker, "tax_in_surcharge", false));
+    }
 }

From aa006c3562fdd36938ef1cf19c7e8274eb99e9ad Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 26 Sep 2018 17:30:41 +0800
Subject: [PATCH 076/103] fix modify sur

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

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 ebe26c005..809d5896c 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
@@ -3197,6 +3197,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     }
 
     @Override
+    @Transactional
     public void setSkipClearing(JSONObject account, String clientMoniker, Boolean skip_clearing) {
         JSONObject client = getClientInfoByMoniker(clientMoniker);
         if (client == null) {

From 815603d853f375a1c0409913719ccedce8412429 Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Wed, 26 Sep 2018 17:37:27 +0800
Subject: [PATCH 077/103] pom

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index cfb6e206d..adaacec07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>au.com.royalpay.payment</groupId>
         <artifactId>payment-parent</artifactId>
-        <version>0.2.0-dev</version>
+        <version>0.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

From 58fb928ef2d338233ccda9d0066bcebc4f2e0c45 Mon Sep 17 00:00:00 2001
From: kira <164851225@qq.com>
Date: Wed, 26 Sep 2018 17:44:08 +0800
Subject: [PATCH 078/103] update

---
 .../manage/task/PostponeClientTask.java       | 97 ++++++++++---------
 1 file changed, 50 insertions(+), 47 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java b/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java
index 9b76c96d6..22dea8cc4 100644
--- a/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java
+++ b/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java
@@ -22,13 +22,13 @@ import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.util.Date;
-import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 
 import javax.annotation.Resource;
 
@@ -67,51 +67,60 @@ public class PostponeClientTask {
             Date yearTomorrow = DateUtils.addYears(tomorrow, 1);
             String expireDate = DateFormatUtils.format(yearTomorrow, "yyyy-MM-dd");
             List<JSONObject> expiryClient = clientRateMapper.getAllExpiry(now);
-
+            StringBuilder sb = new StringBuilder();
+            List<JSONObject> successClients = new LinkedList<>();
             if (CollectionUtils.isEmpty(expiryClient)) {
                 return;
             }
-            Map<Integer, JSONObject> expiryClients = new HashMap<>();
-            expiryClient.forEach(p -> {
-                expiryClients.put(p.getInteger("client_id"), p);
-            });
-            expiryClients.values().forEach(p -> {
-                int client_id = p.getIntValue("client_id");
-                List<JSONObject> adminAccounts = clientAccountMapper.listAdminAccounts(client_id);
-                List<JSONObject> clientRates = clientRateMapper.maxChannelExpiryTime(client_id, null);
-                JSONObject wechatRate = clientRateMapper.latestChannelCleanDays("Wechat", p.getIntValue("client_id"));
-                int cleanDays = 1;
-                if (wechatRate.getInteger("clean_days") != null) {
-                    cleanDays = wechatRate.getIntValue("clean_days");
-                } else {
-                    cleanDays = wechatRate.getIntValue("c_clean_days");
+            for (JSONObject p : expiryClient) {
+                try {
+                    modifyRate(now, yearTomorrow, expireDate, p, sb);
+                } catch (Exception ignore) {
+                    continue;
                 }
-                int finalCleanDays = cleanDays;
-                clientRates.forEach(o -> {
-                    JSONObject record = clientRateMapper.latestExpiryConfig(client_id, o.getString("rate_name"));
-                    record.remove("client_rate_id");
-                    record.put("active_time", now);
-                    record.put("manager_id", 0);
-                    record.put("expiry_time", yearTomorrow);
-                    record.put("create_time", now);
-                    record.put("update_time", now);
-                    record.put("clean_days", finalCleanDays);
-                    record.put("manager_name", "System");
-                    record.put("remark", "费率到期系统自动延期1年");
-                    clientRateMapper.saveRate(record);
-                    if ("Rpay".equals(o.getString("rate_name"))) {
-                        rpayApi.modifySurchargeConfig(clientMapper.findClient(client_id));
-                    }
-                });
-                clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, p.getString("client_moniker"), "tax_in_surcharge", false));
-                adminAccounts.forEach(o -> {
-                    sendClientPostponeNotify(o, expireDate);
-                });
-            });
-            sendComplianceNotify(expiryClients, expireDate);
+            }
+            sb.deleteCharAt(sb.length() - 1);
+            sendComplianceNotify(sb, expireDate);
         });
     }
 
+    @Transactional
+    public void modifyRate(Date now, Date yearTomorrow, String expireDate, JSONObject p, StringBuilder sb) {
+        int client_id = p.getIntValue("client_id");
+        List<JSONObject> adminAccounts = clientAccountMapper.listAdminAccounts(client_id);
+        List<JSONObject> clientRates = clientRateMapper.maxChannelExpiryTime(client_id, null);
+        JSONObject wechatRate = clientRateMapper.latestChannelCleanDays("Wechat", p.getIntValue("client_id"));
+        int cleanDays = 1;
+        if (wechatRate.getInteger("clean_days") != null) {
+            cleanDays = wechatRate.getIntValue("clean_days");
+        } else {
+            cleanDays = wechatRate.getIntValue("c_clean_days");
+        }
+        int finalCleanDays = cleanDays;
+        clientRates.forEach(o -> {
+            JSONObject record = clientRateMapper.latestExpiryConfig(client_id, o.getString("rate_name"));
+            record.remove("client_rate_id");
+            record.put("active_time", now);
+            record.put("manager_id", 0);
+            record.put("expiry_time", yearTomorrow);
+            record.put("create_time", now);
+            record.put("update_time", now);
+            record.put("clean_days", finalCleanDays);
+            record.put("manager_name", "System");
+            record.put("remark", "费率到期系统自动延期1年");
+            clientRateMapper.saveRate(record);
+            if ("Rpay".equals(o.getString("rate_name"))) {
+                rpayApi.modifySurchargeConfig(clientMapper.findClient(client_id));
+            }
+        });
+        clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, p.getString("client_moniker"), "tax_in_surcharge", false));
+        adminAccounts.forEach(o -> {
+            sendClientPostponeNotify(o, expireDate);
+        });
+        sb.append(p.getString("client_moniker"));
+        sb.append("、");
+    }
+
     private void sendClientPostponeNotify(JSONObject account, String newExpireDate) {
         JSONObject client = clientManager.getClientInfo(account.getIntValue("client_id"));
 
@@ -132,13 +141,7 @@ public class PostponeClientTask {
         }
     }
 
-    private void sendComplianceNotify(Map<Integer, JSONObject> clients, String newExpireDate) {
-        StringBuffer sb = new StringBuffer();
-        clients.values().forEach(p -> {
-            sb.append(p.getString("client_moniker"));
-            sb.append("、");
-        });
-        sb.deleteCharAt(sb.length() - 1);
+    private void sendComplianceNotify(StringBuilder sb, String newExpireDate) {
         List<String> compliance = managerMapper.listOpenIdsOfCompliances();
         compliance.forEach(p -> {
             MpWechatApi api = mpWechatApiProvider.getApiFromOpenId(p);

From 701e1ceb807fb4136b34ccc8f00c6239be2d6e16 Mon Sep 17 00:00:00 2001
From: kira <164851225@qq.com>
Date: Wed, 26 Sep 2018 17:45:51 +0800
Subject: [PATCH 079/103] update

---
 .../manage/task/PostponeClientTask.java       | 50 +++++++++----------
 1 file changed, 23 insertions(+), 27 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java b/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java
index 22dea8cc4..aeea8c9eb 100644
--- a/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java
+++ b/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java
@@ -8,7 +8,6 @@ import au.com.royalpay.payment.manage.mappers.system.ManagerMapper;
 import au.com.royalpay.payment.manage.merchants.core.ClientManager;
 import au.com.royalpay.payment.manage.merchants.core.ClientModifySupport;
 import au.com.royalpay.payment.manage.merchants.entity.impls.SwitchPermissionModify;
-import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApi;
 import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApiProvider;
 import au.com.royalpay.payment.tools.connections.mpsupport.beans.TemplateMessage;
 import au.com.royalpay.payment.tools.scheduler.SynchronizedScheduler;
@@ -24,10 +23,8 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
 
 import java.util.Date;
-import java.util.LinkedList;
 import java.util.List;
 
 import javax.annotation.Resource;
@@ -68,7 +65,6 @@ public class PostponeClientTask {
             String expireDate = DateFormatUtils.format(yearTomorrow, "yyyy-MM-dd");
             List<JSONObject> expiryClient = clientRateMapper.getAllExpiry(now);
             StringBuilder sb = new StringBuilder();
-            List<JSONObject> successClients = new LinkedList<>();
             if (CollectionUtils.isEmpty(expiryClient)) {
                 return;
             }
@@ -122,32 +118,32 @@ public class PostponeClientTask {
     }
 
     private void sendClientPostponeNotify(JSONObject account, String newExpireDate) {
-        JSONObject client = clientManager.getClientInfo(account.getIntValue("client_id"));
-
-        try {
-            if (StringUtils.isEmpty(account.getString("wechat_openid"))) {
-                return;
-            }
-            MpWechatApi api = mpWechatApiProvider.getApiFromOpenId(account.getString("wechat_openid"));
-            if (api != null) {
-                String templateId = api.getTemplateId("client-postpone");
-                if (templateId != null) {
-                    TemplateMessage notice = initClientMessage(client, newExpireDate, account.getString("wechat_openid"), templateId);
-                    api.sendTemplateMessage(notice);
-                }
-            }
-        } catch (Exception e) {
-            logger.error("Sending Notify failure", e);
-        }
+//        JSONObject client = clientManager.getClientInfo(account.getIntValue("client_id"));
+//
+//        try {
+//            if (StringUtils.isEmpty(account.getString("wechat_openid"))) {
+//                return;
+//            }
+//            MpWechatApi api = mpWechatApiProvider.getApiFromOpenId(account.getString("wechat_openid"));
+//            if (api != null) {
+//                String templateId = api.getTemplateId("client-postpone");
+//                if (templateId != null) {
+//                    TemplateMessage notice = initClientMessage(client, newExpireDate, account.getString("wechat_openid"), templateId);
+//                    api.sendTemplateMessage(notice);
+//                }
+//            }
+//        } catch (Exception e) {
+//            logger.error("Sending Notify failure", e);
+//        }
     }
 
     private void sendComplianceNotify(StringBuilder sb, String newExpireDate) {
-        List<String> compliance = managerMapper.listOpenIdsOfCompliances();
-        compliance.forEach(p -> {
-            MpWechatApi api = mpWechatApiProvider.getApiFromOpenId(p);
-            TemplateMessage notice = initComplianceMessage(sb.toString(), newExpireDate, p, api.getTemplateId("client-postpone"));
-            api.sendTemplateMessage(notice);
-        });
+//        List<String> compliance = managerMapper.listOpenIdsOfCompliances();
+//        compliance.forEach(p -> {
+//            MpWechatApi api = mpWechatApiProvider.getApiFromOpenId(p);
+//            TemplateMessage notice = initComplianceMessage(sb.toString(), newExpireDate, p, api.getTemplateId("client-postpone"));
+//            api.sendTemplateMessage(notice);
+//        });
 
     }
 

From 4507310f8b31995ddb211cdafd74213069b18d1e Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 26 Sep 2018 19:37:29 +0800
Subject: [PATCH 080/103] fix modify sur

---
 src/document/cn/apis.js | 55 +--------------------------------------
 src/document/en/apis.js | 57 +----------------------------------------
 2 files changed, 2 insertions(+), 110 deletions(-)

diff --git a/src/document/cn/apis.js b/src/document/cn/apis.js
index bec207b8a..5642c6f87 100644
--- a/src/document/cn/apis.js
+++ b/src/document/cn/apis.js
@@ -106,60 +106,7 @@
  * @apiError (ERROR_CODE) ORDER_NOT_EXIST 订单不存在
  * @apiError (ERROR_CODE) ORDER_MISMATCH 订单号与商户不匹配
  */
-/**
- * @api {PUT} /api/v1.0/h5_payment/partners/{partner_code}/orders/{order_id} 创建H5支付单
- * @apiName NewMobileH5Pay
- * @apiGroup MobileH5
- * @apiVersion 1.0.0
- * @apiDescription
- * <b>注意：微信H5支付接口必须单独申请，腾讯批复后方可使用，有需要的商户请联系RoyalPay客服，支付宝无此限制</b><br>
- * H5支付适用场景为移动端App或者手机自带浏览器进行支付，用户下单后浏览器跳转至微信支付页面并自动拉起微信/支付宝客户端完成支付。<br>
- * 返回值包括跳转支付地址，跳转支付页需要带上签名信息。
- * 货币类型如果是CNY，注意通过汇率转换后不得低于0.01AUD，否则订单可以创建成功，但支付时会报金额不合法错误<br>
- *     <img src="img/h5_api_payment.jpg">
- * @apiHeader Accept application/json
- * @apiHeader Content-Type application/json
- * @apiParam (PathVariable) {String} partner_code 必填，商户编码，由4位大写字母或数字构成
- * @apiParam (PathVariable) {String} order_id 必填，商户支付订单号，要求同一商户唯一
- * @apiUse Sign
- * @apiParam (JSON) {String} description 必填，订单标题（最大长度128字符，超出自动截取）
- * @apiParam (JSON) {int} price 必填，金额，单位为货币最小单位，例如使用100表示AUD1.00
- * @apiParam (JSON) {String=AUD,CNY} currency=AUD 币种代码
- * @apiParam (JSON) {String=Alipay,Wechat} channel 支付渠道，大小写敏感
- * @apiParam (JSON) {String} notify_url 支付通知url，详见支付通知api，不填则不会推送支付通知
- * @apiParam (JSON) {String} operator 操作人员标识
- *
- * @apiSuccess {String} return_code 执行结果
- * @apiSuccess {String} result_code SUCCESS表示创建订单成功，EXISTS表示订单已存在
- * @apiSuccess {String} partner_code 商户编码
- * @apiSuccess {String} channel 支付渠道
- * @apiSuccess {String} full_name 商户注册全名
- * @apiSuccess {String} partner_name 商户名称
- * @apiSuccess {String} order_id RoyalPay订单ID，同时也是微信订单ID，最终支付成功的订单ID可能不同
- * @apiSuccess {String} partner_order_id 商户订单ID
- * @apiSuccess {String} pay_url 跳转URL
- *
- * @apiUse GlobalError
- * @apiError (ERROR_CODE) ORDER_MISMATCH 订单号与商户不匹配
- * @apiError (ERROR_CODE) ORDER_PAID 订单已支付
- *
- */
-/**
- * @api {GET} /api/v1.0/h5_payment/partners/{partner_code}/orders/{order_id}/pay H5支付跳转页
- * @apiName MobileH5Pay
- * @apiDescription 必须先调用创建H5支付订单接口再进行跳转。
- * 建议在用户回调到对应页时通过后台查询订单状态接口确认订单的支付状态。
- * @apiVersion 1.0.0
- * @apiGroup MobileH5
- * @apiParam (PathVariable) {String} partner_code 必填，商户编码，由4位大写字母或数字构成
- * @apiParam (PathVariable) {String} order_id 必填，商户支付订单号，要求已预先创建
- * @apiUse Sign
- * @apiParam (QueryParam) {String} redirect 必填，支付成功后跳转页面，回调时会带上签名参数用于校验
- *
- * @apiUse GlobalError
- * @apiError (ERROR_CODE) ORDER_NOT_EXIST 订单不存在
- * @apiError (ERROR_CODE) ORDER_MISMATCH 订单号与商户不匹配
- */
+
 
 /**
  * @api {PUT} /api/v1.0/jsapi_gateway/partners/{partner_code}/orders/{order_id} 创建JSAPI订单
diff --git a/src/document/en/apis.js b/src/document/en/apis.js
index a09a8949e..7abb83c7d 100644
--- a/src/document/en/apis.js
+++ b/src/document/en/apis.js
@@ -109,62 +109,7 @@
  * @apiError (ERROR_CODE) ORDER_NOT_EXIST Order does not exist
  * @apiError (ERROR_CODE) ORDER_MISMATCH Order is not belong to this partner
  */
-/**
- * @api {PUT} /api/v1.0/h5_payment/partners/{partner_code}/orders/{order_id} Create H5 Payment
- * @apiName NewMobileH5Pay
- * @apiGroup MobileH5
- * @apiVersion 1.0.0
- * @apiDescription
- * <b>Warning：H5 Payment socket requires application separately and requires agreement from Tencent. Merchants who needs this socket please contact RoyalPay first.
- * Alipay has no limit at the moment.</b><br>
- * H5 Payment is used for payment in Webpage or App on mobile outside WeChat or Alipay App. The browser would redirect to a webpage from WeChat or Alipay and call the App to finish the payment.<br>
- * Return value contains a payment page. Partners shall guide users to redirect to this page. Sign params are required.
- * If the currency is CNY, equivalent AUD amount shall never less than 0.01AUD,
- * otherwise user will get Invalid Amount Error from WeChat when making the payment.<br>
- *     <img src="img/h5_api_payment.jpg">
- * @apiHeader Accept application/json
- * @apiHeader Content-Type application/json
- * @apiParam (PathVariable) {String} partner_code Required, Partner code
- * @apiParam (PathVariable) {String} order_id Required, Partner order id
- * @apiUse Sign
- * @apiParam (JSON) {String} description Required, Order description
- * @apiParam (JSON) {int} price Required, Price of the order. Use the base unit of the currency.
- * @apiParam (JSON) {String=AUD,CNY} currency=AUD currency
- * @apiParam (JSON) {String=Alipay,Wechat} channel Payment channel, case sensitive
- * @apiParam (JSON) {String} notify_url System will call the notify url if provided when the payment succeeds
- * @apiParam (JSON) {String} operator Note for the operator who created this order.
- *
- * @apiSuccess {String} return_code Execution result
- * @apiSuccess {String} result_code SUCCESS means order created successfully, EXISTS means order has already existed.
- * @apiSuccess {String} partner_code Partner code
- * @apiSuccess {String} channel Payment channel
- * @apiSuccess {String} full_name Partner's full company name when registered
- * @apiSuccess {String} partner_name Partner's name
- * @apiSuccess {String} order_id Order id in RoyalPay, which is also WeChat order id.
- * @apiSuccess {String} partner_order_id Partner order id
- * @apiSuccess {String} pay_url Payment page in RoyalPay.
- *
- * @apiUse GlobalError
- * @apiError (ERROR_CODE) ORDER_MISMATCH Order is not belong to this partner
- * @apiError (ERROR_CODE) ORDER_PAID Order has already been paid
- *
- */
-/**
- * @api {GET} /api/v1.0/h5_payment/partners/{partner_code}/orders/{order_id}/pay H5 Payment Page
- * @apiName MobileH5Pay
- * @apiDescription This page mush be called after payment order has been created.
- * When jumping back to redirection URL, it is recommended to call the order query API to make sure the payment has succeeded.
- * @apiVersion 1.0.0
- * @apiGroup MobileH5
- * @apiParam (PathVariable) {String} partner_code Required, Partner code
- * @apiParam (PathVariable) {String} order_id Required, Partner order id. It shall have already been created
- * @apiUse Sign
- * @apiParam (QueryParam) {String} redirect Required, Redirect url when payment succeeded. Contain sign parameters for validation.
- *
- * @apiUse GlobalError
- * @apiError (ERROR_CODE) ORDER_NOT_EXIST Order does not exist
- * @apiError (ERROR_CODE) ORDER_MISMATCH Order is not belong to this partner
- */
+
 
 /**
  * @api {PUT} /api/v1.0/jsapi_gateway/partners/{partner_code}/orders/{order_id} Create JSAPI Payment Order

From d6c53c115b7b85419e503570351b9e3749eee3db Mon Sep 17 00:00:00 2001
From: kira <164851225@qq.com>
Date: Wed, 26 Sep 2018 20:32:33 +0800
Subject: [PATCH 081/103] postpone client rate

---
 .../manage/merchants/core/ClientManager.java  |  2 +
 .../core/impls/ClientManagerImpl.java         | 73 +++++++++++++-
 .../manage/task/PostponeClientTask.java       | 99 ++-----------------
 .../mappers/system/ClientRateMapper.xml       |  2 +-
 4 files changed, 84 insertions(+), 92 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
index 377d370cf..a1da2958b 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 import javax.servlet.http.HttpServletResponse;
@@ -340,4 +341,5 @@ public interface ClientManager {
 
     void updateAllPartnerPassword(String clientMoniker, List<String> emails);
 
+    void postponeClientRate(Date now, Date yearTomorrow, String expireDate, JSONObject p, StringBuilder sb);
 }
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 6d9da4f29..ddb9a9738 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
@@ -84,7 +84,6 @@ import au.com.royalpay.payment.manage.support.sms.SmsSender;
 import au.com.royalpay.payment.manage.system.core.ClientContractService;
 import au.com.royalpay.payment.manage.system.core.MailGunService;
 import au.com.royalpay.payment.manage.tradelog.beans.TradeLogQuery;
-import au.com.royalpay.payment.tools.CommonConsts;
 import au.com.royalpay.payment.tools.connections.attachment.core.AttachmentClient;
 import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApi;
 import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApiProvider;
@@ -124,6 +123,7 @@ import com.github.miemiedev.mybatis.paginator.domain.PageList;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.RandomUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.time.DateUtils;
@@ -3976,6 +3976,77 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
 
     }
 
+    private void sendClientPostponeNotify(JSONObject account, String newExpireDate) {
+        JSONObject client = getClientInfo(account.getIntValue("client_id"));
+
+        try {
+            if (StringUtils.isEmpty(account.getString("wechat_openid"))) {
+                return;
+            }
+            MpWechatApi api = mpWechatApiProvider.getApiFromOpenId(account.getString("wechat_openid"));
+            if (api != null) {
+                String templateId = api.getTemplateId("client-postpone");
+                if (templateId != null) {
+                    TemplateMessage notice = initClientMessage(client, newExpireDate, account.getString("wechat_openid"), templateId);
+                    api.sendTemplateMessage(notice);
+                }
+            }
+        } catch (Exception e) {
+            logger.error("Sending Notify failure", e);
+        }
+    }
+
+    @Override
+    @Transactional
+    public void postponeClientRate(Date now, Date yearTomorrow, String expireDate, JSONObject p, StringBuilder sb) {
+        int client_id = p.getIntValue("client_id");
+        List<JSONObject> adminAccounts = clientAccountMapper.listAdminAccounts(client_id);
+        List<JSONObject> clientRates = clientRateMapper.maxChannelExpiryTime(client_id, null);
+        JSONObject wechatRate = clientRateMapper.latestChannelCleanDays("Wechat", p.getIntValue("client_id"));
+        int cleanDays = 1;
+        if (wechatRate.getInteger("clean_days") != null) {
+            cleanDays = wechatRate.getIntValue("clean_days");
+        } else {
+            cleanDays = wechatRate.getIntValue("c_clean_days");
+        }
+        int finalCleanDays = cleanDays;
+        for (JSONObject o : clientRates) {
+            JSONObject record = clientRateMapper.latestExpiryConfig(client_id, o.getString("rate_name"));
+            record.remove("client_rate_id");
+            record.put("active_time", now);
+            record.put("manager_id", 0);
+            record.put("expiry_time", yearTomorrow);
+            record.put("create_time", now);
+            record.put("update_time", now);
+            record.put("clean_days", finalCleanDays);
+            record.put("manager_name", "System");
+            record.put("remark", "费率到期系统自动延期1年");
+            clientRateMapper.saveRate(record);
+            if ("Rpay".equals(o.getString("rate_name"))) {
+                rpayApi.modifySurchargeConfig(clientMapper.findClient(client_id));
+
+            }
+        }
+        clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, p.getString("client_moniker"), "tax_in_surcharge", false));
+        adminAccounts.forEach(o -> {
+            sendClientPostponeNotify(o, expireDate);
+        });
+        sb.append(p.getString("client_moniker"));
+        sb.append("、");
+    }
+
+
+
+    private TemplateMessage initClientMessage(JSONObject client, String newExpiryDate, String wechatOpenid, String templateId) {
+        TemplateMessage notice = new TemplateMessage(wechatOpenid, templateId, null);
+        notice.put("first", "您好，您的合同费率已到期，根据合同协议系统已自动为您延期1年。", "#ff0000");
+        notice.put("keyword1", client.getString("short_name") + "(" + client.getString("client_moniker") + ")", "#ff0000");
+        notice.put("keyword2", newExpiryDate, "#0000ff");
+        notice.put("remark", "如有疑问请联系RoyalPay", "#000000");
+        return notice;
+    }
+
+
     private void sendTestMerchantPassword(List<JSONObject> accounts, List<String> emails) {
         Context ctx = new Context();
         ctx.setVariable("accounts", accounts);
diff --git a/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java b/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java
index aeea8c9eb..f0cc4f098 100644
--- a/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java
+++ b/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java
@@ -1,13 +1,9 @@
 package au.com.royalpay.payment.manage.task;
 
-import au.com.royalpay.payment.channels.rpay.runtime.RpayApi;
-import au.com.royalpay.payment.manage.mappers.system.ClientAccountMapper;
-import au.com.royalpay.payment.manage.mappers.system.ClientMapper;
 import au.com.royalpay.payment.manage.mappers.system.ClientRateMapper;
 import au.com.royalpay.payment.manage.mappers.system.ManagerMapper;
 import au.com.royalpay.payment.manage.merchants.core.ClientManager;
-import au.com.royalpay.payment.manage.merchants.core.ClientModifySupport;
-import au.com.royalpay.payment.manage.merchants.entity.impls.SwitchPermissionModify;
+import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApi;
 import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApiProvider;
 import au.com.royalpay.payment.tools.connections.mpsupport.beans.TemplateMessage;
 import au.com.royalpay.payment.tools.scheduler.SynchronizedScheduler;
@@ -21,7 +17,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.Date;
@@ -44,17 +39,9 @@ public class PostponeClientTask {
     @Resource
     private ClientManager clientManager;
     @Resource
-    private ClientAccountMapper clientAccountMapper;
-    @Resource
     private ManagerMapper managerMapper;
     @Resource
     private SynchronizedScheduler synchronizedScheduler;
-    @Resource
-    private ClientModifySupport clientModifySupport;
-    @Resource
-    private RpayApi rpayApi;
-    @Resource
-    private ClientMapper clientMapper;
 
     @Scheduled(cron = "0 30 8 * * ?")
     public void postponeClient() {
@@ -70,9 +57,9 @@ public class PostponeClientTask {
             }
             for (JSONObject p : expiryClient) {
                 try {
-                    modifyRate(now, yearTomorrow, expireDate, p, sb);
+                    clientManager.postponeClientRate(now, yearTomorrow, expireDate, p, sb);
                 } catch (Exception ignore) {
-                    continue;
+                    logger.info("a",ignore);
                 }
             }
             sb.deleteCharAt(sb.length() - 1);
@@ -80,82 +67,15 @@ public class PostponeClientTask {
         });
     }
 
-    @Transactional
-    public void modifyRate(Date now, Date yearTomorrow, String expireDate, JSONObject p, StringBuilder sb) {
-        int client_id = p.getIntValue("client_id");
-        List<JSONObject> adminAccounts = clientAccountMapper.listAdminAccounts(client_id);
-        List<JSONObject> clientRates = clientRateMapper.maxChannelExpiryTime(client_id, null);
-        JSONObject wechatRate = clientRateMapper.latestChannelCleanDays("Wechat", p.getIntValue("client_id"));
-        int cleanDays = 1;
-        if (wechatRate.getInteger("clean_days") != null) {
-            cleanDays = wechatRate.getIntValue("clean_days");
-        } else {
-            cleanDays = wechatRate.getIntValue("c_clean_days");
-        }
-        int finalCleanDays = cleanDays;
-        clientRates.forEach(o -> {
-            JSONObject record = clientRateMapper.latestExpiryConfig(client_id, o.getString("rate_name"));
-            record.remove("client_rate_id");
-            record.put("active_time", now);
-            record.put("manager_id", 0);
-            record.put("expiry_time", yearTomorrow);
-            record.put("create_time", now);
-            record.put("update_time", now);
-            record.put("clean_days", finalCleanDays);
-            record.put("manager_name", "System");
-            record.put("remark", "费率到期系统自动延期1年");
-            clientRateMapper.saveRate(record);
-            if ("Rpay".equals(o.getString("rate_name"))) {
-                rpayApi.modifySurchargeConfig(clientMapper.findClient(client_id));
-            }
-        });
-        clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, p.getString("client_moniker"), "tax_in_surcharge", false));
-        adminAccounts.forEach(o -> {
-            sendClientPostponeNotify(o, expireDate);
-        });
-        sb.append(p.getString("client_moniker"));
-        sb.append("、");
-    }
-
-    private void sendClientPostponeNotify(JSONObject account, String newExpireDate) {
-//        JSONObject client = clientManager.getClientInfo(account.getIntValue("client_id"));
-//
-//        try {
-//            if (StringUtils.isEmpty(account.getString("wechat_openid"))) {
-//                return;
-//            }
-//            MpWechatApi api = mpWechatApiProvider.getApiFromOpenId(account.getString("wechat_openid"));
-//            if (api != null) {
-//                String templateId = api.getTemplateId("client-postpone");
-//                if (templateId != null) {
-//                    TemplateMessage notice = initClientMessage(client, newExpireDate, account.getString("wechat_openid"), templateId);
-//                    api.sendTemplateMessage(notice);
-//                }
-//            }
-//        } catch (Exception e) {
-//            logger.error("Sending Notify failure", e);
-//        }
-    }
-
     private void sendComplianceNotify(StringBuilder sb, String newExpireDate) {
-//        List<String> compliance = managerMapper.listOpenIdsOfCompliances();
-//        compliance.forEach(p -> {
-//            MpWechatApi api = mpWechatApiProvider.getApiFromOpenId(p);
-//            TemplateMessage notice = initComplianceMessage(sb.toString(), newExpireDate, p, api.getTemplateId("client-postpone"));
-//            api.sendTemplateMessage(notice);
-//        });
+        List<String> compliance = managerMapper.listOpenIdsOfCompliances();
+        compliance.forEach(p -> {
+            MpWechatApi api = mpWechatApiProvider.getApiFromOpenId(p);
+            TemplateMessage notice = initComplianceMessage(sb.toString(), newExpireDate, p, api.getTemplateId("client-postpone"));
+            api.sendTemplateMessage(notice);
+        });
 
     }
-
-    private TemplateMessage initClientMessage(JSONObject client, String newExpiryDate, String wechatOpenid, String templateId) {
-        TemplateMessage notice = new TemplateMessage(wechatOpenid, templateId, null);
-        notice.put("first", "您好，您的合同费率已到期，根据合同协议系统已自动为您延期1年。", "#ff0000");
-        notice.put("keyword1", client.getString("short_name") + "(" + client.getString("client_moniker") + ")", "#ff0000");
-        notice.put("keyword2", newExpiryDate, "#0000ff");
-        notice.put("remark", "如有疑问请联系RoyalPay", "#000000");
-        return notice;
-    }
-
     private TemplateMessage initComplianceMessage(String clients, String newExpiryDate, String wechatOpenid, String templateId) {
         TemplateMessage notice = new TemplateMessage(wechatOpenid, templateId, null);
         notice.put("first", "以下商户据合同费率已经自动延期1年", "#ff0000");
@@ -164,5 +84,4 @@ public class PostponeClientTask {
         notice.put("remark", " ", "#000000");
         return notice;
     }
-
 }
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.xml
index 8407cb6c3..545d64bdc 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientRateMapper.xml
@@ -113,7 +113,7 @@
             			sys_client_rates cr
             		inner join sys_clients c on c.client_id = cr.client_id and c.is_valid = 1 and (c.approve_result = 1 or c.approve_result = 2)
             		GROUP BY
-            			cr.client_id ,cr.rate_name
+            			cr.client_id
             	) a
             WHERE
             	a.expiry_time < #{expiry_date}

From 3a7241360f91e4d7aa934bc217cd6bb464e40dea Mon Sep 17 00:00:00 2001
From: kira <164851225@qq.com>
Date: Wed, 26 Sep 2018 20:37:39 +0800
Subject: [PATCH 082/103] update

---
 .../payment/manage/merchants/core/ClientManager.java   |  2 +-
 .../manage/merchants/core/impls/ClientManagerImpl.java | 10 ++++------
 .../payment/manage/task/PostponeClientTask.java        |  8 +++++---
 .../payment/manage/task/PostponeClientTaskTest.java    |  6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
index a1da2958b..8bcca2a11 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
@@ -341,5 +341,5 @@ public interface ClientManager {
 
     void updateAllPartnerPassword(String clientMoniker, List<String> emails);
 
-    void postponeClientRate(Date now, Date yearTomorrow, String expireDate, JSONObject p, StringBuilder sb);
+    void postponeClientRate(Date now, Date yearTomorrow, String expireDate, JSONObject client);
 }
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 ddb9a9738..85af71677 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
@@ -3998,11 +3998,11 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
 
     @Override
     @Transactional
-    public void postponeClientRate(Date now, Date yearTomorrow, String expireDate, JSONObject p, StringBuilder sb) {
-        int client_id = p.getIntValue("client_id");
+    public void postponeClientRate(Date now, Date yearTomorrow, String expireDate, JSONObject client) {
+        int client_id = client.getIntValue("client_id");
         List<JSONObject> adminAccounts = clientAccountMapper.listAdminAccounts(client_id);
         List<JSONObject> clientRates = clientRateMapper.maxChannelExpiryTime(client_id, null);
-        JSONObject wechatRate = clientRateMapper.latestChannelCleanDays("Wechat", p.getIntValue("client_id"));
+        JSONObject wechatRate = clientRateMapper.latestChannelCleanDays("Wechat", client.getIntValue("client_id"));
         int cleanDays = 1;
         if (wechatRate.getInteger("clean_days") != null) {
             cleanDays = wechatRate.getIntValue("clean_days");
@@ -4027,12 +4027,10 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
 
             }
         }
-        clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, p.getString("client_moniker"), "tax_in_surcharge", false));
+        clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, client.getString("client_moniker"), "tax_in_surcharge", false));
         adminAccounts.forEach(o -> {
             sendClientPostponeNotify(o, expireDate);
         });
-        sb.append(p.getString("client_moniker"));
-        sb.append("、");
     }
 
 
diff --git a/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java b/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java
index f0cc4f098..c03a84d31 100644
--- a/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java
+++ b/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java
@@ -55,11 +55,13 @@ public class PostponeClientTask {
             if (CollectionUtils.isEmpty(expiryClient)) {
                 return;
             }
-            for (JSONObject p : expiryClient) {
+            for (JSONObject client : expiryClient) {
                 try {
-                    clientManager.postponeClientRate(now, yearTomorrow, expireDate, p, sb);
+                    clientManager.postponeClientRate(now, yearTomorrow, expireDate, client);
+                    sb.append(client.getString("client_moniker"));
+                    sb.append("、");
                 } catch (Exception ignore) {
-                    logger.info("a",ignore);
+                    continue;
                 }
             }
             sb.deleteCharAt(sb.length() - 1);
diff --git a/src/test/java/au/com/royalpay/payment/manage/task/PostponeClientTaskTest.java b/src/test/java/au/com/royalpay/payment/manage/task/PostponeClientTaskTest.java
index 42b2f38e6..254f1ca27 100644
--- a/src/test/java/au/com/royalpay/payment/manage/task/PostponeClientTaskTest.java
+++ b/src/test/java/au/com/royalpay/payment/manage/task/PostponeClientTaskTest.java
@@ -10,9 +10,9 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 import javax.annotation.Resource;
 
-@SpringBootTest
-@ActiveProfiles({ "local", "alipay", "wechat", "jd", "bestpay" })
-@RunWith(SpringRunner.class)
+ @SpringBootTest
+ @ActiveProfiles({ "local","rpay", "alipay", "wechat", "jd", "bestpay" })
+ @RunWith(SpringRunner.class)
 public class PostponeClientTaskTest {
     @Resource
     private ClientRateMapper clientRateMapper;

From aba4101dd72b47209eaf901f8230c117f3fd1034 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 27 Sep 2018 17:14:33 +0800
Subject: [PATCH 083/103] add

---
 .../manage/dev/core/HfUpdateService.java      |  2 ++
 .../manage/dev/core/impl/HfUpdateImpl.java    | 13 ++++++++++++
 .../manage/dev/web/TestController.java        | 13 ++++++++++++
 .../manage/mappers/system/ClientMapper.java   |  2 ++
 .../core/impls/ClientManagerImpl.java         |  1 +
 .../manage/mappers/system/ClientMapper.xml    |  4 ++++
 .../ui/static/config/devtools/devtools.js     | 20 +++++++++++++++++++
 .../config/devtools/templates/hfupdate.html   |  2 +-
 .../config/devtools/templates/root.html       |  4 ++++
 .../config/devtools/templates/rpayupdate.html | 15 ++++++++++++++
 10 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 src/main/ui/static/config/devtools/templates/rpayupdate.html

diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/HfUpdateService.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/HfUpdateService.java
index bc5cf8b27..fb7611487 100644
--- a/src/main/java/au/com/royalpay/payment/manage/dev/core/HfUpdateService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/HfUpdateService.java
@@ -6,4 +6,6 @@ public interface HfUpdateService {
 
     String updateStatus();
 
+    String rpayUpdate();
+
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/HfUpdateImpl.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/HfUpdateImpl.java
index 4d10674de..8db1c972a 100644
--- a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/HfUpdateImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/HfUpdateImpl.java
@@ -1,5 +1,6 @@
 package au.com.royalpay.payment.manage.dev.core.impl;
 
+import au.com.royalpay.payment.channels.rpay.runtime.RpayApi;
 import au.com.royalpay.payment.manage.dev.core.HfUpdateService;
 import au.com.royalpay.payment.manage.mappers.system.ClientConfigMapper;
 import au.com.royalpay.payment.manage.mappers.system.ClientMapper;
@@ -23,6 +24,8 @@ public class HfUpdateImpl implements HfUpdateService {
     private MpWechatApiProvider mpWechatApiProvider;
     @Resource
     private ClientConfigMapper clientConfigMapper;
+    @Resource
+    private RpayApi rpayApi;
 
     @Override
     public String updateStatus() {
@@ -41,4 +44,14 @@ public class HfUpdateImpl implements HfUpdateService {
         });
         return "ok";
     }
+
+    @Override
+    public String rpayUpdate() {
+        List<JSONObject> clientIds = clientMapper.findByrpayNotNull();
+        clientIds.forEach(dbResult -> {
+            rpayApi.modifySurchargeConfig(dbResult);
+
+        });
+        return "ok";
+    }
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java
index c14326cc6..5d664eac8 100644
--- a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java
@@ -4,6 +4,7 @@ import au.com.royalpay.payment.channels.alipay.config.AlipayEnvironment;
 import au.com.royalpay.payment.channels.alipay.runtime.AlipayClient;
 import au.com.royalpay.payment.channels.bestpay.runtime.BestPayClient;
 import au.com.royalpay.payment.channels.jd.runtime.JDClient;
+import au.com.royalpay.payment.channels.rpay.runtime.RpayClient;
 import au.com.royalpay.payment.channels.wechat.runtime.WxPayClient;
 import au.com.royalpay.payment.core.PaymentApi;
 import au.com.royalpay.payment.core.exceptions.InvalidShortIdException;
@@ -96,6 +97,8 @@ public class TestController implements ApplicationEventPublisherAware {
     @Resource
     private JDClient jdClient;
     @Resource
+    private RpayClient rpayClient;
+    @Resource
     private TradeLogService tradeLogService;
     @Resource
     private RetailAppService retailAppService;
@@ -292,6 +295,11 @@ public class TestController implements ApplicationEventPublisherAware {
                 xmlStr = XmlFormatUtils.formatXml(elem);
                 res.put("xml", xmlStr);
                 break;
+            case "Rpay":
+                JSONObject orderInfo = rpayClient.queryOrderStatus(orderId);
+                String rpayjson = JSON.toJSONString(orderInfo, SerializerFeature.PrettyFormat);
+                res.put("xml", rpayjson);
+                break;
             default:
                 throw new BadRequestException("Not Support channel:" + channel);
         }
@@ -403,4 +411,9 @@ public class TestController implements ApplicationEventPublisherAware {
     public String hfClearAmount() {
         return hfUpdateService.updateStatus();
     }
+
+    @ManagerMapping(value = "/rpayUpdate", method = RequestMethod.PUT, role = ManagerRole.DEVELOPER)
+    public String rpayUpdateClearing() {
+        return hfUpdateService.rpayUpdate();
+    }
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
index f42b842c5..a1b6d4cb9 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
@@ -102,4 +102,6 @@ public interface ClientMapper {
     @AutoSql(type = SqlType.UPDATE)
     void updateRpayEnterpriseId(@Param("client_id") int clientId, @Param("rpay_enterprise_id") String rpayEnterpriseId);
 
+    List<JSONObject> findByrpayNotNull();
+
 }
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 6ab73390b..244c5f03d 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
@@ -3204,6 +3204,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             throw new InvalidShortIdException();
         }
         clientModifySupport.processClientConfigModify(new SwitchPermissionModify(account, clientMoniker, "skip_clearing", skip_clearing));
+        client.put("skip_clearing", skip_clearing);
         rpayApi.switchMerchantSettle(client);
     }
 
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
index ac92fbe79..815348b9d 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
@@ -365,4 +365,8 @@
     <select id="findByhfPayUrlNotNull" resultType="com.alibaba.fastjson.JSONObject">
       select client_id,client_moniker FROM sys_clients WHERE hf_pay_url != ''
     </select>
+
+    <select id="findByrpayNotNull" resultType="com.alibaba.fastjson.JSONObject">
+        select * FROM sys_clients WHERE rpay_enterprise_id != ''
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/ui/static/config/devtools/devtools.js b/src/main/ui/static/config/devtools/devtools.js
index e5dd667ed..009e3dcc5 100644
--- a/src/main/ui/static/config/devtools/devtools.js
+++ b/src/main/ui/static/config/devtools/devtools.js
@@ -63,6 +63,10 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
             url: '/hfupdate',
             templateUrl: '/static/config/devtools/templates/hfupdate.html',
             controller: 'hfupdateCtrl'
+        }).state('devtools.rpayupdate', {
+            url: '/rpayupdate',
+            templateUrl: '/static/config/devtools/templates/rpayupdate.html',
+            controller: 'rpayupdateCtrl'
         })
     }]);
     app.controller('devManualRefundCtrl', ['$scope', '$http', 'commonDialog', function ($scope, $http, commonDialog) {
@@ -384,6 +388,22 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
 
     }]);
 
+    app.controller('rpayupdateCtrl', ['$scope', '$http','$filter', function ($scope, $http,$filter) {
+        $scope.selecttotal = true;
+        $scope.update = function () {
+            $scope.totalhide = true;
+            $scope.selecttotal = false;
+
+            $http.put('/dev/rpayUpdate').then(function (resp) {
+                $scope.totalhide = false;
+                $scope.selecttotal = true;
+            }, function (resp) {
+                alert(resp.data.message);
+            })
+        }
+
+    }]);
+
     return app;
 
 });
\ No newline at end of file
diff --git a/src/main/ui/static/config/devtools/templates/hfupdate.html b/src/main/ui/static/config/devtools/templates/hfupdate.html
index aa428f774..aa834204e 100644
--- a/src/main/ui/static/config/devtools/templates/hfupdate.html
+++ b/src/main/ui/static/config/devtools/templates/hfupdate.html
@@ -1,5 +1,5 @@
 <section class="content-header">
-    <h1>更新HF短链接</h1>
+<h1>更新HF短链接</h1>
     <ol class="breadcrumb">
         <li>
             <i class="fa fa-cog"></i> Basic Config
diff --git a/src/main/ui/static/config/devtools/templates/root.html b/src/main/ui/static/config/devtools/templates/root.html
index 3c004dad3..ffe80f0ea 100644
--- a/src/main/ui/static/config/devtools/templates/root.html
+++ b/src/main/ui/static/config/devtools/templates/root.html
@@ -83,6 +83,10 @@
                     <i class="fa fa-credit-card-alt"></i>
                     更新HF短连接
                 </a>
+                <a class="btn btn-app" role="button" ui-sref=".rpayupdate">
+                    <i class="fa fa-credit-card-alt"></i>
+                    更新HF短连接
+                </a>
             </div>
         </div>
     </section>
diff --git a/src/main/ui/static/config/devtools/templates/rpayupdate.html b/src/main/ui/static/config/devtools/templates/rpayupdate.html
new file mode 100644
index 000000000..f91337e4f
--- /dev/null
+++ b/src/main/ui/static/config/devtools/templates/rpayupdate.html
@@ -0,0 +1,15 @@
+<section class="content-header">
+<h1>更新Rpay进件费率时间</h1>
+    <ol class="breadcrumb">
+        <li>
+            <i class="fa fa-cog"></i> Basic Config
+        </li>
+        <li><a ui-sref="^">Dev Tools</a></li>
+        <li class="active">rpayupdate</li>
+    </ol>
+</section>
+<section class="content">
+    <div class="box">
+            <button class="btn btn-primary" ng-click="update()">Update</button> <label ng-hide="selecttotal" style="padding-left: 30px">请稍后</label>
+    </div>
+</section>
\ No newline at end of file

From 71bad3b7c3567b1376bce95b2018e33201337601 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 27 Sep 2018 17:31:32 +0800
Subject: [PATCH 084/103] add

---
 .../payment/manage/dev/core/impl/HfUpdateImpl.java  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/HfUpdateImpl.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/HfUpdateImpl.java
index 8db1c972a..e9fa6ccc4 100644
--- a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/HfUpdateImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/HfUpdateImpl.java
@@ -10,6 +10,8 @@ import au.com.royalpay.payment.tools.env.PlatformEnvironment;
 
 import com.alibaba.fastjson.JSONObject;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -27,6 +29,8 @@ public class HfUpdateImpl implements HfUpdateService {
     @Resource
     private RpayApi rpayApi;
 
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
     @Override
     public String updateStatus() {
         List<JSONObject> clientIds = clientMapper.findByhfPayUrlNotNull();
@@ -48,10 +52,15 @@ public class HfUpdateImpl implements HfUpdateService {
     @Override
     public String rpayUpdate() {
         List<JSONObject> clientIds = clientMapper.findByrpayNotNull();
+        StringBuffer sb = new StringBuffer();
         clientIds.forEach(dbResult -> {
-            rpayApi.modifySurchargeConfig(dbResult);
-
+            try {
+                rpayApi.modifySurchargeConfig(dbResult);
+            } catch (Exception e) {
+                sb.append("【" + dbResult.getString("client_moniker") + "】、");
+            }
         });
+        logger.info("test for update rpay clearing date,fail + " + sb.toString());
         return "ok";
     }
 }

From f97047476e6db03707e4461b1691126ed71d75c6 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 28 Sep 2018 09:19:43 +0800
Subject: [PATCH 085/103] fix dev

---
 src/main/ui/static/config/devtools/templates/root.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/ui/static/config/devtools/templates/root.html b/src/main/ui/static/config/devtools/templates/root.html
index ffe80f0ea..48774f3f1 100644
--- a/src/main/ui/static/config/devtools/templates/root.html
+++ b/src/main/ui/static/config/devtools/templates/root.html
@@ -85,7 +85,7 @@
                 </a>
                 <a class="btn btn-app" role="button" ui-sref=".rpayupdate">
                     <i class="fa fa-credit-card-alt"></i>
-                    更新HF短连接
+                    更新Rpay+商户费率时间
                 </a>
             </div>
         </div>

From 62787070db03f71272fa651c3c781fb614a7ac40 Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Fri, 28 Sep 2018 10:13:32 +0800
Subject: [PATCH 086/103] =?UTF-8?q?=E9=87=8D=E7=BD=AEpine=E5=95=86?=
 =?UTF-8?q?=E6=88=B7=E4=B8=8B=E8=B4=A6=E6=88=B7=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment/manage/dev/web/TestController.java | 18 ++++++++++++++++++
 .../manage/task/UpdatePartnerPasswordTask.java |  8 ++++----
 .../mappers/system/ClientAccountMapper.xml     |  2 +-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java
index 5d664eac8..5ae7ecc31 100644
--- a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java
@@ -21,6 +21,7 @@ import au.com.royalpay.payment.manage.mappers.payment.OrderMapper;
 import au.com.royalpay.payment.manage.mappers.payment.RefundMapper;
 import au.com.royalpay.payment.manage.mappers.system.ClientBankAccountMapper;
 import au.com.royalpay.payment.manage.mappers.system.ClientMapper;
+import au.com.royalpay.payment.manage.merchants.core.ClientManager;
 import au.com.royalpay.payment.manage.permission.manager.ManagerMapping;
 import au.com.royalpay.payment.manage.tradelog.core.TradeLogService;
 import au.com.royalpay.payment.tools.CommonConsts;
@@ -56,6 +57,8 @@ import java.io.File;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -113,6 +116,9 @@ public class TestController implements ApplicationEventPublisherAware {
     private HfClearAmountService hfClearAmountService;
     @Resource
     private HfUpdateService hfUpdateService;
+    @Resource
+    private ClientManager clientManager;
+    private final static String EMAIL = "lily.tao@royalpay.com.au,bella.sun@royalpay.com.au,astro.dai@royalpay.com.au,taylor.dang@royalpay.com.au";
 
     @ManagerMapping(value = "/{clientMoniker}/export/agreepdf", method = RequestMethod.GET, role = {ManagerRole.ADMIN, ManagerRole.DIRECTOR, ManagerRole.OPERATOR})
     public void exportAgreeFile(@PathVariable String clientMoniker, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, HttpServletResponse httpResponse) throws Exception {
@@ -416,4 +422,16 @@ public class TestController implements ApplicationEventPublisherAware {
     public String rpayUpdateClearing() {
         return hfUpdateService.rpayUpdate();
     }
+
+    @ManagerMapping(value = "/partner", method = RequestMethod.GET, role = ManagerRole.DEVELOPER)
+    public void resetPartnerPassword() {
+        final List<String> emails = new ArrayList<>();
+        List<String> emailList = Arrays.asList(EMAIL.split(","));
+        emailList.stream().forEach(email -> {
+            if (!emails.contains(email)) {
+                emails.add(email);
+            }
+        });
+        clientManager.updateAllPartnerPassword("PINE", emails);
+    }
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/task/UpdatePartnerPasswordTask.java b/src/main/java/au/com/royalpay/payment/manage/task/UpdatePartnerPasswordTask.java
index 88a81a0d1..5c7152c06 100644
--- a/src/main/java/au/com/royalpay/payment/manage/task/UpdatePartnerPasswordTask.java
+++ b/src/main/java/au/com/royalpay/payment/manage/task/UpdatePartnerPasswordTask.java
@@ -10,6 +10,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -24,13 +25,12 @@ public class UpdatePartnerPasswordTask {
     @Resource
     private ManagerMapper managerMapper;
 
-    private final static String EMAIL = "lily.tao@royalpay.com.au,bella.sun@royalpay.com.au," +
-            "astro.dai@royalpay.com.au,taylor.dang@royalpay.com.au";
+    private final static String EMAIL = "lily.tao@royalpay.com.au,bella.sun@royalpay.com.au,astro.dai@royalpay.com.au,taylor.dang@royalpay.com.au";
 
     @Scheduled(cron = "0 0 9 28 * ?")
     public void resetPartnerPassword() {
-        synchronizedScheduler.executeProcess("manage_task:resetPartnerPassword", 120_000, () -> {
-            final List<String> emails = managerMapper.listDevManager();
+        synchronizedScheduler.executeProcess("manage_task:resetPartnerPassword", 300_000, () -> {
+            final List<String> emails = new ArrayList<>();
             List<String> emailList = Arrays.asList(EMAIL.split(","));
             emailList.stream().forEach(email -> {
                 if (!emails.contains(email)) {
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.xml
index c35be4b34..36b3ceab0 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.xml
@@ -18,7 +18,7 @@
         </where>
     </select>
     <select id="partnerAndSubPartnerAccounts" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT sc.client_moniker, sa.*
+        SELECT sc.client_moniker, sa.account_id, sa.role, sa.username
         FROM sys_clients sc
         INNER JOIN sys_accounts sa ON sc.client_id = sa.client_id AND sa.is_valid = 1
         WHERE sc.client_id = #{client_id} OR sc.parent_client_id = #{client_id} AND sc.is_valid = 1

From 6ded918861ee936c7b7a167cf042459fd3418aad Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Fri, 28 Sep 2018 10:17:32 +0800
Subject: [PATCH 087/103] =?UTF-8?q?=E4=BF=AE=E6=94=B9url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../au/com/royalpay/payment/manage/dev/web/TestController.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java
index 5ae7ecc31..57adeb692 100644
--- a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java
@@ -423,7 +423,7 @@ public class TestController implements ApplicationEventPublisherAware {
         return hfUpdateService.rpayUpdate();
     }
 
-    @ManagerMapping(value = "/partner", method = RequestMethod.GET, role = ManagerRole.DEVELOPER)
+    @ManagerMapping(value = "/partner/reset_password", method = RequestMethod.GET, role = ManagerRole.DEVELOPER)
     public void resetPartnerPassword() {
         final List<String> emails = new ArrayList<>();
         List<String> emailList = Arrays.asList(EMAIL.split(","));

From c5e246c538df66fa09aa29f59d0949a4a78283e4 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 28 Sep 2018 10:41:33 +0800
Subject: [PATCH 088/103] fix Rpay-merchant

---
 .../merchants/core/impls/ClientManagerImpl.java      | 12 ------------
 1 file changed, 12 deletions(-)

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 244c5f03d..0bf26977a 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
@@ -792,18 +792,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             logger.error("记录log_client_sub_merchant_id失败", e);
         }
         clientMapper.update(update);
-        List<JSONObject> children = clientMapper.listChildClients(clientId);
-        for (JSONObject child : children) {
-            if (Objects.equals(child.getString("rpay_enterprise_id"), originSubMerchantId)) {
-                update.put("client_id", child.getIntValue("client_id"));
-                try {
-                    recordSubMerchantLog(child, rpaySubMerchantInfo, manager);
-                } catch (Exception e) {
-                    logger.error("记录log_client_sub_merchant_id失败", e);
-                }
-                clientMapper.update(update);
-            }
-        }
         clientInfoCacheSupport.clearClientCache(clientId);
     }
 

From 9fe7652c2593f21694378b0014548d911923dd21 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 28 Sep 2018 10:42:56 +0800
Subject: [PATCH 089/103] fix Rpay-merchant

---
 .../merchants/core/impls/ClientManagerImpl.java      | 12 ------------
 1 file changed, 12 deletions(-)

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 244c5f03d..0bf26977a 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
@@ -792,18 +792,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             logger.error("记录log_client_sub_merchant_id失败", e);
         }
         clientMapper.update(update);
-        List<JSONObject> children = clientMapper.listChildClients(clientId);
-        for (JSONObject child : children) {
-            if (Objects.equals(child.getString("rpay_enterprise_id"), originSubMerchantId)) {
-                update.put("client_id", child.getIntValue("client_id"));
-                try {
-                    recordSubMerchantLog(child, rpaySubMerchantInfo, manager);
-                } catch (Exception e) {
-                    logger.error("记录log_client_sub_merchant_id失败", e);
-                }
-                clientMapper.update(update);
-            }
-        }
         clientInfoCacheSupport.clearClientCache(clientId);
     }
 

From a2de0ea35ec3044e67f2eb03047cd67426a71239 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Sat, 29 Sep 2018 15:35:23 +0800
Subject: [PATCH 090/103] fix Dashboard TopOrderFee

---
 .../manage/analysis/core/impls/DashboardServiceImpl.java        | 2 +-
 .../manage/analysis/mappers/TransactionAnalysisMapper.java      | 2 +-
 .../manage/analysis/mappers/TransactionAnalysisMapper.xml       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
index ece285f7a..6e4ea254e 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
@@ -148,7 +148,7 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
             return commonAnalysis4;
         }
         JSONObject res = new JSONObject();
-        List<JSONObject> topOrders = transactionAnalysisMapper.getTopOrders(params, new PageBounds(1, 1, Order.formString("aud_fee.desc")));
+        List<JSONObject> topOrders = transactionAnalysisMapper.getTopOrders(params);
         if (!topOrders.isEmpty()) {
             res.put("top_amount_order", topOrders.get(0));
         }
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java
index c28d1b8b2..d9986be29 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java
@@ -33,7 +33,7 @@ public interface TransactionAnalysisMapper {
 
     JSONObject getEarliestOrder(@Param("client_id") int client_id);
 
-    List<JSONObject> getTopOrders(JSONObject params, PageBounds pagination);
+    List<JSONObject> getTopOrders(JSONObject params);
 
     List<JSONObject> getTradeAmountInTypes(JSONObject params);
 
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
index c54de2dab..97632f2cf 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
@@ -163,7 +163,7 @@
         <if test="org_ids!=null">and o.org_id in
             <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
         <![CDATA[
-        GROUP BY o.order_id
+        GROUP BY o.order_id ORDER BY aud_fee DESC  limit 1
         ]]>
 
     </select>

From a78fd1542dd3fd149301afa29e4911c22d4bb258 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Sat, 29 Sep 2018 16:51:15 +0800
Subject: [PATCH 091/103] fix rate_warning

---
 .../manage/management/clearing/core/impl/CleanServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
index c99cf7636..5c3cbaea3 100644
--- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
@@ -618,7 +618,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
             Date expiryTime = client.getDate("expiry_time");
             client.put("generatable", expiryTime != null);
             if (expiryTime != null) {
-                client.put("expiry_time", expiryTime.getTime());
+                client.put("expiry_time", DateFormatUtils.format(client.getDate("expiry_time"), "dd/MM/yyyy"));
             }
         }
         warnings.put("no_rate", rateInDanger);

From dda02d8e317daa758e7d8d794b1a405855ef1845 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Sat, 29 Sep 2018 16:52:01 +0800
Subject: [PATCH 092/103] fix rate_warning

---
 .../manage/management/clearing/core/impl/CleanServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
index c99cf7636..5c3cbaea3 100644
--- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
@@ -618,7 +618,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
             Date expiryTime = client.getDate("expiry_time");
             client.put("generatable", expiryTime != null);
             if (expiryTime != null) {
-                client.put("expiry_time", expiryTime.getTime());
+                client.put("expiry_time", DateFormatUtils.format(client.getDate("expiry_time"), "dd/MM/yyyy"));
             }
         }
         warnings.put("no_rate", rateInDanger);

From d8d6855d13c16295ec7fcbdfc1b894663b8f88fc Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Sat, 29 Sep 2018 20:37:11 +0800
Subject: [PATCH 093/103] =?UTF-8?q?[fix]=E4=BC=98=E5=8C=96sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/impls/DashboardServiceImpl.java      |  11 +-
 .../mappers/ClientAnalysisMapper.java         |   2 +-
 .../analysis/web/DashboardController.java     |   4 +-
 .../analysis/mappers/ClientAnalysisMapper.xml | 102 +++++++++++++++---
 4 files changed, 94 insertions(+), 25 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
index 6e4ea254e..97ef7c216 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
@@ -163,16 +163,15 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
 
     @Override
     public List<JSONObject> getTopTradePartners(JSONObject params, int limit) {
-        return clientAnalysisMapper.listPartnersTradeAmount(params, new PageBounds(1, limit, Order.formString("aud_fee.desc")));
+        params.put("rankType", "aud_fee");
+        params.put("limit", limit);
+        return clientAnalysisMapper.listPartnersTradeAmount(params);
     }
 
     @Override
     public List<JSONObject> getTopTradePartners(JSONObject params) {
-        String rankType = "aud_fee";
-        if (params.getString("rankType")!=null){
-            rankType = params.getString("rankType");
-        }
-        return clientAnalysisMapper.listPartnersTradeAmount(params, new PageBounds(Order.formString(rankType+".desc")));
+        params.putIfAbsent("rankType", "aud_fee");
+        return clientAnalysisMapper.listPartnersTradeAmount(params);
     }
 
     @Override
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java
index dd4272dd2..93913f7e4 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java
@@ -33,7 +33,7 @@ public interface ClientAnalysisMapper {
 
     List<JSONObject> countTradePartnersHistory(JSONObject params);
 
-    List<JSONObject> listPartnersTradeAmount(JSONObject params, PageBounds pageBounds);
+    List<JSONObject> listPartnersTradeAmount(JSONObject params);
 
     List<JSONObject> countClientsTypes(JSONObject params);
 
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/web/DashboardController.java b/src/main/java/au/com/royalpay/payment/manage/analysis/web/DashboardController.java
index 86cb29a46..a0000005a 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/web/DashboardController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/web/DashboardController.java
@@ -75,11 +75,11 @@ public class DashboardController {
     @ManagerMapping("/rank_trade_partners")
     public List<JSONObject> rankTradePartners(AnalysisBean analysis, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
         JSONObject params = analysis.toParams(null);
-        orgManager.checkOrg(manager,params);
+        orgManager.checkOrg(manager, params);
         if (analysis.isOnlyGroup() && ManagerRole.BD_LEADER.hasRole(manager.getIntValue("role"))) {
             params.put("bd_group", manager.getString("manager_id"));
             if (analysis.getGroup_bd()>0){
-                params.put("bd_group_bd",analysis.getGroup_bd());
+                params.put("bd_group_bd", analysis.getGroup_bd());
             }
         }
         return dashboardService.getTopTradePartners(params);
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
index 6afef4190..1f14033e4 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
@@ -97,30 +97,100 @@
         GROUP BY date(o.create_time)
     </select>
 
+    <!-- 原来的SQL语句
     <select id="listPartnersTradeAmount" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
-       SELECT
-        p.client_moniker,p.short_name,ifnull(sum(if(t.transaction_type='Credit',t.clearing_amount,0)),0)aud_fee,
-        count(DISTINCT t.order_id) orders,max(t.clearing_amount)max_order,ifnull(sum(if(t.refund_id is not null,if(t.transaction_type='Debit',t.clearing_amount,-t.clearing_amount),0)),0)refund_amount,
-        ifnull(sum(if(t.refund_id is not null and t.transaction_type='Debit',1,0)),0)refund_orders,max(if(t.refund_id is not null and t.transaction_type='Debit',t.clearing_amount,0))max_refund
+        SELECT
+           p.client_moniker,
+           p.short_name,
+           ifnull(sum(if(t.transaction_type = 'Credit', t.clearing_amount, 0)), 0) aud_fee,
+           count(DISTINCT t.order_id) orders,
+           max(t.clearing_amount) max_order,
+           ifnull(sum(if(t.refund_id is not null, if(t.transaction_type='Debit', t.clearing_amount, -t.clearing_amount), 0)), 0) refund_amount,
+           ifnull(sum(if(t.refund_id is not null and t.transaction_type='Debit', 1, 0)), 0)refund_orders, max(if(t.refund_id is not null and t.transaction_type='Debit', t.clearing_amount, 0)) max_refund
         FROM sys_clients p
-            INNER JOIN pmt_transactions t ON t.client_id = p.client_id and (t.transaction_type='Credit' or t.refund_id is not null)
-            INNER JOIN pmt_orders o ON t.order_id = o.order_id
-        WHERE o.create_time >= #{begin} AND o.create_time <= #{end}
+        INNER JOIN pmt_transactions t
+        ON t.client_id = p.client_id
+        and (t.transaction_type = 'Credit' or t.refund_id is not null)
+        INNER JOIN pmt_orders o
+        ON t.order_id = o.order_id
+        WHERE o.create_time >= #{begin}
+        AND o.create_time <= #{end}
         ]]>
-        <if test="org_id!=null and org_ids==null">and p.org_id=#{org_id}</if>
-        <if test="org_ids!=null">and p.org_id in
-            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
-        <if test="bd_group!=null">and p.client_id in
-            (SELECT b.client_id FROM sys_client_bd b
-            INNER JOIN financial_bd_config c ON c.manager_id=b.bd_id
-            where b.is_valid=1 and b.start_date&lt;=now() and (b.end_date is null or b.end_date &gt;= now())
-            AND (c.bd_group=#{bd_group} or c.manager_id=#{bd_group})
-            <if test="bd_group_bd">and c.manager_id=#{bd_group_bd}</if>
+        <if test="org_id != null and org_ids == null">
+            and p.org_id = #{org_id}
+        </if>
+        <if test="org_ids != null">
+            and p.org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">
+                #{org_id}
+            </foreach>
+        </if>
+        <if test="bd_group != null">
+            and p.client_id in (
+                SELECT b.client_id FROM sys_client_bd b
+                INNER JOIN financial_bd_config c
+                ON c.manager_id = b.bd_id
+                where b.is_valid = 1
+                and b.start_date &lt;= now()
+                and (b.end_date is null or b.end_date &gt;= now())
+                AND (c.bd_group = #{bd_group} or c.manager_id = #{bd_group})
+                <if test="bd_group_bd">
+                    and c.manager_id = #{bd_group_bd}
+                </if>
             )
         </if>
         GROUP BY p.client_id
     </select>
+    -->
+
+    <!-- 优化后的SQL语句 -->
+    <select id="listPartnersTradeAmount" resultType="com.alibaba.fastjson.JSONObject">
+        <![CDATA[
+        SELECT
+           p.client_moniker,
+           p.short_name,
+           ifnull(sum(if(t.transaction_type = 'Credit', t.clearing_amount, 0)), 0) aud_fee,
+           count(DISTINCT t.order_id) orders,
+           max(t.clearing_amount) max_order,
+           ifnull(sum(if(t.refund_id is not null, if(t.transaction_type='Debit', t.clearing_amount, -t.clearing_amount), 0)), 0) refund_amount,
+           ifnull(sum(if(t.refund_id is not null and t.transaction_type='Debit', 1, 0)), 0)refund_orders, max(if(t.refund_id is not null and t.transaction_type='Debit', t.clearing_amount, 0)) max_refund
+        FROM sys_clients p
+        INNER JOIN pmt_transactions t
+        ON t.client_id = p.client_id
+        WHERE t.create_time >= #{begin}
+        AND t.create_time <= #{end}
+        ]]>
+        <if test="org_id != null and org_ids == null">
+            and p.org_id = #{org_id}
+        </if>
+        <if test="org_ids != null">
+            and p.org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">
+                #{org_id}
+            </foreach>
+        </if>
+        <if test="bd_group != null">
+            and p.client_id in (
+                SELECT b.client_id FROM sys_client_bd b
+                INNER JOIN financial_bd_config c
+                ON c.manager_id = b.bd_id
+                where b.is_valid = 1
+                and b.start_date &lt;= now()
+                and (b.end_date is null or b.end_date &gt;= now())
+                AND (c.bd_group = #{bd_group} or c.manager_id = #{bd_group})
+                <if test="bd_group_bd">
+                    and c.manager_id = #{bd_group_bd}
+                </if>
+            )
+        </if>
+        GROUP BY p.client_id
+        ORDER BY #{rankType} DESC
+        <if test="limit != null">
+            limit ${limit}
+        </if>
+
+    </select>
 
 
     <select id="countClientsTypes" resultType="com.alibaba.fastjson.JSONObject">

From 3fac4f2c5838d2cc265ca3e521049dc33e207add Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Sun, 30 Sep 2018 01:14:30 +0800
Subject: [PATCH 094/103] =?UTF-8?q?[fix]=E4=BC=98=E5=8C=96SQL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysis/mappers/ClientAnalysisMapper.xml | 48 +++++++++++--------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
index 1f14033e4..2373135bf 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
@@ -144,17 +144,23 @@
     </select>
     -->
 
-    <!-- 优化后的SQL语句 -->
+    <!--
+        优化后的SQL语句
+        在之前的SQL语句中，与transaction表内连接时加了and (t.transaction_type = 'Credit' or t.refund_id is not null)这个条件
+        是因为在transaction_type = 'Debit'的记录中，有的并没有refund_id，所以剔除这些记录
+        优化后的SQL语句去掉了这个条件，而是在需要的字段中天健t.refund_id IS NOT NULL这一条件
+    -->
     <select id="listPartnersTradeAmount" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT
-           p.client_moniker,
-           p.short_name,
-           ifnull(sum(if(t.transaction_type = 'Credit', t.clearing_amount, 0)), 0) aud_fee,
-           count(DISTINCT t.order_id) orders,
-           max(t.clearing_amount) max_order,
-           ifnull(sum(if(t.refund_id is not null, if(t.transaction_type='Debit', t.clearing_amount, -t.clearing_amount), 0)), 0) refund_amount,
-           ifnull(sum(if(t.refund_id is not null and t.transaction_type='Debit', 1, 0)), 0)refund_orders, max(if(t.refund_id is not null and t.transaction_type='Debit', t.clearing_amount, 0)) max_refund
+            p.short_name,
+            p.client_moniker,
+            COUNT(t.refund_id) refund_orders,
+            COUNT(DISTINCT t.order_id) orders,
+            IFNULL(MAX(t.clearing_amount), 0) max_order,
+            MAX(IF(t.refund_id IS NOT NULL, t.clearing_amount, 0)) max_refund,
+            SUM(IF(t.refund_id IS NOT NULL, t.clearing_amount, 0)) refund_amount,
+            IFNULL(SUM(IF(t.transaction_type = 'Credit', t.clearing_amount, 0)), 0) aud_fee
         FROM sys_clients p
         INNER JOIN pmt_transactions t
         ON t.client_id = p.client_id
@@ -162,34 +168,36 @@
         AND t.create_time <= #{end}
         ]]>
         <if test="org_id != null and org_ids == null">
-            and p.org_id = #{org_id}
+            AND p.org_id = #{org_id}
         </if>
         <if test="org_ids != null">
-            and p.org_id in
+            AND p.org_id IN
             <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">
                 #{org_id}
             </foreach>
         </if>
         <if test="bd_group != null">
-            and p.client_id in (
-                SELECT b.client_id FROM sys_client_bd b
+            AND p.client_id IN (
+                SELECT b.client_id
+                FROM sys_client_bd b
                 INNER JOIN financial_bd_config c
                 ON c.manager_id = b.bd_id
-                where b.is_valid = 1
-                and b.start_date &lt;= now()
-                and (b.end_date is null or b.end_date &gt;= now())
-                AND (c.bd_group = #{bd_group} or c.manager_id = #{bd_group})
+                WHERE b.is_valid = 1
+                AND b.start_date &lt;= now()
+                AND (b.end_date IS NULL OR b.end_date &gt;= now())
+                AND (c.bd_group = #{bd_group} OR c.manager_id = #{bd_group})
                 <if test="bd_group_bd">
-                    and c.manager_id = #{bd_group_bd}
+                    AND c.manager_id = #{bd_group_bd}
                 </if>
             )
         </if>
         GROUP BY p.client_id
-        ORDER BY #{rankType} DESC
+        <if test="rankType != null">
+            ORDER BY ${rankType} DESC
+        </if>
         <if test="limit != null">
-            limit ${limit}
+            LIMIT ${limit}
         </if>
-
     </select>
 
 

From 7401a9e41445d5a55291581b14a3df16e89cfd6d Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Sun, 30 Sep 2018 01:23:13 +0800
Subject: [PATCH 095/103] [fix]

---
 .../payment/manage/analysis/web/DashboardController.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/web/DashboardController.java b/src/main/java/au/com/royalpay/payment/manage/analysis/web/DashboardController.java
index a0000005a..87738f269 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/web/DashboardController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/web/DashboardController.java
@@ -69,7 +69,8 @@ public class DashboardController {
                                              @RequestParam(defaultValue = "10") int limit) {
         JSONObject params = analysis.toParams(analysis.getTimezone());
         orgManager.checkOrg(manager,params);
-        return dashboardService.getTopTradePartners(params, limit);
+        params.put("limit", limit);
+        return dashboardService.getTopTradePartners(params);
     }
 
     @ManagerMapping("/rank_trade_partners")

From 447fea52e677628ad50cd134bc72001d78da0ed6 Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Sun, 30 Sep 2018 01:30:46 +0800
Subject: [PATCH 096/103] [fix]

---
 .../manage/analysis/beans/AnalysisBean.java   | 24 +++++++++----------
 .../analysis/core/DashboardService.java       |  2 +-
 .../core/impls/DashboardServiceImpl.java      |  2 ++
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/beans/AnalysisBean.java b/src/main/java/au/com/royalpay/payment/manage/analysis/beans/AnalysisBean.java
index dc67aed73..65edd513b 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/beans/AnalysisBean.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/beans/AnalysisBean.java
@@ -62,7 +62,7 @@ public class AnalysisBean {
         if (bd_id != null){
             params.put("bd_id",bd_id);
         }
-        if (org_id !=null){
+        if (org_id != null){
             params.put("org_id",org_id);
         }
         if (begin_month != null){
@@ -71,25 +71,25 @@ public class AnalysisBean {
         if (end_month != null){
             params.put("end_month",end_month);
         }
-        if (customer_id!=null && !customer_id.isEmpty()){
-            params.put("customer_id",customer_id.trim());
+        if (customer_id != null && !customer_id.isEmpty()){
+            params.put("customer_id", customer_id.trim());
         }
-        if (rankType!=null){
-            params.put("rankType",rankType);
+        if (rankType != null){
+            params.put("rankType", rankType);
         }
-        if(channel!=null){
-            params.put("channel",channel);
+        if(channel != null){
+            params.put("channel", channel);
         }
-        if(bd_name!=null){
-            params.put("bd_name",bd_name);
+        if(bd_name != null){
+            params.put("bd_name", bd_name);
         }
-        if (client_moniker!=null){
+        if (client_moniker != null){
             params.put("client_moniker", client_moniker);
         }
-        if (amount_from!=null && amount_from.length()>0){
+        if (amount_from != null && amount_from.length() > 0){
             params.put("amount_from", new BigDecimal(amount_from));
         }
-        if (amount_to!=null && amount_to.length()>0){
+        if (amount_to != null && amount_to.length() > 0){
             params.put("amount_to", new BigDecimal(amount_to));
         }
         return params;
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/DashboardService.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/DashboardService.java
index eb071d334..53202d7a1 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/DashboardService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/DashboardService.java
@@ -22,7 +22,7 @@ public interface DashboardService {
 
     List<JSONObject> getTradeInTypes(JSONObject params);
 
-    List<JSONObject> getTopTradePartners(JSONObject params, int limit);
+    //List<JSONObject> getTopTradePartners(JSONObject params, int limit);
 
     List<JSONObject> getTopTradePartners(JSONObject params);
 
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
index 97ef7c216..5887c83ea 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
@@ -161,12 +161,14 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
         return transactionAnalysisMapper.getTradeAmountInTypes(params);
     }
 
+    /*
     @Override
     public List<JSONObject> getTopTradePartners(JSONObject params, int limit) {
         params.put("rankType", "aud_fee");
         params.put("limit", limit);
         return clientAnalysisMapper.listPartnersTradeAmount(params);
     }
+    */
 
     @Override
     public List<JSONObject> getTopTradePartners(JSONObject params) {

From f0b17d85046e078f65c15b2bf5ae97c624200b41 Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Sun, 30 Sep 2018 11:28:02 +0800
Subject: [PATCH 097/103] =?UTF-8?q?[fix]=E6=96=B0=E5=A2=9Etransaction=5Ffe?=
 =?UTF-8?q?e=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/partner_bankaccounts.html       |  2 ++
 .../partner/templates/partner_new_rate.html   | 23 +++++++++++++++++
 .../partner/templates/rate_config_dialog.html | 25 +++++++++++++++++++
 3 files changed, 50 insertions(+)

diff --git a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
index f1e00b160..b67d76a26 100644
--- a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
+++ b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
@@ -179,6 +179,7 @@
                 <tr>
                     <th>Rate Name</th>
                     <th>Rate Value</th>
+                    <th>Transaction Fee</th>
                     <th>Active Time</th>
                     <th>Expire Time</th>
                     <th ng-if="bankCtrl.rate_name=='Wechat'">Clean Days</th>
@@ -193,6 +194,7 @@
                     ng-class="{'text-bold':rate.current,'success':rate.active}">
                     <td ng-bind="rate.rate_name"></td>
                     <td ng-bind="rate.rate_value"></td>
+                    <td ng-bind="rate.transaction_fee"></td>
                     <td ng-bind="rate.active_time|date:'yyyy-MM-dd'"></td>
                     <td ng-bind="rate.expiry_time|date:'yyyy-MM-dd'"></td>
                     <td ng-if="rate.rate_name=='Wechat'">T+{{rate.clean_days}}</td>
diff --git a/src/main/ui/static/payment/partner/templates/partner_new_rate.html b/src/main/ui/static/payment/partner/templates/partner_new_rate.html
index fe0aa512f..98299cef6 100644
--- a/src/main/ui/static/payment/partner/templates/partner_new_rate.html
+++ b/src/main/ui/static/payment/partner/templates/partner_new_rate.html
@@ -160,6 +160,29 @@
                     </div>
                 </div>
 
+                <!-- 新增transaction_fee -->
+                <div class="form-group"
+                     ng-class="{'has-error':rate_form.transaction_fee.$invalid && rate_form.transaction_fee.$dirty}">
+                    <label class="control-label col-sm-4" for="transaction_fee_input">Transaction Fee</label>
+                    <div class="col-sm-6">
+                        <div class="input-group">
+                            <input type="number" name="Transaction_fee_value" stringToNumber2 class="form-control" ng-model="rate.transaction_fee"
+                                   min="0" step="0.1" id="transaction_fee_input" required>
+                            <div class="input-group-addon">%</div>
+                        </div>
+                        <div ng-messages="rate_form.transaction_fee.$error" ng-if="rate_form.transaction_fee.$dirty">
+                            <div class="small text-danger" ng-message="min">
+                                <i class="glyphicon glyphicon-alert"></i> No less than 0
+                            </div>
+                            <div class="small text-danger" ng-message="required">
+                                <i class="glyphicon glyphicon-alert"></i> Required Field
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
+
+
                 <div class="form-group">
                     <label class="control-label col-sm-4" for="active_time_input">Active Date</label>
                     <div class="col-sm-6">
diff --git a/src/main/ui/static/payment/partner/templates/rate_config_dialog.html b/src/main/ui/static/payment/partner/templates/rate_config_dialog.html
index 421be18ab..d06a7eac6 100644
--- a/src/main/ui/static/payment/partner/templates/rate_config_dialog.html
+++ b/src/main/ui/static/payment/partner/templates/rate_config_dialog.html
@@ -35,6 +35,31 @@
 
                     </div>
                 </div>
+                <!-- 新增transaction_fee字段 -->
+                <div class="form-group"
+                     ng-class="{'has-error':rate_form.transaction_fee.$invalid && rate_form.transaction_fee.$dirty}">
+                    <label class="control-label col-sm-4" for="transaction_fee_input">Transaction Fee</label>
+                    <div class="col-sm-6">
+                        <div class="input-group">
+                            <input type="number" name="transaction_fee" class="form-control" ng-model="rate.transaction_fee"
+                                   min="0" step="0.1" id="transaction_fee_input" required>
+                            <div class="input-group-addon">%</div>
+                        </div>
+                        <div ng-messages="rate_form.transaction_fee.$error" ng-if="rate_form.transaction_fee.$dirty">
+                            <!--<div class="small text-danger" ng-message="max">-->
+                            <!--<i class="glyphicon glyphicon-alert"></i> No more than 2.2%-->
+                            <!--</div>-->
+                            <div class="small text-danger" ng-message="min">
+                                <i class="glyphicon glyphicon-alert"></i> No less than 0
+                            </div>
+                            <div class="small text-danger" ng-message="required">
+                                <i class="glyphicon glyphicon-alert"></i> Required Field
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
+
                 <div class="form-group">
                     <label class="control-label col-sm-4" for="active_time_input">Active Date</label>
                     <div class="col-sm-6">

From d6fd5b06003b3706d7f6f3b3ef472b41def9919a Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Sun, 30 Sep 2018 11:30:57 +0800
Subject: [PATCH 098/103] fix rpay+ merchant

---
 .../manage/mappers/system/SysRpayMerchantApplyMapper.java  | 2 +-
 .../manage/merchants/core/impls/ClientManagerImpl.java     | 7 +++++--
 .../payment/partner/templates/sub_merchant_id_apply.html   | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java
index 898ac3661..23620f712 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java
@@ -21,6 +21,6 @@ public interface SysRpayMerchantApplyMapper {
     void insertRpayMerchantApply(JSONObject params);
 
     @AutoSql(type = SqlType.SELECT)
-    List<JSONObject> listByShortName(@Param("client_id") int client_id,@Param("merchant_shortname") String shortName);
+    List<JSONObject> listByShortName(@Param("merchant_shortname") String shortName);
 
 }
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 0bf26977a..e18ded9b0 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
@@ -3605,10 +3605,13 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         }
         checkOrgPermission(manager, client);
 
-        List<JSONObject> listByshortName = sysRpayMerchantApplyMapper.listByShortName(client.getIntValue("client_id"),merchantInfo.getString("company_shortname"));
+        List<JSONObject> listByshortName = sysRpayMerchantApplyMapper.listByShortName(merchantInfo.getString("company_shortname"));
 
         if (listByshortName.size()>0) {
-            throw new BadRequestException("请修改【" + clientMoniker + "】的Company shortName信息（请避免和Rpay+商务号列表内的Company Short Name重复）");
+            throw new BadRequestException("请修改【" + clientMoniker + "】的Company shortName信息（Short Name 已被使用）");
+        }
+        if (client.getString("rpay_enterprise_id") != null) {
+            throw new BadRequestException("您已申请成功子商务号，请勿重复申请");
         }
 
         SubRpayMerchantInfo subRpayMerchantInfo = JSONObject.toJavaObject(merchantInfo, SubRpayMerchantInfo.class);
diff --git a/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html b/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html
index 66ebd8403..8deec83d1 100644
--- a/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html
+++ b/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html
@@ -99,7 +99,7 @@
                             Rpay+ Sub Merchant Id : {{partner.rpay_enterprise_id}}
                             <i class="fa fa-clock-o text-danger" title="Using temp Sub Merchant ID" ng-if="partner.temp_sub_merchant"></i>
                         </h3>
-                        <button role="button" class="btn btn-info pull-right" title="Apply Sub Merchant Id"
+                        <button role="button" ng-if="!partner.rpay_enterprise_id" class="btn btn-info pull-right" title="Apply Sub Merchant Id"
                                 ng-click="applyRpaySubMerchantId()">
                             <i class="fa fa-plus"></i>
                             Apply Sub Merchant Id

From 4738df405090d4d6b6900d662b37a0837e7bd724 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Sun, 30 Sep 2018 11:32:22 +0800
Subject: [PATCH 099/103] fix rpay+ merchant

---
 .../manage/mappers/system/SysRpayMerchantApplyMapper.java  | 2 +-
 .../manage/merchants/core/impls/ClientManagerImpl.java     | 7 +++++--
 .../payment/partner/templates/sub_merchant_id_apply.html   | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java
index 898ac3661..23620f712 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java
@@ -21,6 +21,6 @@ public interface SysRpayMerchantApplyMapper {
     void insertRpayMerchantApply(JSONObject params);
 
     @AutoSql(type = SqlType.SELECT)
-    List<JSONObject> listByShortName(@Param("client_id") int client_id,@Param("merchant_shortname") String shortName);
+    List<JSONObject> listByShortName(@Param("merchant_shortname") String shortName);
 
 }
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 0bf26977a..e18ded9b0 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
@@ -3605,10 +3605,13 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         }
         checkOrgPermission(manager, client);
 
-        List<JSONObject> listByshortName = sysRpayMerchantApplyMapper.listByShortName(client.getIntValue("client_id"),merchantInfo.getString("company_shortname"));
+        List<JSONObject> listByshortName = sysRpayMerchantApplyMapper.listByShortName(merchantInfo.getString("company_shortname"));
 
         if (listByshortName.size()>0) {
-            throw new BadRequestException("请修改【" + clientMoniker + "】的Company shortName信息（请避免和Rpay+商务号列表内的Company Short Name重复）");
+            throw new BadRequestException("请修改【" + clientMoniker + "】的Company shortName信息（Short Name 已被使用）");
+        }
+        if (client.getString("rpay_enterprise_id") != null) {
+            throw new BadRequestException("您已申请成功子商务号，请勿重复申请");
         }
 
         SubRpayMerchantInfo subRpayMerchantInfo = JSONObject.toJavaObject(merchantInfo, SubRpayMerchantInfo.class);
diff --git a/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html b/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html
index 66ebd8403..8deec83d1 100644
--- a/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html
+++ b/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html
@@ -99,7 +99,7 @@
                             Rpay+ Sub Merchant Id : {{partner.rpay_enterprise_id}}
                             <i class="fa fa-clock-o text-danger" title="Using temp Sub Merchant ID" ng-if="partner.temp_sub_merchant"></i>
                         </h3>
-                        <button role="button" class="btn btn-info pull-right" title="Apply Sub Merchant Id"
+                        <button role="button" ng-if="!partner.rpay_enterprise_id" class="btn btn-info pull-right" title="Apply Sub Merchant Id"
                                 ng-click="applyRpaySubMerchantId()">
                             <i class="fa fa-plus"></i>
                             Apply Sub Merchant Id

From 74892d89082a9417e336978976f9180ef6e26ea5 Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Sun, 30 Sep 2018 11:37:10 +0800
Subject: [PATCH 100/103] [fix]

---
 .../manage/analysis/core/DashboardService.java      |  4 ++--
 .../analysis/core/impls/DashboardServiceImpl.java   | 13 ++++++-------
 .../analysis/mappers/ClientAnalysisMapper.java      |  4 +++-
 .../manage/analysis/web/DashboardController.java    |  9 +++++----
 .../analysis/mappers/ClientAnalysisMapper.xml       |  5 ++---
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/DashboardService.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/DashboardService.java
index 53202d7a1..5501d2c26 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/DashboardService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/DashboardService.java
@@ -22,9 +22,9 @@ public interface DashboardService {
 
     List<JSONObject> getTradeInTypes(JSONObject params);
 
-    //List<JSONObject> getTopTradePartners(JSONObject params, int limit);
+    List<JSONObject> getTopTradePartners(JSONObject params, int limit);
 
-    List<JSONObject> getTopTradePartners(JSONObject params);
+    List<JSONObject> getTopTradePartnersNew(JSONObject params);
 
     List<JSONObject> getTradeAnalysisInHours(JSONObject params);
 
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
index 5887c83ea..c63347edc 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
@@ -161,19 +161,18 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
         return transactionAnalysisMapper.getTradeAmountInTypes(params);
     }
 
-    /*
+
     @Override
     public List<JSONObject> getTopTradePartners(JSONObject params, int limit) {
-        params.put("rankType", "aud_fee");
-        params.put("limit", limit);
-        return clientAnalysisMapper.listPartnersTradeAmount(params);
+        return clientAnalysisMapper.listPartnersTradeAmount(params,
+                new PageBounds(1, limit, Order.formString("aud_fee.desc")));
     }
-    */
+
 
     @Override
-    public List<JSONObject> getTopTradePartners(JSONObject params) {
+    public List<JSONObject> getTopTradePartnersNew(JSONObject params) {
         params.putIfAbsent("rankType", "aud_fee");
-        return clientAnalysisMapper.listPartnersTradeAmount(params);
+        return clientAnalysisMapper.listPartnersTradeAmountNew(params);
     }
 
     @Override
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java
index 93913f7e4..13c421880 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java
@@ -33,7 +33,9 @@ public interface ClientAnalysisMapper {
 
     List<JSONObject> countTradePartnersHistory(JSONObject params);
 
-    List<JSONObject> listPartnersTradeAmount(JSONObject params);
+    List<JSONObject> listPartnersTradeAmountNew(JSONObject params);
+
+    List<JSONObject> listPartnersTradeAmount(JSONObject params, PageBounds pageBounds);
 
     List<JSONObject> countClientsTypes(JSONObject params);
 
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/web/DashboardController.java b/src/main/java/au/com/royalpay/payment/manage/analysis/web/DashboardController.java
index 87738f269..9035b0485 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/web/DashboardController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/web/DashboardController.java
@@ -67,10 +67,11 @@ public class DashboardController {
     @ManagerMapping("/top_trade_partners")
     public List<JSONObject> topTradePartners(AnalysisBean analysis, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager,
                                              @RequestParam(defaultValue = "10") int limit) {
+
         JSONObject params = analysis.toParams(analysis.getTimezone());
-        orgManager.checkOrg(manager,params);
+        orgManager.checkOrg(manager, params);
         params.put("limit", limit);
-        return dashboardService.getTopTradePartners(params);
+        return dashboardService.getTopTradePartnersNew(params);
     }
 
     @ManagerMapping("/rank_trade_partners")
@@ -79,11 +80,11 @@ public class DashboardController {
         orgManager.checkOrg(manager, params);
         if (analysis.isOnlyGroup() && ManagerRole.BD_LEADER.hasRole(manager.getIntValue("role"))) {
             params.put("bd_group", manager.getString("manager_id"));
-            if (analysis.getGroup_bd()>0){
+            if (analysis.getGroup_bd() > 0){
                 params.put("bd_group_bd", analysis.getGroup_bd());
             }
         }
-        return dashboardService.getTopTradePartners(params);
+        return dashboardService.getTopTradePartnersNew(params);
     }
 
     @ManagerMapping("/trade_in_hours")
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
index 2373135bf..2a9443ed6 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
@@ -148,9 +148,9 @@
         优化后的SQL语句
         在之前的SQL语句中，与transaction表内连接时加了and (t.transaction_type = 'Credit' or t.refund_id is not null)这个条件
         是因为在transaction_type = 'Debit'的记录中，有的并没有refund_id，所以剔除这些记录
-        优化后的SQL语句去掉了这个条件，而是在需要的字段中天健t.refund_id IS NOT NULL这一条件
+        优化后的SQL语句去掉了这个条件，而是在需要的字段中添加t.refund_id IS NOT NULL这一条件
     -->
-    <select id="listPartnersTradeAmount" resultType="com.alibaba.fastjson.JSONObject">
+    <select id="listPartnersTradeAmountNew" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT
             p.short_name,
@@ -200,7 +200,6 @@
         </if>
     </select>
 
-
     <select id="countClientsTypes" resultType="com.alibaba.fastjson.JSONObject">
          SELECT c.industry,c.royalpayindustry,count(1) partner_counts FROM sys_clients c
             <if test="bd_user!=null">

From c7d6ad769a5659f5e790694fa5e77db6588479e9 Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Sun, 30 Sep 2018 15:32:58 +0800
Subject: [PATCH 101/103] [fix]

---
 .../manage/merchants/beans/ClientRateConfig.java | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRateConfig.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRateConfig.java
index 351a8794d..8b37efce7 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRateConfig.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRateConfig.java
@@ -18,15 +18,23 @@ public class ClientRateConfig {
     @JSONField(name = "rate_name")
     @NotEmpty(message = "error.payment.valid.param_missing")
     private String rateName;
+
     @JSONField(name = "rate_value")
     @NotNull(message = "error.payment.valid.param_missing")
     private Double rateValue;
+
+    @JSONField(name = "transaction_fee")
+    @NotNull(message = "error.payment.valid.param_missing")
+    private Double transactionFee;
+
     @JSONField(name = "active_time")
     @NotNull(message = "error.payment.valid.param_missing")
     private Date activeTime;
+
     @JSONField(name = "expiry_time")
     @NotNull(message = "error.payment.valid.param_missing")
     private Date expiryTime;
+
     @JSONField(name = "clean_days")
     @NotNull(message = "error.payment.valid.param_missing")
     private Integer cleanDays = 3;
@@ -86,4 +94,12 @@ public class ClientRateConfig {
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
+    public Double getTransactionFee() {
+        return transactionFee;
+    }
+
+    public void setTransactionFee(Double transactionFee) {
+        this.transactionFee = transactionFee;
+    }
 }

From d120f8156b900431ecef6d8cfdba03f0a81d4779 Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Sun, 30 Sep 2018 16:05:08 +0800
Subject: [PATCH 102/103] [fix]

---
 .../ui/static/payment/partner/templates/partner_new_rate.html   | 2 +-
 .../ui/static/payment/partner/templates/rate_config_dialog.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/ui/static/payment/partner/templates/partner_new_rate.html b/src/main/ui/static/payment/partner/templates/partner_new_rate.html
index 98299cef6..cf41ab976 100644
--- a/src/main/ui/static/payment/partner/templates/partner_new_rate.html
+++ b/src/main/ui/static/payment/partner/templates/partner_new_rate.html
@@ -168,7 +168,7 @@
                         <div class="input-group">
                             <input type="number" name="Transaction_fee_value" stringToNumber2 class="form-control" ng-model="rate.transaction_fee"
                                    min="0" step="0.1" id="transaction_fee_input" required>
-                            <div class="input-group-addon">%</div>
+
                         </div>
                         <div ng-messages="rate_form.transaction_fee.$error" ng-if="rate_form.transaction_fee.$dirty">
                             <div class="small text-danger" ng-message="min">
diff --git a/src/main/ui/static/payment/partner/templates/rate_config_dialog.html b/src/main/ui/static/payment/partner/templates/rate_config_dialog.html
index d06a7eac6..d92b9ecf6 100644
--- a/src/main/ui/static/payment/partner/templates/rate_config_dialog.html
+++ b/src/main/ui/static/payment/partner/templates/rate_config_dialog.html
@@ -43,7 +43,7 @@
                         <div class="input-group">
                             <input type="number" name="transaction_fee" class="form-control" ng-model="rate.transaction_fee"
                                    min="0" step="0.1" id="transaction_fee_input" required>
-                            <div class="input-group-addon">%</div>
+
                         </div>
                         <div ng-messages="rate_form.transaction_fee.$error" ng-if="rate_form.transaction_fee.$dirty">
                             <!--<div class="small text-danger" ng-message="max">-->

From 7fd4d515e07f7fc8ed024d50c1d1c1c515d23cea Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Sun, 30 Sep 2018 17:46:26 +0800
Subject: [PATCH 103/103] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=85=B3=E9=97=ADcle?=
 =?UTF-8?q?aring=E8=87=AA=E5=8A=A8=E7=BB=AD=E7=BA=A6=E6=97=B6=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0Rpay+?=
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, 1 insertion(+), 2 deletions(-)

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 e18ded9b0..15d9d6f59 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
@@ -4018,8 +4018,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             record.put("remark", "费率到期系统自动延期1年");
             clientRateMapper.saveRate(record);
             if ("Rpay".equals(o.getString("rate_name"))) {
-                rpayApi.modifySurchargeConfig(clientMapper.findClient(client_id));
-
+                //rpayApi.modifySurchargeConfig(clientMapper.findClient(client_id));
             }
         }
         clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, client.getString("client_moniker"), "tax_in_surcharge", false));