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

Merge branch 'mondelay' into develop

Browse Source
master
eason.qian 7 years ago
parent 9bafbc56c2 9ac5b10c0b
commit b49f43c3bb
5 changed files with 59 additions and 36 deletions
Show Stats Download Patch File Download Diff File

3
src/main/java/au/com/royalpay/payment/manage/activities/monsettledelay/core/impls/ActMonDelaySettleServiceImp.java
Unescape View File

@ -10,6 +10,7 @@ import au.com.royalpay.payment.tools.env.PlatformEnvironment;
import au.com.royalpay.payment.tools.exceptions.BadRequestException;
import au.com.royalpay.payment.tools.exceptions.ForbiddenException;
import au.com.royalpay.payment.tools.permission.enums.PartnerRole;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.github.miemiedev.mybatis.paginator.domain.Order;
import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
@ -112,7 +113,7 @@ public class ActMonDelaySettleServiceImp implements ActMonDelaySettleService {
}
device.put("account_name", account.getString("display_name"));
device.put("create_time", new Date());
JSONObject params = act.getJSONObject("params_json");
JSONObject params = JSON.parseObject(act.getString("params_json"));
device.put("rate", params.getBigDecimal("rate") == null ? new BigDecimal(0.15) : params.getBigDecimal("rate"));
device.put("expire_time", act.getDate("expire_date"));
actMonDelaySettleMapper.save(device);

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

@ -17,8 +17,16 @@
<script type="text/javascript" src="/static/lib/jquery/jquery-2.1.4.min.js"></script>
</head>
<body>
<div class="title_img">
<h1><img src="/static/templates/activity/mondelay/title@2x.png"></h1>
<div th:class="!${expire}?'margin_bottom'">
<div class="title_img">
<h1><img src="/static/templates/activity/mondelay/title@2x.png"></h1>
</div>
</div>
<div class="activity_close" th:if="${expire}">
<div class="line"></div>
<div class="activity_text">活动已结束</div>
<div class="line"></div>
</div>
<div class="content ul_font">
<div class="h2_width">
@ -39,52 +47,64 @@
<li>本活动最终解释权归RoyalPay所有</li>
</ul>
</div>
<div class="button_center" th:if="!${apply}" id="applyButton">
<button class="button_position">
<span style="color: #FFFFFF;">我要参加</span>
<div class="button_center" th:unless="${active}">
<button class="button_position button_active">
<span style="color:#9BFBFE;"><font th:text="${#dates.format(active_date, 'MM-dd')}"></font> 敬请期待</span>
</button>
</div>
<div th:class="${apply}?'margin_top'">
<div class="content">
<div class="h3_width">
<h2>补贴金额记录</h2>
<div th:if="${active}">
<div th:unless="${expire}">
<div class="button_center" th:if="!${apply}" id="applyButton">
<button class="button_position">
<span style="color: #FFFFFF;">我要参加</span>
</button>
</div>
</div>
<div th:class="${apply}?'margin_top'" th:if="${list.size()>0}">
<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 th:unless="${expire}">
<div class="button_center cancel_posttion" th:if="${apply}" id="cancelButton">
<button class="button_position button_color">
<span class="cancel">取消</span>
</button>
</div>
</div>
</div>
<div class="button_center cancel_posttion" th:if="${apply}" id="cancelButton">
<button class="button_position button_color">
<span class="cancel">取消</span>
</button>
</div>
<div class="shape1_position"><img src="/static/templates/activity/mondelay/shape1@2x.png"></div>
<div class="shape2_position"><img src="/static/templates/activity/mondelay/shape2@2x.png"></div>
<div class="shape3_position"><img src="/static/templates/activity/mondelay/shape3@2x.png"></div>
<div class="shape4_position"><img src="/static/templates/activity/mondelay/shape4@2x.png"></div>
<div class="shape5_position"><img src="/static/templates/activity/mondelay/shape5@2x.png"></div>
<div class="shape6_position"><img src="/static/templates/activity/mondelay/shape6@2x.png"></div>
<footer class="royal_position"><img src="/static/templates/activity/mondelay/logo@2x.png">
<footer class="royal_position"><img src="/static/templates/activity/mondelay/logo copy@2x.png">
<div class="shape6_position"><img src="/static/templates/activity/mondelay/shape6@2x.png"></div>
</footer>
</body>
</html>

BIN
src/main/ui/static/templates/activity/mondelay/button@2x.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.0 KiB

BIN
src/main/ui/static/templates/activity/mondelay/logo copy@2x.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

2
src/main/ui/static/templates/activity/mondelay/mondelay.css
Unescape View File

@ -123,6 +123,7 @@ tbody tr:nth-child(odd){
margin-top: 50px;
margin-bottom: 20px;
text-align: center;
position: relative;
}
.royal_position img{
height: 25px;
@ -174,6 +175,7 @@ tbody tr:nth-child(odd){
.shape6_position{
position: absolute;
left: -9px;
top: -40px;
z-index: -1;
}
.shape6_position img{

Write Preview
Loading…
Cancel
Save