Merge branch 'hotfix_encourage' into develop

src/main/java/au/com/royalpay/payment/manage/customers/core/impls/EncourageUseProcessor.java

@@ -111,13 +111,20 @@ public class EncourageUseProcessor implements Ordered, EncourageService {
                     logger.debug("用户关系不存在");
                     return new JSONObject();
                 }
-                JSONObject wxUser = customerMapper.findCustomerByOpenId(visitorOpenId);
                 String merchantId = order.getString("merchant_id");
                 WeChatPayConfig.Merchant mch = WechatPayEnvironment.getEnv().getMerchantConfig(merchantId);
-                MpWechatApi api = mpWechatApiProvider.getApi(mch.getMpId());
-                if (!StringUtils.equals(wxUser.getString(api.getOpenIdKey()), openId)) {
-                    logger.debug("不是同一人");
-                    return new JSONObject();
+                if (mch.getMpId()==null){
+                    if (!StringUtils.equals(visitorOpenId, openId)) {
+                        logger.debug("不是同一人");
+                        return new JSONObject();
+                    }
+                }else {
+                    JSONObject wxUser = customerMapper.findCustomerByOpenId(visitorOpenId);
+                    MpWechatApi api = mpWechatApiProvider.getApi(mch.getMpId());
+                    if (!StringUtils.equals(wxUser.getString(api.getOpenIdKey()), openId)) {
+                        logger.debug("不是同一人");
+                        return new JSONObject();
+                    }
                 }
             }
             if ("Alipay".equals(channel)) {

src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java

@@ -340,6 +340,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
         resp.addHeader("Content-Disposition", "attachment; filename=" + zipName);
         OutputStream ous = resp.getOutputStream();
         ZipOutputStream zos = new ZipOutputStream(ous);
+        logger.info("using newest version test");
         for (JSONObject log : logs) {
             String dateString = DateFormatUtils.format(log.getDate("operate_time"), "yyyyMMddHHmmss");
             List<JSONObject> details = clearingDetailMapper.listReportsOfSettlement(log.getIntValue("clearing_id"));
@@ -978,7 +979,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
             // String mailId = mailService.sendEmail(title, "164851225@qq.com", "1029811920@qq.com", content,
             // attachList);
             String mailId = mailService.sendEmail(title, "diana.baldi@flexewallet.com,steven.stamboultgis@novatti.com,fazal.cader@flexewallet.com",
-                    "locky@royalpay.com.au,leo.huang@royalpay.com.au,eason.qian@royalpay.com.au,astro.dai@royalpay.com.au,settlement@royalpay.com.au,settlements@flexewallet.com,tommy.yang@royalpay.com.au",
+                    "locky@royalpay.com.au,leo.huang@royalpay.com.au,eason.qian@royalpay.com.au,astro.dai@royalpay.com.au,settlement@royalpay.com.au,settlements@flexewallet.com",
                     content, attachList);
 
             if (settleMail == null) {