From fd4cd788d973ae117f7ba9c9683e97cdc7204a3f Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Thu, 16 Aug 2018 17:22:31 +0800
Subject: [PATCH 1/7] compare

---
 .../citypartner/beans/CityPartnerBean.java    |  9 +++++++
 .../web/CityPartnerRegisterController.java    | 27 ++++++++++++-------
 .../manage/mappers/bill/BillMapper.xml        |  2 +-
 src/main/ui/citypartner_register.html         | 17 +++++++++---
 4 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/citypartner/beans/CityPartnerBean.java b/src/main/java/au/com/royalpay/payment/manage/citypartner/beans/CityPartnerBean.java
index fcffc6fa0..043f5814d 100644
--- a/src/main/java/au/com/royalpay/payment/manage/citypartner/beans/CityPartnerBean.java
+++ b/src/main/java/au/com/royalpay/payment/manage/citypartner/beans/CityPartnerBean.java
@@ -22,6 +22,7 @@ public class CityPartnerBean {
     @NotBlank(message = "error.payment.valid.param_missing")
     @Length(max = 30)
     private String phone;
+    private String captcha;
 
     public JSONObject toJSON(){
         return (JSONObject) JSONObject.toJSON(this);
@@ -58,4 +59,12 @@ public class CityPartnerBean {
     public void setPhone(String phone) {
         this.phone = phone;
     }
+
+    public String getCaptcha() {
+        return captcha;
+    }
+
+    public void setCaptcha(String captcha) {
+        this.captcha = captcha;
+    }
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/citypartner/web/CityPartnerRegisterController.java b/src/main/java/au/com/royalpay/payment/manage/citypartner/web/CityPartnerRegisterController.java
index e78b879b0..d96cd5474 100644
--- a/src/main/java/au/com/royalpay/payment/manage/citypartner/web/CityPartnerRegisterController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/citypartner/web/CityPartnerRegisterController.java
@@ -1,17 +1,14 @@
 package au.com.royalpay.payment.manage.citypartner.web;
-
 import au.com.royalpay.payment.manage.citypartner.beans.CityPartnerBean;
 import au.com.royalpay.payment.manage.citypartner.core.CityPartnerRegisterService;
-import au.com.royalpay.payment.tools.exceptions.ForbiddenException;
+import au.com.royalpay.payment.manage.merchants.core.ClientApply;
+import au.com.royalpay.payment.tools.CommonConsts;
 import au.com.royalpay.payment.tools.http.HttpUtils;
-import au.com.royalpay.payment.tools.secure.ApplyRequest;
 import org.springframework.validation.Errors;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
 /**
@@ -22,10 +19,22 @@ import javax.validation.Valid;
 public class CityPartnerRegisterController {
     @Resource
     private CityPartnerRegisterService cityPartnerRegisterService;
+    @Resource
+    private ClientApply clientApply;
 
     @RequestMapping(method = RequestMethod.POST)
-    @ApplyRequest
-    public void register(@RequestBody @Valid CityPartnerBean partner, Errors errors) {
+    public void register(@CookieValue(CommonConsts.CODE_KEY) String codeKey, HttpServletResponse response,
+                         @RequestBody @Valid CityPartnerBean partner, Errors errors) throws Exception{
+        String codeValue = clientApply.getVerifyCode(codeKey);
+        if (codeValue == null) {
+            throw new Exception("Verification code has expired");
+        }
+        if (!codeValue.equals(partner.getCaptcha())){
+            throw new Exception("Verification code is not correct");
+        }else {
+            clientApply.deleteVerifyCodeKey(codeKey);
+            HttpUtils.dropCookie(response, CommonConsts.CODE_KEY);
+        }
         HttpUtils.handleValidErrors(errors);
         cityPartnerRegisterService.saveRegistry(partner);
     }
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/bill/BillMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/bill/BillMapper.xml
index 6870d79df..a213ff20d 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/bill/BillMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/bill/BillMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="au.com.royalpay.payment.manage.mappers.bill.BillMapper">
 
     <select id="listWithOrderAnalysis" resultType="com.alibaba.fastjson.JSONObject" >
-        select b.bill_id,b.status,b.currency,DATE_FORMAT(b.create_time,'%Y-%c-%e') create_date, DATE_FORMAT(b.create_time,'%H:%m:%s') create_time,b.remark,b.price,count(o.bill_order_id) order_counts,sum(o.order_total_amount) order_total_amount
+        select b.bill_id,b.status,b.currency,DATE_FORMAT(b.create_time, '%Y-%m-%d') create_date,DATE_FORMAT(b.create_time, '%k:%i:%s') create_time,b.remark,b.price,count(o.bill_order_id) order_counts,sum(o.order_total_amount) order_total_amount
         from pmt_bill b left join  pmt_bill_order o
         on   b.bill_id = o.bill_id and o.order_status = 1
         <where>
diff --git a/src/main/ui/citypartner_register.html b/src/main/ui/citypartner_register.html
index ba9a34360..372b3b8ee 100644
--- a/src/main/ui/citypartner_register.html
+++ b/src/main/ui/citypartner_register.html
@@ -139,13 +139,17 @@
                     },
                     error: function (jqXHR) {
                         alert(JSON.parse(jqXHR.responseText).message);
-                        $submit.removeAttr('disabled')
+                        $("#kaptcha").attr("src", "/partners/application/captcha-image?" + Math.floor(Math.random() * 100));
+                        $submit.removeAttr('disabled');
                     }
                 });
                 $submit.attr('disabled', 'disabled');
                 return false;
-            })
-        })
+            });
+            $('#kaptcha').click(function () {
+                $(this).attr("src", "/partners/application/captcha-image?" + Math.floor(Math.random() * 100));
+            });
+        });
     </script>
     <script>
         var _hmt = _hmt || [];
@@ -185,6 +189,13 @@
                         <input class="form-control input-lg" name="phone" type="tel" id="phone-input" maxlength="30"
                                required>
                     </div>
+                    <label class="control-label" for="captcha">验证码 Identifying Code</label>
+                    <div class="form-group">
+                        <input class="form-control input-lg" name="captcha" type="text" id="captcha" maxlength="30" style="width: 80%;display: inline"
+                               required>
+                        <img style="width:20%;display:inline;height: 46px;float: right" id="kaptcha" src="/partners/application/captcha-image"
+                             title="点击更换">
+                    </div>
                     <div class="form-group">
                         <button class="submit-btn" type="submit">提交 Submit</button>
                     </div>

From e430d7804da45341762fdd2d8fb7b8d872345b25 Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Fri, 17 Aug 2018 16:54:43 +0800
Subject: [PATCH 2/7] =?UTF-8?q?fix=20dashboard=E4=BB=8A=E6=97=A5=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment/manage/analysis/beans/AnalysisBean.java      | 9 +++++++++
 .../payment/manage/analysis/web/DashboardController.java | 2 +-
 src/main/ui/static/boot/application-boot.js              | 3 ++-
 src/main/ui/static/boot/index-boot.js                    | 3 ++-
 src/main/ui/static/boot/manager-boot.js                  | 3 ++-
 src/main/ui/static/dashboard/dashboard.js                | 5 +++--
 src/main/ui/static/lib/timezone/jstz-1.0.4.min.js        | 2 ++
 7 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 src/main/ui/static/lib/timezone/jstz-1.0.4.min.js

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 5b92ba4af..dc67aed73 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
@@ -36,6 +36,7 @@ public class AnalysisBean {
     private String amount_from;
     private String amount_to;
     private String bd_name;
+    private String timezone;
     public JSONObject toParams(String timezone) {
         JSONObject params = new JSONObject();
         if (timezone != null) {
@@ -229,4 +230,12 @@ public class AnalysisBean {
     public void setBd_name(String bd_name) {
         this.bd_name = bd_name;
     }
+
+    public String getTimezone() {
+        return timezone;
+    }
+
+    public void setTimezone(String timezone) {
+        this.timezone = timezone;
+    }
 }
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 0daf33a47..439a252e3 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
@@ -31,7 +31,7 @@ public class DashboardController {
 
     @ManagerMapping("/common_analysis_1")
     public JSONObject commonAnalysis1(AnalysisBean analysis, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
-        JSONObject params = analysis.toParams(null);
+        JSONObject params = analysis.toParams(analysis.getTimezone());
         orgManager.checkOrg(manager,params);
         return dashboardService.getCommonAnalysis1(params);
     }
diff --git a/src/main/ui/static/boot/application-boot.js b/src/main/ui/static/boot/application-boot.js
index 0bf1756bb..1824b7f6b 100644
--- a/src/main/ui/static/boot/application-boot.js
+++ b/src/main/ui/static/boot/application-boot.js
@@ -28,7 +28,8 @@ require.config({
         dragdrop: 'static/lib/angular-plugins/angular-drag-and-drop-lists.min',
         echarts: 'static/lib/echarts/echarts.common.min',
         angularEcharts: 'static/commons/angular-echarts',
-        decimal:'static/lib/decimal/decimal.min'
+        decimal:'static/lib/decimal/decimal.min',
+        jstz: 'static/lib/timezone/jstz-1.0.4.min'
     },
     shim: {
         'angular': {deps: ['jquery'], exports: 'angular'},
diff --git a/src/main/ui/static/boot/index-boot.js b/src/main/ui/static/boot/index-boot.js
index ebd3a9b18..3e683268c 100644
--- a/src/main/ui/static/boot/index-boot.js
+++ b/src/main/ui/static/boot/index-boot.js
@@ -28,7 +28,8 @@ require.config({
         dragdrop: 'static/lib/angular-plugins/angular-drag-and-drop-lists.min',
         echarts: 'static/lib/echarts/echarts.common.min',
         angularEcharts: 'static/commons/angular-echarts',
-        decimal:'static/lib/decimal/decimal.min'
+        decimal:'static/lib/decimal/decimal.min',
+        jstz: 'static/lib/timezone/jstz-1.0.4.min'
     },
     shim: {
         'angular': {deps: ['jquery','decimal'], exports: 'angular'},
diff --git a/src/main/ui/static/boot/manager-boot.js b/src/main/ui/static/boot/manager-boot.js
index 287160881..007f0d428 100644
--- a/src/main/ui/static/boot/manager-boot.js
+++ b/src/main/ui/static/boot/manager-boot.js
@@ -30,7 +30,8 @@ require.config({
         ueditor: 'static/lib/ueditor/ueditor.all.min',
         ueditorConfig: 'static/lib/ueditor/ueditor.config',
         angularEcharts: 'static/commons/angular-echarts',
-        decimal: 'static/lib/decimal/decimal.min'
+        decimal: 'static/lib/decimal/decimal.min',
+        jstz: 'static/lib/timezone/jstz-1.0.4.min'
     },
     shim: {
         'angular': {deps: ['jquery', 'decimal'], exports: 'angular'},
diff --git a/src/main/ui/static/dashboard/dashboard.js b/src/main/ui/static/dashboard/dashboard.js
index f25e4239d..e67fa4e6b 100644
--- a/src/main/ui/static/dashboard/dashboard.js
+++ b/src/main/ui/static/dashboard/dashboard.js
@@ -2,7 +2,7 @@
  * Created by davep on 2016-07-27.
  */
 
-define(['angular', 'uiRouter', 'uiBootstrap', 'angularEcharts'], function (angular) {
+define(['angular', 'uiRouter', 'jstz', 'uiBootstrap', 'angularEcharts'], function (angular) {
     'use strict';
     var colors = ['#00c0ef', '#00a65a', '#ff851b', '#f39c12', '#d81b60', '#605ca8', '#dd4b39', '#008080', '#8B008B', '#D2691E', '#708090'];
     var app = angular.module('dashboardApp', ['ui.router', 'ui.bootstrap', 'ngEcharts']);
@@ -25,7 +25,8 @@ define(['angular', 'uiRouter', 'uiBootstrap', 'angularEcharts'], function (angul
                 params: function () {
                     return {
                         begin: $filter('date')(new Date(), 'yyyyMMdd'),
-                        end: $filter('date')(new Date(), 'yyyyMMdd')
+                        end: $filter('date')(new Date(), 'yyyyMMdd'),
+                        timezone: jstz.determine().name()
                     }
                 }
             },
diff --git a/src/main/ui/static/lib/timezone/jstz-1.0.4.min.js b/src/main/ui/static/lib/timezone/jstz-1.0.4.min.js
new file mode 100644
index 000000000..96e3dd8ae
--- /dev/null
+++ b/src/main/ui/static/lib/timezone/jstz-1.0.4.min.js
@@ -0,0 +1,2 @@
+/*! jstz - v1.0.4 - 2012-12-12 */
+(function(e){var t=function(){"use strict";var e="s",n=function(e){var t=-e.getTimezoneOffset();return t!==null?t:0},r=function(e,t,n){var r=new Date;return e!==undefined&&r.setFullYear(e),r.setDate(n),r.setMonth(t),r},i=function(e){return n(r(e,0,2))},s=function(e){return n(r(e,5,2))},o=function(e){var t=e.getMonth()>7?s(e.getFullYear()):i(e.getFullYear()),r=n(e);return t-r!==0},u=function(){var t=i(),n=s(),r=i()-s();return r<0?t+",1":r>0?n+",1,"+e:t+",0"},a=function(){var e=u();return new t.TimeZone(t.olson.timezones[e])};return{determine:a,date_is_dst:o}}();t.TimeZone=function(e){"use strict";var n=null,r=function(){return n},i=function(){var e=t.olson.ambiguity_list[n],r=e.length,i=0,s=e[0];for(;i<r;i+=1){s=e[i];if(t.date_is_dst(t.olson.dst_start_dates[s])){n=s;return}}},s=function(){return typeof t.olson.ambiguity_list[n]!="undefined"};return n=e,s()&&i(),{name:r}},t.olson={},t.olson.timezones={"-720,0":"Etc/GMT+12","-660,0":"Pacific/Pago_Pago","-600,1":"America/Adak","-600,0":"Pacific/Honolulu","-570,0":"Pacific/Marquesas","-540,0":"Pacific/Gambier","-540,1":"America/Anchorage","-480,1":"America/Los_Angeles","-480,0":"Pacific/Pitcairn","-420,0":"America/Phoenix","-420,1":"America/Denver","-360,0":"America/Guatemala","-360,1":"America/Chicago","-360,1,s":"Pacific/Easter","-300,0":"America/Bogota","-300,1":"America/New_York","-270,0":"America/Caracas","-240,1":"America/Halifax","-240,0":"America/Santo_Domingo","-240,1,s":"America/Santiago","-210,1":"America/St_Johns","-180,1":"America/Godthab","-180,0":"America/Argentina/Buenos_Aires","-180,1,s":"America/Montevideo","-120,0":"Etc/GMT+2","-120,1":"Etc/GMT+2","-60,1":"Atlantic/Azores","-60,0":"Atlantic/Cape_Verde","0,0":"Etc/UTC","0,1":"Europe/London","60,1":"Europe/Berlin","60,0":"Africa/Lagos","60,1,s":"Africa/Windhoek","120,1":"Asia/Beirut","120,0":"Africa/Johannesburg","180,0":"Asia/Baghdad","180,1":"Europe/Moscow","210,1":"Asia/Tehran","240,0":"Asia/Dubai","240,1":"Asia/Baku","270,0":"Asia/Kabul","300,1":"Asia/Yekaterinburg","300,0":"Asia/Karachi","330,0":"Asia/Kolkata","345,0":"Asia/Kathmandu","360,0":"Asia/Dhaka","360,1":"Asia/Omsk","390,0":"Asia/Rangoon","420,1":"Asia/Krasnoyarsk","420,0":"Asia/Jakarta","480,0":"Asia/Shanghai","480,1":"Asia/Irkutsk","525,0":"Australia/Eucla","525,1,s":"Australia/Eucla","540,1":"Asia/Yakutsk","540,0":"Asia/Tokyo","570,0":"Australia/Darwin","570,1,s":"Australia/Adelaide","600,0":"Australia/Brisbane","600,1":"Asia/Vladivostok","600,1,s":"Australia/Sydney","630,1,s":"Australia/Lord_Howe","660,1":"Asia/Kamchatka","660,0":"Pacific/Noumea","690,0":"Pacific/Norfolk","720,1,s":"Pacific/Auckland","720,0":"Pacific/Tarawa","765,1,s":"Pacific/Chatham","780,0":"Pacific/Tongatapu","780,1,s":"Pacific/Apia","840,0":"Pacific/Kiritimati"},t.olson.dst_start_dates=function(){"use strict";var e=new Date(2010,6,15,1,0,0,0);return{"America/Denver":new Date(2011,2,13,3,0,0,0),"America/Mazatlan":new Date(2011,3,3,3,0,0,0),"America/Chicago":new Date(2011,2,13,3,0,0,0),"America/Mexico_City":new Date(2011,3,3,3,0,0,0),"America/Asuncion":new Date(2012,9,7,3,0,0,0),"America/Santiago":new Date(2012,9,3,3,0,0,0),"America/Campo_Grande":new Date(2012,9,21,5,0,0,0),"America/Montevideo":new Date(2011,9,2,3,0,0,0),"America/Sao_Paulo":new Date(2011,9,16,5,0,0,0),"America/Los_Angeles":new Date(2011,2,13,8,0,0,0),"America/Santa_Isabel":new Date(2011,3,5,8,0,0,0),"America/Havana":new Date(2012,2,10,2,0,0,0),"America/New_York":new Date(2012,2,10,7,0,0,0),"Asia/Beirut":new Date(2011,2,27,1,0,0,0),"Europe/Helsinki":new Date(2011,2,27,4,0,0,0),"Europe/Istanbul":new Date(2011,2,28,5,0,0,0),"Asia/Damascus":new Date(2011,3,1,2,0,0,0),"Asia/Jerusalem":new Date(2011,3,1,6,0,0,0),"Asia/Gaza":new Date(2009,2,28,0,30,0,0),"Africa/Cairo":new Date(2009,3,25,0,30,0,0),"Pacific/Auckland":new Date(2011,8,26,7,0,0,0),"Pacific/Fiji":new Date(2010,11,29,23,0,0,0),"America/Halifax":new Date(2011,2,13,6,0,0,0),"America/Goose_Bay":new Date(2011,2,13,2,1,0,0),"America/Miquelon":new Date(2011,2,13,5,0,0,0),"America/Godthab":new Date(2011,2,27,1,0,0,0),"Europe/Moscow":e,"Asia/Yekaterinburg":e,"Asia/Omsk":e,"Asia/Krasnoyarsk":e,"Asia/Irkutsk":e,"Asia/Yakutsk":e,"Asia/Vladivostok":e,"Asia/Kamchatka":e,"Europe/Minsk":e,"Australia/Perth":new Date(2008,10,1,1,0,0,0)}}(),t.olson.ambiguity_list={"America/Denver":["America/Denver","America/Mazatlan"],"America/Chicago":["America/Chicago","America/Mexico_City"],"America/Santiago":["America/Santiago","America/Asuncion","America/Campo_Grande"],"America/Montevideo":["America/Montevideo","America/Sao_Paulo"],"Asia/Beirut":["Asia/Beirut","Europe/Helsinki","Europe/Istanbul","Asia/Damascus","Asia/Jerusalem","Asia/Gaza"],"Pacific/Auckland":["Pacific/Auckland","Pacific/Fiji"],"America/Los_Angeles":["America/Los_Angeles","America/Santa_Isabel"],"America/New_York":["America/Havana","America/New_York"],"America/Halifax":["America/Goose_Bay","America/Halifax"],"America/Godthab":["America/Miquelon","America/Godthab"],"Asia/Dubai":["Europe/Moscow"],"Asia/Dhaka":["Asia/Yekaterinburg"],"Asia/Jakarta":["Asia/Omsk"],"Asia/Shanghai":["Asia/Krasnoyarsk","Australia/Perth"],"Asia/Tokyo":["Asia/Irkutsk"],"Australia/Brisbane":["Asia/Yakutsk"],"Pacific/Noumea":["Asia/Vladivostok"],"Pacific/Tarawa":["Asia/Kamchatka"],"Africa/Johannesburg":["Asia/Gaza","Africa/Cairo"],"Asia/Baghdad":["Europe/Minsk"]},typeof exports!="undefined"?exports.jstz=t:e.jstz=t})(this);
\ No newline at end of file

From b78c2c9f09ba1aa096abaf89f1826f177f016b99 Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Fri, 17 Aug 2018 18:13:27 +0800
Subject: [PATCH 3/7] fix risk

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

diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsAMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsAMapper.java
index 46f817c70..b62a39eca 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsAMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsAMapper.java
@@ -1,5 +1,6 @@
 package au.com.royalpay.payment.manage.mappers.risk;
 
+import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect;
 import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
 import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
 import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
@@ -26,6 +27,7 @@ public interface RiskAttentionMerchantsAMapper {
     JSONObject findByClientMoniker(@Param("client_moniker") String client_moniker);
 
     @AutoSql(type = SqlType.SELECT)
+    @AdvanceSelect(addonWhereClause = "is_valid=1")
     PageList<JSONObject> query(JSONObject params, PageBounds pagination);
 
 }

From 40f3e9368ac770e915acbbfa297a6d7e8e3955ef Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Mon, 20 Aug 2018 10:12:41 +0800
Subject: [PATCH 4/7] =?UTF-8?q?[Y]=20=E9=A3=8E=E6=8E=A7=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...java => RiskAttentionMerchantsMapper.java} | 15 ++-
 .../core/impls/ClientManagerImpl.java         | 59 +++++++++---
 .../manage/risk/core/RiskMerchantService.java | 20 ++--
 .../core/impl/RiskMerchantServiceImpl.java    | 95 +++++++++++--------
 .../manage/risk/web/RiskController.java       | 34 +++----
 .../risk/templates/attention_merchants.html   | 16 +++-
 6 files changed, 155 insertions(+), 84 deletions(-)
 rename src/main/java/au/com/royalpay/payment/manage/mappers/risk/{RiskAttentionMerchantsAMapper.java => RiskAttentionMerchantsMapper.java} (62%)

diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsAMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsMapper.java
similarity index 62%
rename from src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsAMapper.java
rename to src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsMapper.java
index b62a39eca..c3a578914 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsAMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsMapper.java
@@ -8,12 +8,15 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * Create by yixian at 2017-12-21 11:45
  */
 @AutoMapper(tablename = "risk_attention_merchants", pkName = "client_id")
-public interface RiskAttentionMerchantsAMapper {
+public interface RiskAttentionMerchantsMapper {
     @AutoSql(type = SqlType.UPDATE)
     void update(JSONObject client);
 
@@ -24,10 +27,18 @@ public interface RiskAttentionMerchantsAMapper {
     JSONObject findById(@Param("id") String id);
 
     @AutoSql(type = SqlType.SELECT)
-    JSONObject findByClientMoniker(@Param("client_moniker") String client_moniker);
+    JSONObject findByClientMoniker(@Param("client_moniker") String clientMoniker);
 
     @AutoSql(type = SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "is_valid=1")
     PageList<JSONObject> query(JSONObject params, PageBounds pagination);
 
+    @Select("SELECT client_moniker FROM risk_attention_merchants " +
+            "WHERE (abn LIKE CONCAT('%',#{abn},'%') ) OR (acn LIKE CONCAT('%',#{acn},'%') ) " +
+            "   OR (contact_phone LIKE CONCAT('%',#{contact_phone},'%') ) " +
+            "   OR (contact_person LIKE CONCAT('%',#{contact_person},'%') ) " +
+            "   OR (client_moniker LIKE CONCAT('%',#{client_moniker},'%') ) " +
+            "   OR (bank_account_no LIKE CONCAT('%',#{bank_account_no},'%') ) ")
+    List<JSONObject> listRiskySimilarMerchants(JSONObject params);
+
 }
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 36683e2a7..194943788 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
@@ -18,6 +18,7 @@ import au.com.royalpay.payment.manage.mappers.financial.FinancialBDConfigMapper;
 import au.com.royalpay.payment.manage.mappers.log.*;
 import au.com.royalpay.payment.manage.mappers.payment.TransactionMapper;
 import au.com.royalpay.payment.manage.mappers.redpack.ActClientInvitationCodeMapper;
+import au.com.royalpay.payment.manage.mappers.risk.RiskAttentionMerchantsMapper;
 import au.com.royalpay.payment.manage.mappers.system.*;
 import au.com.royalpay.payment.manage.merchants.beans.ActivityPosterBuilder;
 import au.com.royalpay.payment.manage.merchants.beans.BankAccountInfo;
@@ -271,7 +272,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     private PermissionClientModuleMapper permissionClientModuleMapper;
     @Resource
     private PermissionPartnerManagerImpl permissionPartnerManagerImpl;
-
+    @Resource
+    private RiskAttentionMerchantsMapper riskAttentionMerchantsMapper;
 
 
     private static final String SOURCE_AGREE_FILE = "source_agree_file";
@@ -563,6 +565,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         if (clientMapper.findClientByMoniker(registery.getClientMoniker()) != null) {
             throw new BadRequestException("error.partner.valid.dumplicate_client_moniker");
         }
+        //检查商户是否进入系统黑名单
+        isRiskyMerchant(partner, null);
+
         try {
 
             clientMapper.save(partner);
@@ -787,6 +792,10 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         if (client == null) {
             throw new InvalidShortIdException();
         }
+        //检查商户是否进入平台黑名单
+        int clientId = client.getIntValue("client_id");
+        isRiskyMerchant(client, clientBankAccountMapper.clientBankAccounts(clientId).get(0));
+
         if (client.getString("sub_merchant_id") == null || client.getString("sub_merchant_id").equals("")) {
             throw new BadRequestException("该商户未设置微信 Sub Merchant ID!");
         }
@@ -829,6 +838,10 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         if (client == null) {
             throw new InvalidShortIdException();
         }
+        //检查商户是否进入平台黑名单
+        int clientId = client.getIntValue("client_id");
+        isRiskyMerchant(client, clientBankAccountMapper.clientBankAccounts(clientId).get(0));
+
         client.put("approve_result", 2);
         client.put("approver", manager.getString("manager_id"));
         client.put("approve_time", new Date());
@@ -3702,10 +3715,10 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             throw new InvalidShortIdException();
         }
         checkOrgPermission(manager, client);
-       JSONObject sub =  mailUnsubMapper.findOneByClientMoniker(client_moniker);
-       if(sub == null){
-           throw new BadRequestException();
-       }
+        JSONObject sub = mailUnsubMapper.findOneByClientMoniker(client_moniker);
+        if (sub == null) {
+            throw new BadRequestException();
+        }
         mailService.removeUnsub(sub.getLong("id"));
     }
 
@@ -3717,13 +3730,13 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         }
         checkOrgPermission(manager, client);
 
-        if(allow){
-            if(StringUtils.isEmpty(client.getString("hf_pay_url"))){
+        if (allow) {
+            if (StringUtils.isEmpty(client.getString("hf_pay_url"))) {
                 String hf_pay_url = getShortLink(clientMoniker);
-                client.put("hf_pay_url",hf_pay_url);
+                client.put("hf_pay_url", hf_pay_url);
                 JSONObject clientConfig = new JSONObject();
-                clientConfig.put("hf_pay_url",hf_pay_url);
-                clientConfig.put("client_id",client.getIntValue("client_id"));
+                clientConfig.put("hf_pay_url", hf_pay_url);
+                clientConfig.put("client_id", client.getIntValue("client_id"));
                 clientConfigMapper.update(clientConfig);
                 clientMapper.update(client);
             }
@@ -3734,9 +3747,31 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     }
 
     @Override
-    public String getShortLink(String client_moniker){
-        String longUrl = PlatformEnvironment.getEnv().concatUrl("/api/v1.0/hf_gateway/partners/"+client_moniker+"/jump");
+    public String getShortLink(String clientMoniker) {
+        String longUrl = PlatformEnvironment.getEnv().concatUrl("/api/v1.0/hf_gateway/partners/" + clientMoniker + "/jump");
         MpWechatApi api = mpWechatApiProvider.getNewPaymentApi();
         return api.registerShortUrl(longUrl);
     }
+
+
+    private void isRiskyMerchant(JSONObject client, JSONObject bankAccount) {
+        JSONObject needCheckParams = new JSONObject();
+        needCheckParams.put("client_moniker", client.getString("client_moniker"));
+        needCheckParams.put("abn", client.getString("abn"));
+        needCheckParams.put("acn", client.getString("acn"));
+        needCheckParams.put("contact_phone", client.getString("contact_phone"));
+        needCheckParams.put("contact_person", client.getString("contact_person"));
+        if (bankAccount != null) {
+            needCheckParams.put("bank_account_no", bankAccount.getString("account_no"));
+        }
+        List<JSONObject> listRiskySimilarMerchants = riskAttentionMerchantsMapper.listRiskySimilarMerchants(needCheckParams);
+        if (listRiskySimilarMerchants.size() > 0) {
+            StringBuilder appendStr = new StringBuilder();
+            listRiskySimilarMerchants.forEach(json -> appendStr.append(json.getString("client_moniker")).append(","));
+            appendStr.deleteCharAt(appendStr.length() - 1);
+            throw new BadRequestException("该商户信息已经进入系统黑名单，关联商户为【" + appendStr + "】");
+        }
+
+    }
+
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/risk/core/RiskMerchantService.java b/src/main/java/au/com/royalpay/payment/manage/risk/core/RiskMerchantService.java
index 895c501ec..1dd99cf10 100644
--- a/src/main/java/au/com/royalpay/payment/manage/risk/core/RiskMerchantService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/risk/core/RiskMerchantService.java
@@ -8,29 +8,29 @@ public interface RiskMerchantService {
 
     void addDetailLog(AddRiskDetailLog addRiskDetailLog, JSONObject account);
 
-    void DropOrderRiskRecord(JSONObject account,String recordId);
+    void dropOrderRiskRecord(JSONObject account, String recordId);
 
-    void noopRiskRecord(JSONObject account,String recordId);
+    void noopRiskRecord(JSONObject account, String recordId);
 
-    void dealRiskRecord(JSONObject account,DealRiskRecord dealRiskRecord);
+    void dealRiskRecord(JSONObject account, DealRiskRecord dealRiskRecord);
 
-    void dealRiskRecordDirectly(JSONObject account,String record_id);
+    void dealRiskRecordDirectly(JSONObject account, String clientMoniker);
 
     JSONObject getRiskOrders(QueryRiskOrder queryRiskOrder);
 
     JSONObject getRiskRecords(QueryRiskRecord queryRiskRecord);
 
-    void addWhiteList(String client_moinker);
+    void addWhiteList(String clientMoniker);
 
-    void disableWhiteList(String client_moinker);
+    void disableWhiteList(String clientMoniker);
 
-    JSONObject getRecordById(String record_id);
+    JSONObject getRecordById(String recordId);
 
     JSONObject getRiskDetails(QueryRiskDetail queryRiskDetail);
 
-    JSONObject listAttentionMerchants(JSONObject account,QueryAttentionMerchants queryAttention);
+    JSONObject listAttentionMerchants(JSONObject manager, QueryAttentionMerchants queryAttention);
 
-    void addAttentionMerchants(JSONObject account,String client_moniker);
+    void addAttentionMerchant(JSONObject manager, String clientMoniker);
 
-    void updateAttentionMerchants(JSONObject account,String client_moniker);
+    void disableAttentionMerchant(JSONObject manager, String clientMoniker);
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/risk/core/impl/RiskMerchantServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/risk/core/impl/RiskMerchantServiceImpl.java
index 0d9b3fdec..09188ab9f 100644
--- a/src/main/java/au/com/royalpay/payment/manage/risk/core/impl/RiskMerchantServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/risk/core/impl/RiskMerchantServiceImpl.java
@@ -1,6 +1,7 @@
 package au.com.royalpay.payment.manage.risk.core.impl;
 
 import au.com.royalpay.payment.manage.mappers.risk.*;
+import au.com.royalpay.payment.manage.mappers.system.ClientBankAccountMapper;
 import au.com.royalpay.payment.manage.merchants.core.ClientManager;
 import au.com.royalpay.payment.manage.risk.bean.*;
 import au.com.royalpay.payment.manage.risk.core.RiskMerchantService;
@@ -17,6 +18,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
+import java.util.List;
 
 import javax.annotation.Resource;
 
@@ -34,7 +36,9 @@ public class RiskMerchantServiceImpl implements RiskMerchantService {
     @Resource
     private ClientManager clientManager;
     @Resource
-    private RiskAttentionMerchantsAMapper riskAttentionMerchantsAMapper;
+    private RiskAttentionMerchantsMapper riskAttentionMerchantsAMapper;
+    @Resource
+    private ClientBankAccountMapper clientBankAccountMapper;
 
     @Override
     @Transactional
@@ -55,7 +59,7 @@ public class RiskMerchantServiceImpl implements RiskMerchantService {
 
     @Override
     @Transactional
-    public void DropOrderRiskRecord(JSONObject account, String recordId) {
+    public void dropOrderRiskRecord(JSONObject account, String recordId) {
         JSONObject riskRecord = riskMerchantRecordMapper.findById(recordId);
         if (riskRecord == null) {
             throw new NotFoundException("Risk Record Not Found");
@@ -170,14 +174,14 @@ public class RiskMerchantServiceImpl implements RiskMerchantService {
     }
 
     @Override
-    public void addWhiteList(String client_moinker) {
-        JSONObject white = riskWhiteListMapper.findByClientMoniker(client_moinker);
+    public void addWhiteList(String clientMoniker) {
+        JSONObject white = riskWhiteListMapper.findByClientMoniker(clientMoniker);
         if (white != null) {
             white.put("is_valid", true);
             riskWhiteListMapper.update(white);
             return;
         }
-        JSONObject client = clientManager.getClientInfoByMoniker(client_moinker);
+        JSONObject client = clientManager.getClientInfoByMoniker(clientMoniker);
         if (client == null) {
             throw new NotFoundException("Merchant Not Found Please Check");
         }
@@ -189,8 +193,8 @@ public class RiskMerchantServiceImpl implements RiskMerchantService {
     }
 
     @Override
-    public void disableWhiteList(String client_moinker) {
-        JSONObject white = riskWhiteListMapper.findByClientMoniker(client_moinker);
+    public void disableWhiteList(String clientMoniker) {
+        JSONObject white = riskWhiteListMapper.findByClientMoniker(clientMoniker);
         if (white == null) {
             throw new NotFoundException("White List Not Found Please Check");
         }
@@ -199,8 +203,8 @@ public class RiskMerchantServiceImpl implements RiskMerchantService {
     }
 
     @Override
-    public JSONObject getRecordById(String record_id) {
-        return riskMerchantRecordMapper.findById(record_id);
+    public JSONObject getRecordById(String recordId) {
+        return riskMerchantRecordMapper.findById(recordId);
     }
 
     @Override
@@ -211,53 +215,64 @@ public class RiskMerchantServiceImpl implements RiskMerchantService {
     }
 
     @Override
-    public JSONObject listAttentionMerchants(JSONObject account, QueryAttentionMerchants queryAttention) {
-        if (account == null) {
-            throw new BadRequestException("account not exists");
+    public JSONObject listAttentionMerchants(JSONObject manager, QueryAttentionMerchants queryAttention) {
+        if (manager == null) {
+            throw new BadRequestException("登录状态已过期，请清新登录再试");
         }
         return PageListUtils.buildPageListResult(
-                riskAttentionMerchantsAMapper.query(queryAttention.toParams(), new PageBounds(queryAttention.getPage(), queryAttention.getLimit(), Order.formString("create_time.desc"))));
+                riskAttentionMerchantsAMapper.query(queryAttention.toParams(), new PageBounds(queryAttention.getPage(), queryAttention.getLimit(), Order.formString("last_update_date.desc"))));
     }
 
     @Override
-    public void addAttentionMerchants(JSONObject account, String client_moniker) {
-        if (account == null) {
-            throw new BadRequestException("account not exists");
+    public void addAttentionMerchant(JSONObject manager, String clientMoniker) {
+        if (manager == null) {
+            throw new BadRequestException("登录状态已过期，请清新登录再试");
+        }
+        JSONObject client = clientManager.getClientInfoByMoniker(clientMoniker);
+        if (client == null) {
+            throw new BadRequestException("The Merchant does not exist");
         }
-        JSONObject attentionMerchant = riskAttentionMerchantsAMapper.findByClientMoniker(client_moniker);
-        if(attentionMerchant != null){
-            if(attentionMerchant.getBoolean("is_valid")){
+        int clientId = client.getIntValue("client_id");
+        List<JSONObject> bankAccount = clientBankAccountMapper.clientBankAccounts(clientId);
+        JSONObject attention = new JSONObject();
+        attention.put("client_id", clientId);
+        attention.put("client_moniker", clientMoniker);
+        attention.put("abn", client.getString("abn"));
+        attention.put("acn", client.getString("acn"));
+        attention.put("contact_person", client.getString("contact_person"));
+        attention.put("contact_phone", client.getString("contact_phone"));
+        attention.put("bank_account_no", bankAccount == null || bankAccount.size() <= 0 ? "" : bankAccount.get(0).getString("account_no"));
+        attention.put("is_valid", 1);
+        attention.put("creation_date", new Date());
+        attention.put("creation_by", manager.getString("manager_id"));
+        attention.put("last_update_date", new Date());
+        attention.put("last_update_by", manager.getString("manager_id"));
+
+        JSONObject attentionMerchant = riskAttentionMerchantsAMapper.findByClientMoniker(clientMoniker);
+        if (attentionMerchant != null) {
+            if (attentionMerchant.getBoolean("is_valid")) {
                 throw new BadRequestException("The client has already existed");
-            }else {
-                attentionMerchant.put("is_valid",1);
-                attentionMerchant.put("update_time",new Date());
-                riskAttentionMerchantsAMapper.update(attentionMerchant);
-                return;
             }
+            attention.remove("creation_date");
+            attention.remove("creation_by");
+            riskAttentionMerchantsAMapper.update(attention);
+            return;
         }
-        JSONObject client = clientManager.getClientInfoByMoniker(client_moniker);
-        if(client == null){
-            throw new BadRequestException("The client does not exist");
-        }
-        JSONObject attention = new JSONObject();
-        attention.put("client_id",client.getIntValue("client_id"));
-        attention.put("client_moniker",client.getString("client_moniker"));
-        attention.put("is_valid",1);
-        attention.put("create_time",new Date());
         riskAttentionMerchantsAMapper.save(attention);
     }
 
     @Override
-    public void updateAttentionMerchants(JSONObject account, String client_moniker) {
-        if (account == null) {
-            throw new BadRequestException("account not exists");
+    public void disableAttentionMerchant(JSONObject manager, String clientMoniker) {
+        if (manager == null) {
+            throw new BadRequestException("登录状态已过期，请清新登录再试");
         }
-        JSONObject attentionMerchant = riskAttentionMerchantsAMapper.findByClientMoniker(client_moniker);
-        if(attentionMerchant == null){
+        JSONObject attentionMerchant = riskAttentionMerchantsAMapper.findByClientMoniker(clientMoniker);
+        if (attentionMerchant == null) {
             throw new BadRequestException("The client does not exist");
         }
-        attentionMerchant.put("is_valid",0);
-        attentionMerchant.put("update_time",new Date());
+        attentionMerchant.put("is_valid", 0);
+        attentionMerchant.put("last_update_date", new Date());
+        attentionMerchant.put("last_update_by", manager.getString("manager_id"));
         riskAttentionMerchantsAMapper.update(attentionMerchant);
     }
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/risk/web/RiskController.java b/src/main/java/au/com/royalpay/payment/manage/risk/web/RiskController.java
index 651345395..ad01d7546 100644
--- a/src/main/java/au/com/royalpay/payment/manage/risk/web/RiskController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/risk/web/RiskController.java
@@ -39,7 +39,7 @@ public class RiskController {
 
     @RequestMapping(value = "/records/{record_id}/dropOrder", method = RequestMethod.PUT)
     public void dropOrder(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @PathVariable String record_id) {
-        riskMerchantService.DropOrderRiskRecord(manager, record_id);
+        riskMerchantService.dropOrderRiskRecord(manager, record_id);
     }
 
     @RequestMapping(value = "/records/{record_id}/noop", method = RequestMethod.PUT)
@@ -65,14 +65,14 @@ public class RiskController {
 
     }
 
-    @RequestMapping(value = "/white/{client_moniker}", method = RequestMethod.POST)
-    public void addWhiteList(@PathVariable String client_moniker) {
-        riskMerchantService.addWhiteList(client_moniker);
+    @RequestMapping(value = "/white/{clientMoniker}", method = RequestMethod.POST)
+    public void addWhiteList(@PathVariable String clientMoniker) {
+        riskMerchantService.addWhiteList(clientMoniker);
     }
 
-    @RequestMapping(value = "/white/{client_moniker}/disable", method = RequestMethod.PUT)
-    public void disableWhiteList(@PathVariable String client_moniker) {
-        riskMerchantService.disableWhiteList(client_moniker);
+    @RequestMapping(value = "/white/{clientMoniker}/disable", method = RequestMethod.PUT)
+    public void disableWhiteList(@PathVariable String clientMoniker) {
+        riskMerchantService.disableWhiteList(clientMoniker);
     }
 
     @RequestMapping(value = "/records/uploadFiles", method = RequestMethod.POST)
@@ -86,22 +86,22 @@ public class RiskController {
     }
 
     @RequestMapping(value = "/details/remark", method = RequestMethod.POST)
-    public void addDetailRemark(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager,@RequestBody AddRiskDetailLog addRiskDetailLog ) {
-        riskMerchantService.addDetailLog(addRiskDetailLog,manager);
+    public void addDetailRemark(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @RequestBody AddRiskDetailLog addRiskDetailLog) {
+        riskMerchantService.addDetailLog(addRiskDetailLog, manager);
     }
 
     @RequestMapping(value = "/attention", method = RequestMethod.GET)
-    public JSONObject listMerchants(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager,QueryAttentionMerchants queryAttention ) {
-        return riskMerchantService.listAttentionMerchants(manager,queryAttention);
+    public JSONObject listMerchant(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, QueryAttentionMerchants queryAttention) {
+        return riskMerchantService.listAttentionMerchants(manager, queryAttention);
     }
 
-    @RequestMapping(value = "/attention/{client_moniker}", method = RequestMethod.POST)
-    public void addMerchants(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager,@PathVariable String client_moniker) {
-        riskMerchantService.addAttentionMerchants(manager,client_moniker);
+    @RequestMapping(value = "/attention/{clientMoniker}", method = RequestMethod.POST)
+    public void addMerchant(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @PathVariable String clientMoniker) {
+        riskMerchantService.addAttentionMerchant(manager, clientMoniker);
     }
 
-    @RequestMapping(value = "/attention/{client_moniker}", method = RequestMethod.PUT)
-    public void updateMerchants(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager,@PathVariable String client_moniker) {
-        riskMerchantService.updateAttentionMerchants(manager,client_moniker);
+    @RequestMapping(value = "/attention/{clientMoniker}", method = RequestMethod.PUT)
+    public void disableRiskMerchant(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @PathVariable String clientMoniker) {
+        riskMerchantService.disableAttentionMerchant(manager, clientMoniker);
     }
 }
diff --git a/src/main/ui/static/risk/templates/attention_merchants.html b/src/main/ui/static/risk/templates/attention_merchants.html
index 1276a42c7..3a89d9773 100644
--- a/src/main/ui/static/risk/templates/attention_merchants.html
+++ b/src/main/ui/static/risk/templates/attention_merchants.html
@@ -48,15 +48,25 @@
                 <table class="table table-hover">
                     <thead>
                     <tr>
-                        <th>Client Moniker</th>
-                        <th>Create Time</th>
+                        <th>Merchant Code</th>
+                        <th>ABN</th>
+                        <th>ACN</th>
+                        <th>Account No</th>
+                        <th>Contact Person</th>
+                        <th>Contact Phone</th>
+                        <th>Operation Time</th>
                         <th>Operation</th>
                     </tr>
                     </thead>
                     <tbody>
                     <tr ng-repeat="client in attentions">
                         <td>{{client.client_moniker}}</td>
-                        <td>{{client.create_time}}</td>
+                        <td>{{client.abn}}</td>
+                        <td>{{client.acn}}</td>
+                        <td>{{client.bank_account_no}}</td>
+                        <td>{{client.contact_person}}</td>
+                        <td>{{client.contact_phone}}</td>
+                        <td>{{client.last_update_date}}</td>
                         <td>
                             <a role="button" class="text-bold text-danger"
                                ng-click="disableAttention(client.client_moniker)">Disable</a>

From ac75df6ead66ea64abc3c0f0220c0641082c2186 Mon Sep 17 00:00:00 2001
From: yixian <astro.dai@royalpay.com.au>
Date: Mon, 20 Aug 2018 10:36:07 +0800
Subject: [PATCH 5/7] apply interceptor

---
 .../clearing/core/impl/CleanServiceImpl.java  |  8 +-
 .../manage/support/abafile/ABAFile.java       |  6 ++
 .../templates/mail/settlement_mail.html       | 39 ++++----
 .../manage/process/alipay/FixAlipayData.java  | 94 +++++++++++++++++++
 .../process/custom/ManualReportCustom.java    | 54 +++++++++++
 5 files changed, 182 insertions(+), 19 deletions(-)
 create mode 100644 src/test/java/au/com/royalpay/payment/manage/process/alipay/FixAlipayData.java
 create mode 100644 src/test/java/au/com/royalpay/payment/manage/process/custom/ManualReportCustom.java

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 745a34693..b419e9a95 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
@@ -943,9 +943,6 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
             model.put("date", DateFormatUtils.format(date, "dd-MM-yyyy"));
             // todo themeleaf
 
-            Context ctx = new Context();
-            ctx.setVariable("date", DateFormatUtils.format(date, "dd-MM-yyyy"));
-            final String content = thymeleaf.process("mail/settlement_mail", ctx);
 
             // final String content = VelocityEngineUtils.mergeTemplateIntoString(velocityEngine,
             // "mail/settlement_mail.vm", "utf-8", model);
@@ -984,6 +981,11 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
             }
             attach2.put("name", fileName2);
             attachList.add(attach2);
+
+            Context ctx = new Context();
+            ctx.setVariable("date", DateFormatUtils.format(date, "dd-MM-yyyy"));
+            ctx.setVariable("abaFiles", abaFileList);
+            final String content = thymeleaf.process("mail/settlement_mail", ctx);
             // 测试用地址
             // String mailId = mailService.sendEmail(title, "164851225@qq.com", "1029811920@qq.com", content,
             // attachList);
diff --git a/src/main/java/au/com/royalpay/payment/manage/support/abafile/ABAFile.java b/src/main/java/au/com/royalpay/payment/manage/support/abafile/ABAFile.java
index 7c55303b1..b0be420c8 100644
--- a/src/main/java/au/com/royalpay/payment/manage/support/abafile/ABAFile.java
+++ b/src/main/java/au/com/royalpay/payment/manage/support/abafile/ABAFile.java
@@ -9,6 +9,7 @@ import org.springframework.util.Assert;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -56,6 +57,11 @@ public class ABAFile {
         return out.toString().getBytes();
     }
 
+    public String getTotalSettleAmountStr() {
+        DecimalFormat format = new DecimalFormat("#.##0.00");
+        return format.format(totalSettleAmount);
+    }
+
     private String generateFinalLine() {
         StringBuilder lineBuilder = new StringBuilder(baseLine);
         lineBuilder.replace(0, 1, "7");
diff --git a/src/main/resources/templates/mail/settlement_mail.html b/src/main/resources/templates/mail/settlement_mail.html
index 2646fe311..5ed1b6648 100644
--- a/src/main/resources/templates/mail/settlement_mail.html
+++ b/src/main/resources/templates/mail/settlement_mail.html
@@ -1,22 +1,29 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org" lang="zh">
 <div style="color: #000000">
-        <p>Dear Flexewallet,</p>
-        <br>
-        <br>
-        <p>Please find the attached settlement files data up to <span th:text="${date}"></span></p>
-        <br>
-        <br>
-        <p>Best Regards,</p>
-        <p style="border-bottom: 45px; font-weight: 900;">RoyalPay Finance team</p>
-        <p style="margin: initial;">Tunnel Show Pty Ltd trading as RoyalPay</p>
-        <p style="margin: initial;">Representative of AFS Licensee 448066</p>
-        <p style="margin: initial;">------------------------------</p>
-        <p style="margin: initial;">Lv.11,15 William Street， Melbourne 3000 </p>
-        <p style="margin: initial;">Lv.14, 383 Kent Street, Sydney, NSW 2000 </p>
-        <p style="margin: initial;">P: 1300 1077 50</p>
-        <p style="margin: initial;">E: settlement@royalpay.com.au</p>
-        <p style="margin: initial;">www.royalpay.com.au</p>
+    <p>Dear Flexewallet,</p>
+    <br>
+    <br>
+    <p>Please find the attached settlement files data up to <span th:text="${date}"></span></p>
+    <p></p>
+    <p>File Validation:</p>
+    <p>
+    <ul>
+        <li th:each="aba : ${abaList}">${aba.filename()} : ${aba.getTotalSettleAmountStr()}</li>
+    </ul>
+    </p>
+    <br>
+    <br>
+    <p>Best Regards,</p>
+    <p style="border-bottom: 45px; font-weight: 900;">RoyalPay Finance team</p>
+    <p style="margin: initial;">Tunnel Show Pty Ltd trading as RoyalPay</p>
+    <p style="margin: initial;">Representative of AFS Licensee 448066</p>
+    <p style="margin: initial;">------------------------------</p>
+    <p style="margin: initial;">Lv.11,15 William Street， Melbourne 3000 </p>
+    <p style="margin: initial;">Lv.14, 383 Kent Street, Sydney, NSW 2000 </p>
+    <p style="margin: initial;">P: 1300 1077 50</p>
+    <p style="margin: initial;">E: settlement@royalpay.com.au</p>
+    <p style="margin: initial;">www.royalpay.com.au</p>
 </div>
 </html>
 
diff --git a/src/test/java/au/com/royalpay/payment/manage/process/alipay/FixAlipayData.java b/src/test/java/au/com/royalpay/payment/manage/process/alipay/FixAlipayData.java
new file mode 100644
index 000000000..e223a5c45
--- /dev/null
+++ b/src/test/java/au/com/royalpay/payment/manage/process/alipay/FixAlipayData.java
@@ -0,0 +1,94 @@
+package au.com.royalpay.payment.manage.process.alipay;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
+import org.apache.poi.ss.usermodel.*;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import javax.annotation.Resource;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * Create by yixian at 2018-08-14 21:41
+ */
+@SpringBootTest
+@ActiveProfiles({"proxy"})
+@RunWith(SpringRunner.class)
+public class FixAlipayData {
+    @Resource
+    private JdbcTemplate jdbcTemplate;
+    private String fileLocation = "C:\\Users\\yixian\\Documents\\royalpay\\2018\\alipayfix\\2088721525235246_20180815110000000032102003900557154_result - 副本.xls";
+    private String fileTarget = "C:\\Users\\yixian\\Documents\\royalpay\\2018\\alipayfix\\fixed_2088721525235246_20180815110000000032102003900557154_result.xls";
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Test
+    public void fix() throws IOException, InvalidFormatException {
+        Workbook wb = WorkbookFactory.create(new File(fileLocation));
+        Sheet sheet = wb.getSheetAt(0);
+        final int startRow = 6;
+        int rowNum = startRow;
+        String compName;
+        while ((compName = mchCompName(sheet, rowNum)) != null) {
+            logger.info("row:" + rowNum + ",company name=" + compName);
+            final String corpName = compName;
+            Row row = sheet.getRow(rowNum++);
+            String shortName = row.getCell(2).getStringCellValue();
+            List<Map<String, Object>> clients = jdbcTemplate.queryForList("select c.company_name,c.short_name,c.ali_sub_merchant_id,c.alipayindustry,c.country,c.address,c.state,l.latitude,l.longitude from sys_clients c" +
+                    " left join sys_clients_locations l on l.client_id=c.client_id where c.short_name=?", shortName);
+            if (clients.isEmpty()) {
+                clients = jdbcTemplate.queryForList("select c.company_name,c.short_name,c.ali_sub_merchant_id,c.alipayindustry,c.country,c.address,c.state,l.latitude,l.longitude from sys_clients c" +
+                        " left join sys_clients_locations l on l.client_id=c.client_id where c.company_name=?", corpName);
+                if (clients.isEmpty()) {
+                    continue;
+                }
+            }
+            Optional<Map<String, Object>> cliOpts = clients.stream()
+                    .filter(cli -> new JSONObject(cli).getString("company_name").equals(corpName))
+                    .findFirst();
+            JSONObject client = new JSONObject(cliOpts.isPresent() ? cliOpts.get() : clients.get(0));
+
+            String moniker = client.getString("ali_sub_merchant_id");
+            logger.info("updating to xlsx:" + moniker);
+            row.getCell(4).setCellValue(moniker);
+            row.getCell(5).setCellValue(moniker);
+            String mcc = client.getString("alipayindustry");
+            row.getCell(7).setCellValue(StringUtils.isEmpty(mcc) ? "5311" : mcc);
+            row.getCell(8).setCellValue("Australia");
+            if (StringUtils.isNoneEmpty(client.getString("address"), client.getString("state"))) {
+                row.getCell(9).setCellValue(client.getString("address") + "," + client.getString("state"));
+            }
+            if (client.getString("latitude") != null) {
+                row.getCell(29).setCellValue(client.getBigDecimal("latitude").setScale(8, BigDecimal.ROUND_DOWN).toPlainString());
+                row.getCell(30).setCellValue(client.getBigDecimal("longitude").setScale(8, BigDecimal.ROUND_DOWN).toPlainString());
+            }
+            logger.info("finished update row:" + (rowNum - 1));
+        }
+        wb.write(new FileOutputStream(fileTarget));
+    }
+
+    private String mchCompName(Sheet sheet, int rowNum) {
+        Row row = sheet.getRow(rowNum);
+        if (row == null) {
+            return null;
+        }
+        Cell cell = row.getCell(1);
+        if (cell == null) {
+            return null;
+        }
+        return cell.getStringCellValue();
+    }
+}
diff --git a/src/test/java/au/com/royalpay/payment/manage/process/custom/ManualReportCustom.java b/src/test/java/au/com/royalpay/payment/manage/process/custom/ManualReportCustom.java
new file mode 100644
index 000000000..4e73e741f
--- /dev/null
+++ b/src/test/java/au/com/royalpay/payment/manage/process/custom/ManualReportCustom.java
@@ -0,0 +1,54 @@
+package au.com.royalpay.payment.manage.process.custom;
+
+import au.com.royalpay.payment.channels.alipay.runtime.impls.AlipayCustomDeclaringTaskProcessor;
+import au.com.royalpay.payment.core.mappers.PmtCustomReportsDetailMapper;
+import au.com.royalpay.payment.core.mappers.PmtCustomReportsMapper;
+import au.com.royalpay.payment.core.mappers.PmtOrderMapper;
+import au.com.royalpay.payment.manage.mappers.custom.CustomReportDetailsMapper;
+import au.com.royalpay.payment.manage.mappers.custom.CustomReportsMapper;
+import com.alibaba.fastjson.JSONObject;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * Create by yixian at 2018-08-14 20:28
+ */
+@SpringBootTest
+@ActiveProfiles({"proxy", "alipay"})
+@TestPropertySource(properties = {"spring.datasource.username=root", "spring.datasource.password=ZOIBhellor0yalpay"})
+@RunWith(SpringRunner.class)
+public class ManualReportCustom {
+
+    @Autowired
+    private AlipayCustomDeclaringTaskProcessor processor;
+    @Resource
+    private PmtCustomReportsMapper pmtCustomReportsMapper;
+    @Resource
+    private PmtOrderMapper pmtOrderMapper;
+    @Resource
+    private PmtCustomReportsDetailMapper pmtCustomReportsDetailMapper;
+
+    @Test
+    public void test() {
+        String reportId = "05482201808142036430702208";
+        List<JSONObject> customs = pmtCustomReportsMapper.findReport(reportId);
+        List<JSONObject> sub = pmtCustomReportsDetailMapper.listSubReports(reportId);
+        JSONObject order = pmtOrderMapper.find(reportId);
+
+        JSONObject task = new JSONObject();
+        task.put("channel", order.getString("channel"));
+        task.put("merchant_id", order.getString("merchant_id"));
+        task.put("sub_orders", sub);
+        task.put("report", customs.stream().filter(rep -> rep.getIntValue("report_status") == 2)
+                .findFirst().orElseThrow(() -> new RuntimeException("No Failure Reports")));
+        processor.process(task);
+    }
+}

From 829a05a328628a691d8095ea33dfe2e366f1212d Mon Sep 17 00:00:00 2001
From: yixian <astro.dai@royalpay.com.au>
Date: Mon, 20 Aug 2018 10:37:26 +0800
Subject: [PATCH 6/7] settlement mail content

---
 src/main/resources/templates/mail/settlement_mail.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/templates/mail/settlement_mail.html b/src/main/resources/templates/mail/settlement_mail.html
index 5ed1b6648..fc6850a69 100644
--- a/src/main/resources/templates/mail/settlement_mail.html
+++ b/src/main/resources/templates/mail/settlement_mail.html
@@ -9,7 +9,7 @@
     <p>File Validation:</p>
     <p>
     <ul>
-        <li th:each="aba : ${abaList}">${aba.filename()} : ${aba.getTotalSettleAmountStr()}</li>
+        <li th:each="aba : ${abaFiles}">${aba.filename()} : ${aba.getTotalSettleAmountStr()}</li>
     </ul>
     </p>
     <br>

From bb4d16bdba64e39dec995dbaee25d78453959563 Mon Sep 17 00:00:00 2001
From: yixian <astro.dai@royalpay.com.au>
Date: Mon, 20 Aug 2018 10:52:51 +0800
Subject: [PATCH 7/7] settlement mail content

---
 src/main/resources/templates/mail/settlement_mail.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/templates/mail/settlement_mail.html b/src/main/resources/templates/mail/settlement_mail.html
index fc6850a69..3eb798957 100644
--- a/src/main/resources/templates/mail/settlement_mail.html
+++ b/src/main/resources/templates/mail/settlement_mail.html
@@ -9,7 +9,7 @@
     <p>File Validation:</p>
     <p>
     <ul>
-        <li th:each="aba : ${abaFiles}">${aba.filename()} : ${aba.getTotalSettleAmountStr()}</li>
+        <li th:each="aba : ${abaFiles}" th:text="|${aba.filename()} : ${aba.getTotalSettleAmountStr()}|"></li>
     </ul>
     </p>
     <br>