From 1efd1b604aa0c877cd03607d5ae88633d0f2079c Mon Sep 17 00:00:00 2001
From: "eason.qian" <eason.qian@royalpay.com.au>
Date: Fri, 23 Mar 2018 14:26:02 +0800
Subject: [PATCH] fix

---
 .../signin/core/impls/SignInAccountServiceImpl.java    |  2 +-
 .../templates/activity/mondelay/mondelay.html          | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
index 15e17db04..0df335678 100644
--- a/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
@@ -320,7 +320,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
                 "company_name", "address","business_name","business_structure", "abn","acn","company_phone","suburb","postcode","state","contact_person","contact_phone","contact_email",
                 "short_name", "logo_url", "enable_refund", "enable_refund_auth", "retail_surcharge", "require_custinfo", "require_remark",
                 "logo_thumbnail", "creator", "create_time", "approver", "approve_result", "approve_time", "timezone",
-                "has_children", "source", "customer_surcharge_rate", "enable_alipay", "enable_wechat", "enable_bestpay","manual_settle"};
+                "has_children", "source", "customer_surcharge_rate", "enable_alipay", "enable_wechat", "enable_bestpay","manual_settle","skip_clearing"};
         for (String col : columns) {
             simpleClient.put(col, client.get(col));
         }
diff --git a/src/main/resources/templates/activity/mondelay/mondelay.html b/src/main/resources/templates/activity/mondelay/mondelay.html
index cdb725043..f84151330 100644
--- a/src/main/resources/templates/activity/mondelay/mondelay.html
+++ b/src/main/resources/templates/activity/mondelay/mondelay.html
@@ -35,15 +35,19 @@
     <ul>
         <li>参与商户<b class="font_color">每周一</b>即可获得营销补贴</li>
         <li>
-            营销补贴金额，<b class="font_color">以发放时账户余额为基数</b>，折算<b class="font_color">年化比率不低于15%，最高20%</b>
+            营销补贴金额，<b class="font_color">以发放时账户余额为基数</b>，折算<b class="font_color">年化比率不低于15%，最高20%，2000$封顶</b>
         </li>
         <li>
-            每周一15:00~16:00（GMT+10时区）发放营销补贴至商户营销账户。 参与商户周一暂停清算，进行补贴的计算和发放，周二恢复原有规则。
+            每周一15:00~16:00（GMT+10时区）发放营销补贴至商户营销账户。
+        </li>
+        <li>
+            参与活动商户系统不再自动清算，商户可以根据自己的需要自行提现，提现完第二天会清算到商户银行账户。
         </li>
         <li>
             补贴活动周期：<b class="font_color">2018/3/20-2018/6/30</b>
         </li>
         <li>商户自愿参加，可以随时取消（除周一外，周一为补贴的计算和发放日，在此期间无法进行报名和取消操作，17：00之后恢复报名和取消报名）</li>
+        <li>商户一旦取消，则放弃活动补贴，第二天系统会恢复自动清算</li>
         <li>本活动最终解释权归RoyalPay所有</li>
     </ul>
 </div>
@@ -88,7 +92,7 @@
     </div>
     <div class="button_center cancel_posttion"  th:if="${active && apply}" id="cancelButton">
         <button class="button_position button_color" th:style="'background-image:' + @{(${operation_pause} ? 'linear-gradient(0deg, #eee 0%, #eee 100%)' )} + ''">
-            <span class="cancel" th:style="'color:' + @{(${operation_pause} ? '#999' )} + ''">放弃活动资格</span>
+            <span class="cancel" th:style="'color:' + @{(${operation_pause} ? '#999' )} + ''">退出活动</span>
         </button>
     </div>