From ea8eeafb1ddad4774bbc2997fbf7112367d432e6 Mon Sep 17 00:00:00 2001
From: yixian <astro.dai@royalpay.com.au>
Date: Wed, 7 Nov 2018 15:15:49 +0800
Subject: [PATCH 1/4] distribute bank rule edit: prefer to move no-CBA bank
 accounts to ANZ

---
 .../clearing/core/impl/CleanServiceImpl.java       | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 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 f965868a4..27f2fdeb9 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
@@ -1170,7 +1170,19 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
         String defaultBank = config.getRemainsTo();
         clearingDetailMapper.updateAllBanks(defaultBank, clearingId);
         List<JSONObject> details = clearingDetailMapper.listReportsOfSettlement(clearingId);
-        details.sort((log1, log2) -> log2.getBigDecimal("clearing_amount").compareTo(log1.getBigDecimal("clearing_amount")));
+        details.sort((log1, log2) -> {
+            if (StringUtils.equals(defaultBank, log1.getString("account_bank")) ==
+                    StringUtils.equals(defaultBank, log2.getString("account_bank"))) {
+                //两个银行都是defaultBank或者都不是defaultBank, all true or all false，比较清算金额，金额大的在前
+                return log2.getBigDecimal("clearing_amount").compareTo(log1.getBigDecimal("clearing_amount"));
+            }
+            //有一个是defaultBank，defaultBank在后
+            if (defaultBank.equals(log1.getString("account_bank"))) {
+                return -1;
+            } else {
+                return 1;
+            }
+        });
         bankDistribution.remove(defaultBank);
         for (String bank : bankDistribution.keySet()) {
             List<String> detailIds = new ArrayList<>();

From 68a1942364d98636566044a05f02b0668a5ed623 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 8 Nov 2018 09:45:16 +0800
Subject: [PATCH 2/4] =?UTF-8?q?add=20&&=20fix=20=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E5=8F=B7=E7=AE=A1=E7=90=86\=E4=BC=98=E5=8C=96SQL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mappers/ClientRatesAnalysisMapper.xml     | 11 ++++-----
 .../analysis/mappers/OrderAnalysisMapper.xml  |  8 +++----
 src/main/ui/manage.html                       |  9 ++++++--
 .../ui/static/menu/templates/main_menu.html   | 23 +++++++++----------
 4 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientRatesAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientRatesAnalysisMapper.xml
index 6c4a23d6d..140c8d33e 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientRatesAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientRatesAnalysisMapper.xml
@@ -30,13 +30,12 @@
             INNER JOIN (
                            SELECT
                                c.client_id,
-                               count(o.order_id) orders
+                               SUM(o.orders) orders
                            FROM sys_clients c
-                               LEFT JOIN pmt_orders o
-                                   ON o.client_id = c.client_id AND o.status > 4
-                                   AND date(o.create_time) <= date(#{end})
-                                   AND date(o.create_time) >= date(#{begin})
-                                   and o.total_amount>10
+                               LEFT JOIN statistics_customer_order o
+                                   ON o.client_id = c.client_id AND o.total > 10
+                                   AND date(o.date) <= date(#{end})
+                                   AND date(o.date) >= date(#{begin})
                           WHERE c.approve_result=1 and c.is_valid=1
                            GROUP BY c.client_id
                        ) c ON c.client_id = r.client_id
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 6c3265277..650a06208 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,9 @@
     </select>
 
     <select id="listCustomersData" resultType="com.alibaba.fastjson.JSONObject">
-        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
+        SELECT r.nickname,r.headimg,o.customer_id,sum(if(o.status='5',o.customer_payment_amount,0)) amount,
+        COUNT(DISTINCT o.order_id) orders,max(o.customer_payment_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>
@@ -236,9 +235,8 @@
     </select>
 
     <select id="listCustomersDataAnalysis" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT sum(if(t.transaction_type='Credit',t.clearing_amount,0)) total_amount
+        SELECT sum(if(o.status='5',o.customer_payment_amount,0)) total_amount
         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.refund_id is not null)
         <where>
             <if test="begin!=null">and o.create_time &gt;= #{begin}</if>
             <if test="end!=null">and o.create_time &lt; #{end}</if>
diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index 5e92e2271..d139c4903 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -288,7 +288,7 @@ margin-bottom: 10%;"/>
                     </a>
                 </li>
 
-                <li class="menu-group" ng-if="roleNow!=null && roleNow!='administrator' && roleNow!='developer' && roleNow!='sitemanager'">
+                <li class="menu-group" ng-if="roleNow!=null && roleNow!='administrator' && roleNow!='developer'">
                     <p role="button" ng-class="{'active': Partner,'is-hide':hideSideBar}" ng-click="Partner = !Partner">
                         <span>商户管理|Merchant</span>
                         <span class="pull-right-container">
@@ -330,7 +330,7 @@ margin-bottom: 10%;"/>
                     </ul>
                 </li>
 
-                <li class="menu-group" ng-if="roleNow!=null && roleNow!='administrator' && roleNow!='developer' && roleNow!='sitemanager'">
+                <li class="menu-group" ng-if="roleNow!=null && roleNow!='administrator' && roleNow!='developer'">
                     <p role="button" ng-class="{'active': Transaction,'is-hide':hideSideBar}" ng-click="Transaction = !Transaction">
                         <span>交易管理|Transaction</span>
                         <span class="pull-right-container">
@@ -379,6 +379,11 @@ margin-bottom: 10%;"/>
                         </span>
                     </p>
                     <ul class="sidebar-menu" ng-class="{'active':Risk}">
+                        <li ui-sref-active="active" ng-if="('merchantIdManage'|withModule)">
+                            <a ui-sref="merchant_id_manage" ui-sref-opts="{reload:true}">
+                                <i class="fa  fa-sitemap"></i> <span>商户号管理</span>
+                            </a>
+                        </li>
                         <li ui-sref-active="active">
                             <a ui-sref="analysis_monitoring.monitor" ui-sref-opts="{reload:true}">
                                 <i class="fa fa-tv"></i> <span>交易成功率监控</span>
diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html
index 12b8ce33e..bbe6ab835 100644
--- a/src/main/ui/static/menu/templates/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -32,7 +32,7 @@
             </div>
         </div>
 -->     <a role="button" style="float: right;line-height: 46px" ui-sref="home" ng-click="headerCopyDisplay()"><i class="fa fa-reply"></i> 返回</a>
-        <div class="list-group" ng-if="role!=null && role!='administrator' && role!='developer' && role!='sitemanager' &&  'partners'|withModule">
+        <div class="list-group" ng-if="role!=null && role!='administrator' && role!='developer' &&  'partners'|withModule">
             <div class="row">
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="partners">
                     <div class="description-block">
@@ -113,7 +113,7 @@
                 </div>-->
             </div>
         </div>
-        <div class="list-group" ng-if="role!=null && role!='administrator' && role!='developer' && role!='sitemanager'">
+        <div class="list-group" ng-if="role!=null && role!='administrator' && role!='developer'">
             <div class="row">
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="transaction">
                     <div class="description-block">
@@ -193,6 +193,15 @@
                 </div>
             </div>
             <div class="row">
+                <div class="col-sm-2 col-xs-6" ng-if="('merchantIdManage'|withModule)">
+                    <a ui-sref="merchant_id_manage" ui-sref-opts="{reload:true}" >
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/configure_merchant_number.png"/>
+                            <div class="description-text">
+                                <span class="description-text">商户号</span>
+                            </div>
+                        </div>
+                    </a></div>
                 <div class="col-sm-2 col-xs-6">
                     <a ui-sref="analysis_monitoring.monitor" ui-sref-opts="{reload:true}">
                     <div class="description-block">
@@ -551,16 +560,6 @@
                     </div>
                     </a>
                 </div>
-                <div ng-if="('cashbackAnalysis'|withModule)" class="col-sm-2 col-xs-6">
-                    <a ui-sref="cashbackAnalysis" ui-sref-opts="{reload:true}">
-                    <div class="description-block">
-                        <img src="/static/images/main_menu/activity_marketing_account.png"/>
-                        <div class="description-text">
-                            <span class="description-text">营销账户</span>
-                        </div>
-                    </div>
-                    </a>
-                </div>
                 <div ng-if="'settleDelay'|withModule" class="col-sm-2 col-xs-6">
                     <a ui-sref="settle_delay" ui-sref-opts="{reload:true}">
                     <div class="description-block">

From 05c5d7207a754b7fe07d032187d8f9251c1f331a Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 8 Nov 2018 11:09:53 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix=20=E5=95=86=E6=88=B7=E6=B4=BB=E8=B7=83?=
 =?UTF-8?q?=E5=BA=A6&&=E6=B6=88=E8=B4=B9=E8=80=85=E6=8E=92=E5=90=8Dsql?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysis/core/CustomersAnalysisService.java    |  2 ++
 .../core/impls/ClientRatesAnalysisServiceImpl.java |  4 ++--
 .../core/impls/CustomersAnalysisServiceImp.java    |  8 ++++++++
 .../analysis/web/CustomersAnalysisController.java  | 11 +++++++++++
 .../analysis/mappers/ClientRatesAnalysisMapper.xml | 14 +++++++-------
 src/main/ui/static/analysis/customer_analysis.js   |  4 +++-
 6 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/CustomersAnalysisService.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/CustomersAnalysisService.java
index c41976495..71f667ef9 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/CustomersAnalysisService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/CustomersAnalysisService.java
@@ -15,6 +15,8 @@ public interface CustomersAnalysisService {
 
     JSONObject getCustomersRanking(JSONObject params, int page, int limit);
 
+    JSONObject getCustomersTotal(JSONObject params);
+
     JSONObject getOrdersByOpenid(JSONObject params, int page, int limit);
 
     void sendPartnerTransactionDaily(Date date);
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ClientRatesAnalysisServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ClientRatesAnalysisServiceImpl.java
index e8fa2779d..e87373d49 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ClientRatesAnalysisServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ClientRatesAnalysisServiceImpl.java
@@ -58,8 +58,8 @@ public class ClientRatesAnalysisServiceImpl implements ClientRatesAnalysisServic
         if (ManagerRole.BD_LEADER.hasRole(manager.getIntValue("role"))) {
             params.put("bd_group", manager.getString("manager_id"));
         }
-        params.put("begin", beginDate);
-        params.put("end", endDate);
+        params.put("begin", DateFormatUtils.format(beginDate,"yyyy-MM-dd"));
+        params.put("end", DateFormatUtils.format(endDate,"yyyy-MM-dd"));
         orgManager.checkOrgIds(manager,params);
         JSONObject result = new JSONObject();
         List<JSONObject> bdAnalysis = clientRatesAnalysisMapper.analysisRatesForBDUsers(params);
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 88e26c0d1..6f35bd105 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
@@ -82,6 +82,14 @@ public class CustomersAnalysisServiceImp implements CustomersAnalysisService {
         return result;
     }
 
+    @Override
+    public JSONObject getCustomersTotal(JSONObject params) {
+        JSONObject result = new JSONObject();
+        result.put("analysis", orderAnalysisMapper.listCustomersDataAnalysis(params));
+        result.put("openid_type", params.getIntValue("openid_type"));
+        return result;
+    }
+
     @Override
     public JSONObject getOrdersByOpenid(JSONObject params, int page, int limit) {
         PageList<JSONObject> logs = orderMapper.listOrderByCustomer(params, new PageBounds(page, limit, Order.formString("create_time.desc")));
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/web/CustomersAnalysisController.java b/src/main/java/au/com/royalpay/payment/manage/analysis/web/CustomersAnalysisController.java
index 99d38b75d..9349bd9c9 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/web/CustomersAnalysisController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/web/CustomersAnalysisController.java
@@ -85,6 +85,17 @@ public class CustomersAnalysisController {
         return customersAnalysisService.getCustomersRanking(params,analysis.getPage(),analysis.getLimit());
     }
 
+    @ManagerMapping(value = "/ranking/{openid_type}/total",role = ManagerRole.RISK_MANAGER)
+    public JSONObject getCustomersTotal(@PathVariable int openid_type, AnalysisBean analysis, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
+        JSONObject params = analysis.toParams(null);
+        params.put("openid_type",openid_type);
+        if (manager.getInteger("org_id") != null) {
+            params.put("org_id", manager.getIntValue("org_id"));
+        }
+
+        return customersAnalysisService.getCustomersTotal(params);
+    }
+
     @ManagerMapping(value = "/{customer_id}/orders",role = ManagerRole.DEVELOPER)
     public JSONObject getCustomerOrders(@PathVariable String customer_id, TradeLogQuery tradeLogQuery, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
         JSONObject params = tradeLogQuery.toParams(null);
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientRatesAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientRatesAnalysisMapper.xml
index 140c8d33e..8529a00fc 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientRatesAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientRatesAnalysisMapper.xml
@@ -30,7 +30,7 @@
             INNER JOIN (
                            SELECT
                                c.client_id,
-                               SUM(o.orders) orders
+                                NULLIF (SUM(o.orders),0) orders
                            FROM sys_clients c
                                LEFT JOIN statistics_customer_order o
                                    ON o.client_id = c.client_id AND o.total > 10
@@ -61,13 +61,13 @@
                            SELECT
                                c.client_id,
                                c.org_id,
-                               count(o.order_id) orders
+                               NULLIF (SUM(o.orders),0) orders
                            FROM sys_clients c
-                               LEFT JOIN pmt_orders o
-                                   ON o.client_id = c.client_id AND o.status > 4
-                                   AND date(o.create_time) <= date(#{end})
-                                   AND date(o.create_time) >= date(#{begin})
-                                   and o.total_amount>10
+                               LEFT JOIN statistics_customer_order o
+                                   ON o.client_id = c.client_id
+                                   AND date(o.date) <= date(#{end})
+                                   AND date(o.date) >= date(#{begin})
+                                   and o.total>10
         ]]>
         <if test="client_ids!=null">
             and c.client_id in
diff --git a/src/main/ui/static/analysis/customer_analysis.js b/src/main/ui/static/analysis/customer_analysis.js
index 6718e9ecf..a46191474 100644
--- a/src/main/ui/static/analysis/customer_analysis.js
+++ b/src/main/ui/static/analysis/customer_analysis.js
@@ -78,7 +78,6 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
                 $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){
                     $scope.order_params.customer_id = $scope.customers[0].customer_id;
@@ -89,6 +88,9 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
                 }
 
             });
+            $http.get('/analysis/customers/ranking/'+$scope.params.openid_type+'/total', {params: params}).then(function (resp) {
+                $scope.customers_analysis = resp.data.analysis;
+            });
         };
         //$scope.listCustomers(1);
         

From 58e3183d40ce354458c79531c1eb21194a8fc624 Mon Sep 17 00:00:00 2001
From: lujian <jian.lu@globalfreepay.com>
Date: Thu, 8 Nov 2018 14:49:56 +0800
Subject: [PATCH 4/4] =?UTF-8?q?[fix]=E4=BF=AE=E5=A4=8D=E9=80=9A=E7=94=A8?=
 =?UTF-8?q?=E5=8F=B7=E8=B0=83=E5=8D=95=E5=95=86=E6=88=B7=E4=B8=8D=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/impl/RiskBusinessServiceImpl.java    | 32 ++++++++++++-------
 src/main/ui/static/analysis/risk_business.js  | 16 +++++++++-
 .../analysis/templates/new_riskEvent.html     |  2 +-
 .../analysis/templates/risk_business.html     |  4 ++-
 4 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java
index 27802aa3e..365852461 100644
--- a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java
@@ -149,7 +149,10 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
         String orderIds = riskEvent.getString("order_ids");
         JSONObject client = clientMapper.findClientByMonikerAll(riskEvent.getString("client_moniker"));
         List<JSONObject> tradeLogs = new ArrayList<>();
-        if (StringUtils.isNotBlank(orderIds)) {
+        /**
+         * 通用号调单会有client为空的情况，所以无法查到订单信息
+         */
+        if (client != null && StringUtils.isNotBlank(orderIds)) {
             String[] orderIdArray = orderIds.trim().split(",");
             JSONObject orderInfo = new JSONObject();
             String realOrderId = "";
@@ -192,19 +195,26 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
             params.put("order_ids", orderIds);
             String[] orderIdArray = orderIds.split(",");
             List<String> orderAmountList = new ArrayList<>();
-            for (int i = 0; i < orderIdArray.length; i++) {
-                JSONObject orderInfo = orderMapper.findOrderById(orderIdArray[i],client.getIntValue("client_id"));
-                // 判断该笔订单是否存在，是否属于该商户
-                if (orderInfo == null)
-                    throw new OrderNotExistsException();
-                else {
-                    if (!clientMoniker.equals(orderInfo.getString("partner_code"))) {
-                        throw new OrderNotMatchException();
+            /**
+             * 通用号调单的时候，是不用填写client_moniker的，但是系统需要client_id关联查询订单信息，
+             * 所以当client为空的时候，就不去校验订单的信息了，从而order_amounts字段为空
+             * 带来的影响是前台根据金额字段查询对该风控事件就不起作用了。
+             */
+            if (client != null) {
+                for (int i = 0; i < orderIdArray.length; i++) {
+                    JSONObject orderInfo = orderMapper.findOrderById(orderIdArray[i],client.getIntValue("client_id"));
+                    // 判断该笔订单是否存在，是否属于该商户
+                    if (orderInfo == null)
+                        throw new OrderNotExistsException();
+                    else {
+                        if (!clientMoniker.equals(orderInfo.getString("partner_code"))) {
+                            throw new OrderNotMatchException();
+                        }
+                        orderAmountList.add(orderInfo.getString("total_amount"));
                     }
-                    orderAmountList.add(orderInfo.getString("total_amount"));
                 }
+                params.put("order_amounts", StringUtils.join(orderAmountList, ","));
             }
-            params.put("order_amounts", StringUtils.join(orderAmountList, ","));
         }
         riskEventMapper.save(params);
     }
diff --git a/src/main/ui/static/analysis/risk_business.js b/src/main/ui/static/analysis/risk_business.js
index 6e6d3ec30..fa8177534 100644
--- a/src/main/ui/static/analysis/risk_business.js
+++ b/src/main/ui/static/analysis/risk_business.js
@@ -578,7 +578,21 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                     $scope.partnerParam.sub_merchant_id = $scope.riskEvent.sub_merchant_id;
                     $http.get('/risk/business/partners', {params: $scope.partnerParam}).then(function (resp) {
                         $scope.partners = resp.data;
-                        $scope.riskEvent.client_moniker = $scope.partners[0].client_moniker;
+                        if ($scope.partners != null && $scope.partners.length > 0) {
+                            $scope.riskEvent.client_moniker = $scope.partners[0].client_moniker;
+                        }
+                        else {
+                            commonDialog.confirm({
+                                title: 'Warning',
+                                content: '该微信子商户号下暂时没有商户或者商户被禁用，是否继续？'
+                            }).then(function () {
+                                // 点击确定
+                                $scope.riskEvent.client_moniker = null;
+                            }, function () {
+                                // 点击取消
+                                $scope.riskEvent.sub_merchant_id = '';
+                            });
+                        }
                         if ($scope.partners != null && $scope.partners.length > 1 && $scope.riskEvent.order_type != 5)
                             commonDialog.confirm({
                                 title: 'Warning',
diff --git a/src/main/ui/static/analysis/templates/new_riskEvent.html b/src/main/ui/static/analysis/templates/new_riskEvent.html
index 704892ca1..4900bf874 100644
--- a/src/main/ui/static/analysis/templates/new_riskEvent.html
+++ b/src/main/ui/static/analysis/templates/new_riskEvent.html
@@ -101,7 +101,7 @@
                                 </div>
                             </div>
 
-                            <div class="form-group" ng-if="partners != null">
+                            <div class="form-group" ng-if="(partners != null) && (partners.length > 0) && riskEvent.order_type == 1">
                                 <label class="control-label col-sm-2"
                                        for="order-type-input">Company Name
                                 </label>
diff --git a/src/main/ui/static/analysis/templates/risk_business.html b/src/main/ui/static/analysis/templates/risk_business.html
index da236ae47..f86d2d2df 100644
--- a/src/main/ui/static/analysis/templates/risk_business.html
+++ b/src/main/ui/static/analysis/templates/risk_business.html
@@ -192,7 +192,9 @@
                             <tbody>
                                 <tr ng-repeat="riskEvent in riskEvents">
                                     <td>
-                                        <a role="button" ui-sref="partners.detail({clientMoniker: riskEvent.client_moniker})">
+                                        <a role="button"
+                                           ng-if="riskEvent.client_moniker != null"
+                                           ui-sref="partners.detail({clientMoniker: riskEvent.client_moniker})">
                                             {{riskEvent.short_name}}({{riskEvent.client_moniker}})
                                         </a>
                                     </td>