From 98a301ba4adfd82fd8b13f086342bf4f0fbd1c36 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 1 Nov 2018 09:54:52 +0800
Subject: [PATCH 1/3] add compliance partnerList register_time

---
 .../manage/mappers/system/ClientMapper.xml    |  7 +++++-
 .../ui/static/menu/templates/main_menu.html   |  2 +-
 .../partner/templates/partner_compliance.html | 24 +++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)

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 f6e605d94..72c1f9331 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
@@ -168,7 +168,12 @@
         <where>
             <if test="client_moniker !=null">c.client_moniker=#{client_moniker}</if>
             <if test="sub_merchant_id!=null">and c.sub_merchant_id=#{sub_merchant_id}</if>
-
+            <if test="create_start_time!=null">
+                AND c.create_time >= #{create_start_time}
+            </if>
+            <if test="create_end_time!=null">
+                AND c.create_time &lt;= #{create_end_time}
+            </if>
 
             <if test="approving">
                 and ((c.approve_result=4 and c.open_status is null) or (c.approve_result=3 and c.open_status is null) or
diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html
index 293d10ec3..1670dc8bc 100644
--- a/src/main/ui/static/menu/templates/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -103,7 +103,7 @@
                 </div>
             </div>
         </div>
-        <div class="list-group" ng-if="roleNow!=null && roleNow!='administrator' && roleNow!='developer' && roleNow!='sitemanager'">
+        <div class="list-group" ng-if="role!=null && role!='administrator' && role!='developer' && role!='sitemanager'">
             <div class="row">
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="transaction">
                     <div class="description-block">
diff --git a/src/main/ui/static/payment/partner/templates/partner_compliance.html b/src/main/ui/static/payment/partner/templates/partner_compliance.html
index 534daecf6..a02227ee1 100644
--- a/src/main/ui/static/payment/partner/templates/partner_compliance.html
+++ b/src/main/ui/static/payment/partner/templates/partner_compliance.html
@@ -151,6 +151,30 @@
                                                 </select>
                                             </div>
                                         </div>
+                                        <div class="form-group col-sm-6">
+                                            <label class="control-label col-xs-4 col-sm-4">Regist Time
+                                                Select</label>
+                                            <div class="col-sm-8">
+                                                <div style="display: inline-block">
+                                                    <input class="form-control" id="re-from-input"
+                                                           ng-model="params.create_start_time"
+                                                           uib-datepicker-popup size="10" placeholder="From"
+                                                           is-open="createStartTime.open"
+                                                           ng-click="createStartTime.open=true"
+                                                           datepicker-options="{maxDate:params.create_end_time||today}">
+                                                </div>
+                                                ~
+                                                <div style="display: inline-block">
+                                                    <input class="form-control" id="re-to-input"
+                                                           ng-model="params.create_end_time"
+                                                           uib-datepicker-popup size="10" placeholder="To"
+                                                           is-open="createEndTime.open"
+                                                           ng-click="createEndTime.open=true"
+                                                           datepicker-options="{minDate:params.create_start_time,maxDate:today}">
+                                                </div>
+                                            </div>
+                                        </div>
+
                                         <div class="form-horizontal">
                                             <!--status-->
                                             <div class="form-group col-sm-12" ng-if="'10'|withRole">

From b8265440cafeb549cbc8bd17f4979a4d28de45ea Mon Sep 17 00:00:00 2001
From: lujian <jian.lu@globalfreepay.com>
Date: Thu, 1 Nov 2018 16:02:38 +0800
Subject: [PATCH 2/3] =?UTF-8?q?[fix]bd=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/impl/RiskBusinessServiceImpl.java    |  6 +++--
 .../manage/mappers/payment/OrderMapper.xml    | 11 +++++++-
 .../mappers/riskbusiness/RiskEventMapper.xml  |  5 ++--
 src/main/ui/static/analysis/risk_business.js  | 18 ++++++++++---
 .../analysis/templates/new_riskEvent.html     |  2 +-
 .../templates/riskEvent_detail_bd.html        | 27 ++++++++++---------
 6 files changed, 47 insertions(+), 22 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 c6755c2fb..b64c2744a 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
@@ -89,7 +89,7 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
     private RoyalThreadPoolExecutor royalThreadPoolExecutor;
     private final String UPLOAD_MAIL_PREFIX = "UPLOAD_MAIL";
 
-    @Autowired
+    @Resource
     private RiskMaterialMapper riskMaterialMapper;
     @Resource
     private RiskFileMapper riskFileMapper;
@@ -176,7 +176,9 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
         params.put("fillin_person", manager.getString("display_name"));
         String orderIds = params.getString("order_ids");
         if (StringUtils.isNotBlank(orderIds)) {
-            orderIds = orderIds.trim().replace("，", ",");
+            // 去除所有空格与中文逗号'，'
+            orderIds = orderIds.replace("，", ",");
+            orderIds = orderIds.replace(" ", "");
             params.put("order_ids", orderIds);
             String[] orderIdArray = orderIds.split(",");
             List<String> orderAmountList = new ArrayList<>();
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
index c9eda37b7..cdbb3d8d2 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
@@ -738,6 +738,15 @@
             <if test="clearing_status!=null">and t.clearing_status=#{clearing_status}</if>
         </where>
     </select>
+
+    <!--
+              由于当时定的是order_id, 所以是根据order_id查的
+              现在要改成依据system_transaction_id查，
+              直接改成t.system_transaction_id = #{order_id}
+              否则要改的地方太多了，
+              所以这里的参数order_id其实是system_transaction_id，
+              特此说明！
+    -->
     <select id="findOrderById" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
             o.order_id                                 order_id,
@@ -810,7 +819,7 @@
             AND t.refund_id IS NULL
             AND t.transaction_type = 'Credit'
             AND t.channel != 'System'
-            WHERE o.order_id = #{order_id}
+            WHERE t.system_transaction_id = #{order_id}
     </select>
 
     <select id="listHalloweenActOrder" resultType="com.alibaba.fastjson.JSONObject">
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskEventMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskEventMapper.xml
index 5f85a94da..b9bf6b672 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskEventMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskEventMapper.xml
@@ -51,13 +51,14 @@
         </if>
 
         <if test="bd_id != null">
-            LEFT JOIN(
+            INNER JOIN(
                 SELECT DISTINCT client_id
                 FROM sys_client_bd
                 WHERE
                     is_valid = 1
                     AND bd_id = #{bd_id}
-                    AND end_date &gt; NOW()
+                    AND ( end_date IS NULL OR end_date &gt; NOW())
+
             ) scb
             ON sc.client_id = scb.client_id
         </if>
diff --git a/src/main/ui/static/analysis/risk_business.js b/src/main/ui/static/analysis/risk_business.js
index b3f5435d5..927b7977b 100644
--- a/src/main/ui/static/analysis/risk_business.js
+++ b/src/main/ui/static/analysis/risk_business.js
@@ -439,7 +439,19 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                             type: 'error'
                         });
                     });
-                }
+                };
+
+                // 加载提交材料
+                $scope.loadRiskMaterial = function() {
+                    $http.get('/risk/business/' + $scope.riskEvent.risk_id + '/material').then(function(resp) {
+                        $scope.material = resp.data;
+                    })
+                };
+
+                // BD是否可上传
+                $scope.uploadShowFlag = ($scope.riskEvent.result_type == 1 || $scope.riskEvent.result_type == 4) ? true : false;
+                if (!$scope.uploadShowFlag)
+                    $scope.loadRiskMaterial();
             }
         ]);
 
@@ -503,7 +515,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
 
         app.controller('newRiskEventCtrl', ['$scope', '$state', '$http', '$uibModal', '$filter', 'commonDialog',
             function ($scope, $state, $http, $uibModal, $filter, commonDialog) {
-
+                $scope.receive_email_date = new Date();
                 $scope.today = new Date();
                 $scope.orderTypes = orderTypesMap;
                 $scope.royapayOrderTypes = royalpayOrderTypesMap;
@@ -518,7 +530,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                         });
                         return;
                     }
-
+                    $scope.riskEvent.receive_email_date = $scope.receive_email_date;
                     if ($scope.riskEvent.receive_email_date == null)
                         $scope.riskEvent.receive_email_date = new Date();
                     // 默认设置邮件回复截止日期为收到邮件的七天后，如果是内部调单，设置三天后
diff --git a/src/main/ui/static/analysis/templates/new_riskEvent.html b/src/main/ui/static/analysis/templates/new_riskEvent.html
index 8aece4787..704892ca1 100644
--- a/src/main/ui/static/analysis/templates/new_riskEvent.html
+++ b/src/main/ui/static/analysis/templates/new_riskEvent.html
@@ -185,7 +185,7 @@
                                     <input class="form-control"
                                            id="receive-date-input"
                                            type="text"
-                                           ng-model="riskEvent.receive_email_date"
+                                           ng-model="receive_email_date"
                                            uib-datepicker-popup
                                            size="10"
                                            placeholder="{{(riskEvent.order_type == 1 || riskEvent.order_type ==2) ? 'Receive Date' : 'Create Date'}}"
diff --git a/src/main/ui/static/analysis/templates/riskEvent_detail_bd.html b/src/main/ui/static/analysis/templates/riskEvent_detail_bd.html
index 66a7e1e6b..beac21adc 100644
--- a/src/main/ui/static/analysis/templates/riskEvent_detail_bd.html
+++ b/src/main/ui/static/analysis/templates/riskEvent_detail_bd.html
@@ -73,7 +73,7 @@
                         </p>
                     </div>
                     <div class="col-sm-12">
-                        <div class="col-xs-12">
+                        <div class="col-xs-12" ng-if="uploadShowFlag">
                             <button class="btn btn-primary" type="button"
                                     ngf-select="uploadFile1($files)" ngf-multiple="true">
                                 <i class="fa fa-upload"></i> Upload
@@ -83,7 +83,7 @@
                         <div class="col-xs-12">
                             <uib-progressbar value="file1Progress.value" type="success"  animate="true" ng-if="file1Progress.value" max="100"
                             >{{file1Progress.value}}%</uib-progressbar>
-                            <img  class="col-xs-3 logo-width" ng-repeat="url in material.file1_url" ng-src="{{url}}">
+                            <img  class="col-xs-3 logo-width" ng-repeat="url in (material.file1 || material.file1_url)" ng-src="{{url}}">
                         </div>
                     </div>
                 </div>
@@ -105,7 +105,7 @@
                         </p>
                     </div>
                     <div class="col-sm-12">
-                        <div class="col-xs-12">
+                        <div class="col-xs-12" ng-if="uploadShowFlag">
                             <button class="btn btn-primary" type="button"
                                     ngf-select="uploadFile2($files)" ngf-multiple="true">
                                 <i class="fa fa-upload"></i> Upload
@@ -115,7 +115,7 @@
                         <div class="col-xs-12">
                             <uib-progressbar value="file2Progress.value" type="success"  animate="true" ng-if="file2Progress.value" max="100"
                             >{{file2Progress.value}}%</uib-progressbar>
-                            <img  class="col-xs-3 logo-width" ng-repeat="url in material.file2_url" ng-src="{{url}}">
+                            <img  class="col-xs-3 logo-width" ng-repeat="url in (material.file2 ||material.file2_url)" ng-src="{{url}}">
                         </div>
                     </div>
 
@@ -137,7 +137,7 @@
                         </p>
                     </div>
                     <div class="col-sm-12">
-                        <div class="col-xs-12">
+                        <div class="col-xs-12" ng-if="uploadShowFlag">
                             <button class="btn btn-primary" type="button"
                                     ngf-select="uploadFile3($files)" ngf-multiple="true">
                                 <i class="fa fa-upload"></i> Upload
@@ -147,7 +147,7 @@
                         <div class="col-xs-12">
                             <uib-progressbar value="file3Progress.value" type="success"  animate="true" ng-if="file3Progress.value" max="100"
                             >{{file3Progress.value}}%</uib-progressbar>
-                            <img  class="col-xs-3 logo-width" ng-repeat="url in material.file3_url" ng-src="{{url}}">
+                            <img  class="col-xs-3 logo-width" ng-repeat="url in (material.file3 || material.file3_url)" ng-src="{{url}}">
                         </div>
                     </div>
                 </div>
@@ -165,7 +165,7 @@
                         </p>
                     </div>
                     <div class="col-sm-12">
-                        <div class="col-xs-12">
+                        <div class="col-xs-12" ng-if="uploadShowFlag">
                             <button class="btn btn-primary" type="button"
                                     ngf-select="uploadFile4($files)" ngf-multiple="true">
                                 <i class="fa fa-upload"></i> Upload
@@ -175,7 +175,7 @@
                         <div class="col-xs-12">
                             <uib-progressbar value="file4Progress.value" type="success"  animate="true" ng-if="file4Progress.value" max="100"
                             >{{file4Progress.value}}%</uib-progressbar>
-                            <img  class="col-xs-3 logo-width" ng-repeat="url in material.file4_url" ng-src="{{url}}">
+                            <img  class="col-xs-3 logo-width" ng-repeat="url in (material.file4 || material.file4_url)" ng-src="{{url}}">
                         </div>
                     </div>
 
@@ -197,7 +197,7 @@
                         </p>
                     </div>
                     <div class="col-sm-12">
-                        <div class="col-xs-12">
+                        <div class="col-xs-12" ng-if="uploadShowFlag">
                             <button class="btn btn-primary" type="button"
                                     ngf-select="uploadFile5($files)" ngf-multiple="true">
                                 <i class="fa fa-upload"></i> Upload
@@ -207,7 +207,7 @@
                         <div class="col-xs-12">
                             <uib-progressbar value="file5Progress.value" type="success"  animate="true" ng-if="file5Progress.value" max="100"
                             >{{file5Progress.value}}%</uib-progressbar>
-                            <img  class="col-xs-3 logo-width" ng-repeat="url in material.file5_url" ng-src="{{url}}">
+                            <img  class="col-xs-3 logo-width" ng-repeat="url in (material.file5 || material.file5_url)" ng-src="{{url}}">
                         </div>
                     </div>
 
@@ -219,7 +219,7 @@
                         </p>
                     </div>
                     <div class="col-sm-12">
-                        <div class="col-xs-12">
+                        <div class="col-xs-12" ng-if="uploadShowFlag">
                             <button class="btn btn-primary" type="button"
                                     ngf-select="uploadFile6($files)" ngf-multiple="true">
                                 <i class="fa fa-upload"></i> Upload
@@ -229,7 +229,7 @@
                         <div class="col-xs-12">
                             <uib-progressbar value="file6Progress.value" type="success"  animate="true" ng-if="file6Progress.value" max="100"
                             >{{file6Progress.value}}%</uib-progressbar>
-                            <img  class="col-xs-3 logo-width" ng-repeat="url in material.file6_url" ng-src="{{url}}">
+                            <img  class="col-xs-3 logo-width" ng-repeat="url in (material.file6 || material.file6_url)" ng-src="{{url}}">
                         </div>
                     </div>
 
@@ -240,6 +240,7 @@
                         <textarea class="form-control" required
                                   ng-model="material.description" placeholder="No more than 500"
                                   name="description"
+                                  ng-disabled="!uploadShowFlag"
                                   maxlength="500"></textarea>
                     </div>
 
@@ -248,7 +249,7 @@
         </div>
     </form>
 
-    <div style="text-align: center">
+    <div style="text-align: center" ng-if="uploadShowFlag">
         <a role="button" style="margin-bottom: 25px;" class="btn btn-success btn-sm ng-scope" ng-disabled="!(material.description)"
            ng-click="submit(uploadForm)">Submit</a>
     </div>

From 433c6ebf8ddc1e63420dbe17db5df2128ed22727 Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Thu, 1 Nov 2018 16:51:21 +0800
Subject: [PATCH 3/3] =?UTF-8?q?bd=E6=B7=BB=E5=8A=A0=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A9=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/manage.html                          |  6 ++++++
 src/main/ui/static/menu/templates/main_menu.html | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html
index b648ffa52..9979122aa 100644
--- a/src/main/ui/manage.html
+++ b/src/main/ui/manage.html
@@ -321,6 +321,12 @@ margin-bottom: 10%;"/>
                                 <i class="fa fa-area-chart"></i> <span>商户交易额统计</span>
                             </a>
                         </li>
+                        <li ui-sref-active="active"
+                            ng-if="('partnerapply'|withModule) && ('100'|withRole)">
+                            <a ui-sref="partner_apply" ui-sref-opts="{reload:true}">
+                                <i class="fa fa-envelope-o"></i> <span>自主申请|Partner Applies</span>
+                            </a>
+                        </li>
                     </ul>
                 </li>
 
diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html
index 1670dc8bc..d74e2ce14 100644
--- a/src/main/ui/static/menu/templates/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -101,6 +101,16 @@
                     </div>
                     </a>
                 </div>
+                <div class="col-sm-2 col-xs-6" ng-if="('partnerapply'|withModule) && ('100'|withRole)">
+                    <a ui-sref="partner_apply" ui-sref-opts="{reload:true}">
+                        <div class="description-block">
+                            <img src="/static/images/main_menu/finance_statistics.png"/>
+                            <div class="description-text">
+                                <span>商户自助申请</span>
+                            </div>
+                        </div>
+                    </a>
+                </div>
             </div>
         </div>
         <div class="list-group" ng-if="role!=null && role!='administrator' && role!='developer' && role!='sitemanager'">