From 700599435d8233e1a1c2198fff8f8c6dbe5555ed Mon Sep 17 00:00:00 2001
From: dulingling <dll19920503@qq.com>
Date: Wed, 5 Aug 2020 15:07:31 +0800
Subject: [PATCH 1/3] =?UTF-8?q?upd:=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=80=9A=E7=9F=A5=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=A2=9E=E5=8A=A0=EF=BC=9A=E5=8D=A1=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98/=E8=B7=A8=E5=A2=83=E6=94=AF=E4=BB=98=E5=95=86?=
 =?UTF-8?q?=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/mappers/system/ClientMapper.java       |  2 +-
 .../notice/core/impls/NoticeManageImpl.java       |  8 ++++----
 .../manage/mappers/system/ClientMapper.xml        | 10 +++++++++-
 src/main/ui/static/config/notice/notice.js        | 15 ++++++++++++++-
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
index dda97f360..5a6b78aeb 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
@@ -29,7 +29,7 @@ public interface ClientMapper {
 
     List<JSONObject> listValidClient();
 
-    List<JSONObject> listValidClientFor30Days();
+    List<JSONObject> listValidClientFor30Days(JSONObject params);
 
     List<JSONObject> listGreenChannel(JSONObject params);
 
diff --git a/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java b/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java
index dc4ed8d40..10379e81e 100644
--- a/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java
@@ -117,9 +117,9 @@ public class NoticeManageImpl implements NoticeManage {
         notice.put("create_time", date);
         notice.put("create_id", manager.getString("manager_id"));
         notice.put("create_name", manager.getString("display_name"));
-        if (!notice.getBoolean("merchants_type")){
+        if (notice.getInteger("merchants_type") != 1){
             StringBuilder sendClients = new StringBuilder();
-            List<JSONObject> clients = clientMapper.listValidClientFor30Days();
+            List<JSONObject> clients = clientMapper.listValidClientFor30Days(notice);
             clients.forEach(c -> {
                 if (c.getInteger("parent_client_id")==null || c.getInteger("parent_client_id")!=9){
                     String p = c.getString("client_moniker")+",";
@@ -177,10 +177,10 @@ public class NoticeManageImpl implements NoticeManage {
             notice.put("send_id", manager.getString("manager_id"));
             notice.put("send_name", manager.getString("display_name"));
         }
-        if (!notice.getBoolean("merchants_type")){
+        if (notice.getInteger("merchants_type") != 1){
             StringBuilder sendClients = new StringBuilder();
 
-            List<JSONObject> clients = clientMapper.listValidClientFor30Days();
+            List<JSONObject> clients = clientMapper.listValidClientFor30Days(notice);
             clients.forEach(c -> {
                 if (c.getInteger("parent_client_id")==null || c.getInteger("parent_client_id")!=9){
                     String p = c.getString("client_moniker")+",";
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 4492a60df..f312069b6 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
@@ -12,9 +12,17 @@
                         sc.client_moniker,
                         sc.parent_client_id
         FROM statistics_customer_order sco,
-             sys_clients sc
+             sys_clients sc,
+             sys_client_config cc
         WHERE sco.date >= DATE_SUB(CURDATE(), INTERVAL 30 DAY)
           AND sco.client_id = sc.client_id
+          AND sc.client_id = cc.client_id
+          <if test="merchants_type == 2">
+              AND cc.enable_cross_payment = 1
+          </if>
+          <if test="merchants_type == 3">
+              AND cc.enable_card_payment = 1
+          </if>
     </select>
     <select id="listGreenChannel" resultType="com.alibaba.fastjson.JSONObject">
         select m.manager_id manager_id,m.display_name display_name, m.wx_openid wx_openid , c.client_moniker
diff --git a/src/main/ui/static/config/notice/notice.js b/src/main/ui/static/config/notice/notice.js
index d8b991b5c..55401a3fb 100644
--- a/src/main/ui/static/config/notice/notice.js
+++ b/src/main/ui/static/config/notice/notice.js
@@ -9,10 +9,22 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
             "label": "All",
             "value": 0
         },
+        {
+            //跨境商户
+            "label": "Cross-border",
+            "value": 2
+        },
+        {
+            //卡支付商户
+            "label": "Card",
+            "value": 3
+        },
         {
             "label": "Custom",
             "value": 1
-        }];
+        }
+    ];
+
 
     var app = angular.module('noticeApp', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch', 'ngFileUpload', 'ng.uditor']);
     app.config(['$stateProvider', function ($stateProvider) {
@@ -104,6 +116,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
         };
         $scope.today = new Date();
         $scope.save = function (form) {
+            debugger
             if (form.$invalid) {
                 angular.forEach(form, function (item, key) {
                     if (key.indexOf('$') < 0) {

From 454b095e128b240cac554569b9195e94054269c7 Mon Sep 17 00:00:00 2001
From: dulingling <dll19920503@qq.com>
Date: Wed, 5 Aug 2020 15:08:06 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pom.xml b/pom.xml
index 437cfb8df..ba61f542c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.3.49</version>
+    <version>2.3.50</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>

From ef13b4242349dba71ab8012c804f2cae799c22c7 Mon Sep 17 00:00:00 2001
From: yixian <astro.dai@royalpay.com.au>
Date: Wed, 5 Aug 2020 18:53:46 +1000
Subject: [PATCH 3/3] UI bug fix

---
 src/main/ui/static/analysis/risk_business.js                | 2 +-
 src/main/ui/static/analysis/templates/riskEvent_detail.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/ui/static/analysis/risk_business.js b/src/main/ui/static/analysis/risk_business.js
index 1c33fa8fd..432c1fcf9 100644
--- a/src/main/ui/static/analysis/risk_business.js
+++ b/src/main/ui/static/analysis/risk_business.js
@@ -310,7 +310,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
                             url = "https://file.royalpay.com.au/open/2019/03/27/1553658193577_ddF4FAQYBaMx2oCEUlD2f2NtW3SxYD.png";
                             break;
                         case "3":
-                            url = "https://file.royalpay.com.au/open/2019/03/27/1553658238130_VJPI3RNmyKtcOgsV8w8yswUsYMFvGs.png\n";
+                            url = "https://file.royalpay.com.au/open/2019/03/27/1553658238130_VJPI3RNmyKtcOgsV8w8yswUsYMFvGs.png";
                             break;
                         default:
                             break;
diff --git a/src/main/ui/static/analysis/templates/riskEvent_detail.html b/src/main/ui/static/analysis/templates/riskEvent_detail.html
index dbcdbae04..4ac089df5 100644
--- a/src/main/ui/static/analysis/templates/riskEvent_detail.html
+++ b/src/main/ui/static/analysis/templates/riskEvent_detail.html
@@ -406,7 +406,7 @@
                                     </div>
 
                                     <a role="button"
-                                       ng-if="riskEvent.result_type <= 1 && riskEvent.order_type < 4 && ('10000000000'|withRole)"
+                                       ng-if="riskEvent.result_type <= 1 && (riskEvent.order_type < 4 || riskEvent.order_type==6) && ('10000000000'|withRole)"
                                        class="btn btn-info"
                                        ng-click="resendUploadEmail()">Send Email {{riskEvent.result_type == 1 ? 'again' : ''}}
                                     </a>