From 74820c22afe54eb0f4f5e1263b208387dd0f25af Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Mon, 12 Aug 2019 14:19:06 +0800
Subject: [PATCH] =?UTF-8?q?[Y]=20=E4=BF=AE=E5=A4=8Dstuff=20=E6=8F=90?=
 =?UTF-8?q?=E6=88=90=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +-
 .../core/impls/ManageAppServiceImp.java       |  5 +++-
 .../web/EncourageMoneyController.java         | 24 ++++++++++---------
 .../listeners/NoticeRefundAuditListener.java  |  2 +-
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 12290b19a..a41054448 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
-    <version>1.1.8</version>
+    <version>1.1.9</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
index 140bcc3e0..4741de2b4 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
@@ -362,7 +362,10 @@ public class ManageAppServiceImp implements ManageAppService {
 
         JSONObject report = financialBDPrizeRecordMapper.getReport(DateFormatUtils.format(date, "yyyy-MM"));
         if (report != null) {
-             totalDetail.putAll(financialBDPrizeLogMapper.findByReportAndBDTotal(report.getString("record_id"), manager.getString("manager_id")));
+            JSONObject currentBDDetail = financialBDPrizeLogMapper.findByReportAndBDTotal(report.getString("record_id"), manager.getString("manager_id"));
+            if (currentBDDetail != null) {
+                totalDetail.putAll(currentBDDetail);
+            }
         }
         return totalDetail;
     }
diff --git a/src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java b/src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java
index 42a446ddf..de2de5893 100644
--- a/src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java
@@ -3,6 +3,7 @@ package au.com.royalpay.payment.manage.customers.web;
 import au.com.royalpay.payment.manage.customers.core.EncourageService;
 import au.com.royalpay.payment.tools.CommonConsts;
 
+import au.com.royalpay.payment.tools.exceptions.BadRequestException;
 import com.alibaba.fastjson.JSONObject;
 
 import org.apache.commons.lang3.StringUtils;
@@ -30,17 +31,18 @@ public class EncourageMoneyController {
 
     @RequestMapping(value = "/orders/{orderId}", method = RequestMethod.GET)
     public JSONObject takeEncourageMoney(@PathVariable String orderId, @ModelAttribute(CommonConsts.WECHATINFO) JSONObject wxUser,
-            @ModelAttribute(CommonConsts.ALIUSER) JSONObject aliuser) {
-        String user_id = "";
-        if (wxUser == null) {
-            user_id = aliuser.getString("user_id");
-        } else {
-            user_id = wxUser.getString("openid");
-        }
-        if (StringUtils.isEmpty(user_id)) {
-            return new JSONObject();
-        }
-        return encourageService.takeEncourageMoney(orderId, user_id);
+                                         @ModelAttribute(CommonConsts.ALIUSER) JSONObject aliuser) {
+        throw new BadRequestException("当前活动暂不支持");
+//        String user_id = "";
+//        if (wxUser == null) {
+//            user_id = aliuser.getString("user_id");
+//        } else {
+//            user_id = wxUser.getString("openid");
+//        }
+//        if (StringUtils.isEmpty(user_id)) {
+//            return new JSONObject();
+//        }
+//        return encourageService.takeEncourageMoney(orderId, user_id);
     }
 
     @RequestMapping(value = "/orders/{orderId}/crit", method = RequestMethod.PUT)
diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/events/listeners/NoticeRefundAuditListener.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/events/listeners/NoticeRefundAuditListener.java
index 9e0f7af25..87fcd0787 100644
--- a/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/events/listeners/NoticeRefundAuditListener.java
+++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/events/listeners/NoticeRefundAuditListener.java
@@ -43,7 +43,7 @@ public class NoticeRefundAuditListener implements ApplicationListener<NewRefundA
         if (newRefundAuditEvent.getOperator() != null) {
             audition.put("applyerid", newRefundAuditEvent.getOperator().getString("operator_id"));
             operatorName = newRefundAuditEvent.getOperator().getString("operator");
-            audition.put("applyername", operatorName);
+            audition.put("applyername", StringUtils.defaultString(operatorName, "System"));
         }
         String remark = newRefundAuditEvent.getRefundOrder().getString("remark");
         audition.put("remark", remark);