msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
# Conflicts:
#	src/main/resources/templates/activity/mondelay/mondelay.html
master
yuan 7 years ago
parent e9308e0fc5 1efd1b604a
commit f3ad56587f
2 changed files with 44 additions and 41 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java
Unescape View File

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

83
src/main/resources/templates/activity/mondelay/mondelay.html
Unescape View File

@ -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>
@ -52,45 +56,45 @@
<span style="color:#9BFBFE;"><font th:text="${#dates.format(active_date, 'MM-dd')}"></font> 敬请期待</span>
</button>
</div>
<div class="button_center" th:if="${active && !apply}" id="applyButton">
<button class="button_position" th:style="'background-image:' + @{(${operation_pause} ? 'linear-gradient(0deg, #eee 0%, #eee 100%)' )} + ''">
<span style="color: #FFFFFF;" th:style="'color:' + @{(${operation_pause} ? '#999' )} + ''">我要参加</span>
</button>
</div>
<div th:class="${apply}?'margin_top'" th:if="${list!=null}">
<div class="content">
<div class="h3_width">
<h2>补贴金额记录</h2>
</div>
<div class="button_center" th:if="${active && !apply}" id="applyButton">
<button class="button_position" th:style="'background-image:' + @{(${operation_pause} ? 'linear-gradient(0deg, #eee 0%, #eee 100%)' )} + ''">
<span style="color: #FFFFFF;" th:style="'color:' + @{(${operation_pause} ? '#999' )} + ''">我要参加</span>
</button>
</div>
<div th:class="${apply}?'margin_top'" th:if="${list!=null}">
<div class="content">
<div class="h3_width">
<h2>补贴金额记录</h2>
</div>
<div class="amount_title">
<h5>累计补贴金额</h5>
<div class="total_redpack">$ <span th:text="${total_redpack}"></span></div>
</div>
<div class="amount_title">
<h5>累计补贴金额</h5>
<div class="total_redpack">$ <span th:text="${total_redpack}"></span></div>
</div>
<div class="content_table">
<table class="table">
<thead>
<tr>
<th>时间</th>
<th style="text-align: right">补贴金额</th>
</tr>
</thead>
<tbody>
<tr th:each="redpack:${list}">
<td th:text="${#dates.format(redpack['send_time'], 'yyyy-MM-dd')}">>04-01 12:00</td>
<td style="text-align: right" th:text="${redpack['redpack_amount']}">$5.00</td>
</tr>
</tbody>
</table>
<div class="content_table">
<table class="table">
<thead>
<tr>
<th>时间</th>
<th style="text-align: right">补贴金额</th>
</tr>
</thead>
<tbody>
<tr th:each="redpack:${list}">
<td th:text="${#dates.format(redpack['send_time'], 'yyyy-MM-dd')}">>04-01 12:00</td>
<td style="text-align: right" th:text="${redpack['redpack_amount']}">$5.00</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</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>
</button>
</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>
</button>
</div>
<div class="shape1_position"><img src="/static/templates/activity/mondelay/shape1@2x.png"></div>
@ -131,7 +135,7 @@
} else if (/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {
window.webkit.messageHandlers.appCmd.postMessage({type:'cmd_join_mondelay'});
} else if (/(Android)/i.test(navigator.userAgent)) {
android.appCmd('{\"type\":\"cmd_join_mondelay\"}');
android.appCmd('{\"type\":\"cmd_join_mondelay\",\"cancel_waring\":\"'+cancel_waring+'\"}');
} else {
}
@ -145,8 +149,7 @@
} else if (/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {
window.webkit.messageHandlers.appCmd.postMessage({type:'cmd_cancel_mondelay',cancel_waring:cancel_waring});
} else if (/(Android)/i.test(navigator.userAgent)) {
android.appCmd('{\"type\":\"cmd_cancel_mondelay\"}');
} else {
android.appCmd('{\"type\":\"cmd_cancel_mondelay\",\"cancel_waring\":\"'+cancel_waring+'\"}'); } else {
}

Write Preview
Loading…
Cancel
Save