From 1365bd6424b0abbcf850f6c3d562f039a28846da Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 26 Jul 2019 10:49:35 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E9=80=80=E6=AC=BE=E5=8D=A0=E6=AF=94?=
 =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=A2=9E=E5=8A=A0=E9=A3=8E=E6=8E=A7=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E5=BE=AE=E4=BF=A1=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                   | 2 +-
 .../manage/dev/listeners/CloseOrderWarningSender.java     | 8 ++++++--
 .../listeners/recognizers/PaymentAmountCheatMonitor.java  | 8 ++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index afcf33741..b185b8e7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
-    <version>1.0.28</version>
+    <version>1.0.29</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/listeners/CloseOrderWarningSender.java b/src/main/java/au/com/royalpay/payment/manage/dev/listeners/CloseOrderWarningSender.java
index d8f059410..f85c0f044 100644
--- a/src/main/java/au/com/royalpay/payment/manage/dev/listeners/CloseOrderWarningSender.java
+++ b/src/main/java/au/com/royalpay/payment/manage/dev/listeners/CloseOrderWarningSender.java
@@ -93,7 +93,7 @@ public class CloseOrderWarningSender implements ApplicationListener<OrderCloseEv
             }
         }
         warningList.put(moniker, new Date());
-        List<JSONObject> developers = managerMapper.listDetailsByRole(null, ManagerRole.DEVELOPER.getMask());
+        List<JSONObject> developers = managerMapper.listDetailsByRole(null, ManagerRole.DEVELOPER.getMask() | ManagerRole.RISK_MANAGER.getMask());
         if (!StringUtils.isEmpty(client.getString("bd_user"))) {
             String[] bds = client.getString("bd_user").split(",");
             if (bds.length > 0) {
@@ -133,6 +133,9 @@ public class CloseOrderWarningSender implements ApplicationListener<OrderCloseEv
             if (developer.getString("manager_id").equals("141")) {
                 continue;
             }
+            if (StringUtils.isBlank(developer.getString("wx_openid"))) {
+                continue;
+            }
             try {
                 String title = client.getString("short_name") + "(" + moniker + ")";
                 String content = "最近" + recentOrders.size() + "笔订单中有" + closed.size() + "笔关闭，占比" + percentage + "%;\r\n" + "最早一笔："
@@ -144,7 +147,8 @@ public class CloseOrderWarningSender implements ApplicationListener<OrderCloseEv
                             "所属BD:" + client.getString("bd_user_name"));
                     api.sendTemplateMessage(msg);
                 }
-            } catch (Exception ignore) {
+            } catch (Exception e) {
+                logger.info("sendTemplateMessage--发送告警模板消息发生错误" + developer.getString("wx_openid") + "--" + e);
             }
         }
     }
diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/listeners/recognizers/PaymentAmountCheatMonitor.java b/src/main/java/au/com/royalpay/payment/manage/dev/listeners/recognizers/PaymentAmountCheatMonitor.java
index cf10e8bc8..6d5dfff1d 100644
--- a/src/main/java/au/com/royalpay/payment/manage/dev/listeners/recognizers/PaymentAmountCheatMonitor.java
+++ b/src/main/java/au/com/royalpay/payment/manage/dev/listeners/recognizers/PaymentAmountCheatMonitor.java
@@ -108,12 +108,15 @@ public class PaymentAmountCheatMonitor implements CheatMonitor {
             }
             warningList.put(subMerchantId, new Date());
 
-            List<JSONObject> developers = managerMapper.listDetailsByRole(null, ManagerRole.DEVELOPER.getMask());
+            List<JSONObject> developers = managerMapper.listDetailsByRole(null, ManagerRole.DEVELOPER.getMask() | ManagerRole.RISK_MANAGER.getMask());
             MpWechatApi api = mpWechatApiProvider.getNewPaymentApi();
             for (JSONObject developer : developers) {
                 if(developer.getString("manager_id").equals("141")){
                     continue;
                 }
+                if (StringUtils.isBlank(developer.getString("wx_openid"))) {
+                    continue;
+                }
                 try {
                     String wxOpenid = developer.getString("wx_openid");
                     if (wxOpenid != null) {
@@ -124,7 +127,8 @@ public class PaymentAmountCheatMonitor implements CheatMonitor {
                         TemplateMessage msg = WarningSenderHelper.buildWarningMessage(wxOpenid, templateId, title, content, client.getString("bd_user_name"));
                         api.sendTemplateMessage(msg);
                     }
-                } catch (Exception ignore) {
+                } catch (Exception e) {
+                    logger.info("sendTemplateMessage--发送告警模板消息发生错误" + developer.getString("wx_openid") + "--" + e);
                 }
             }
         }