Merge branch 'develop'

# Conflicts:
#	pom.xml

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>

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;
     }

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;
@@ -31,16 +32,17 @@ 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 = "";
+        throw new BadRequestException("当前活动暂不支持");
-        if (wxUser == null) {
+//        String user_id = "";
-            user_id = aliuser.getString("user_id");
+//        if (wxUser == null) {
-        } else {
+//            user_id = aliuser.getString("user_id");
-            user_id = wxUser.getString("openid");
+//        } else {
-        }
+//            user_id = wxUser.getString("openid");
-        if (StringUtils.isEmpty(user_id)) {
+//        }
-            return new JSONObject();
+//        if (StringUtils.isEmpty(user_id)) {
-        }
+//            return new JSONObject();
-        return encourageService.takeEncourageMoney(orderId, user_id);
+//        }
+//        return encourageService.takeEncourageMoney(orderId, user_id);
     }
 
     @RequestMapping(value = "/orders/{orderId}/crit", method = RequestMethod.PUT)

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);