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

Merge branch 'develop'

Browse Source
master
taylor.dang 6 years ago
parent 98a908a0b1 eae6ff652d
commit 4594faee58
7 changed files with 99 additions and 85 deletions
Show Stats Download Patch File Download Diff File

3
src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java
Unescape View File

@ -23,7 +23,7 @@ import javax.annotation.Resource;
@RestController
@RequestMapping("/act/encourage_money")
public class EncourageMoneyController {
Logger logger = LoggerFactory.getLogger(getClass());
private Logger logger = LoggerFactory.getLogger(getClass());
@Resource
private EncourageService encourageService;
@ -32,7 +32,6 @@ public class EncourageMoneyController {
public JSONObject takeEncourageMoney(@PathVariable String orderId, @ModelAttribute(CommonConsts.WECHATINFO) JSONObject wxUser,
@ModelAttribute(CommonConsts.ALIUSER) JSONObject aliuser) {
String user_id = "";
logger.info("problem order id:"+orderId+"--wxUser:"+wxUser+"--aliuser:"+aliuser);
if (wxUser == null) {
user_id = aliuser.getString("user_id");
} else {

6
src/main/java/au/com/royalpay/payment/manage/tradelog/refund/impls/RefundServiceImpl.java
Unescape View File

@ -287,7 +287,6 @@ public class RefundServiceImpl implements RefundService, ApplicationEventPublish
audition.put("order", order);
JSONObject refund = refundMapper.find(audition.getString("refund_id"));
audition.put("refund", refund);
audition.put("refund_audit_id", audition.getString("id"));
return audition;
}
@ -390,8 +389,9 @@ public class RefundServiceImpl implements RefundService, ApplicationEventPublish
JSONObject res = new JSONObject();
int clientId = account.getIntValue("client_id");
res.put("client", clientManager.getClientInfo(clientId));
res.put("auditions", refundAuditionMapper.listAllAuditingRefundsOfClient(clientId));
res.put("counts", refundAuditionMapper.listAuditingRefundsOfClient(clientId).size());
List<JSONObject> auditions = refundAuditionMapper.listAuditingRefundsOfClient(clientId);
res.put("auditions", auditions);
res.put("counts", auditions.size());
return res;
}

10
src/main/resources/templates/manager_bind_success.html
Unescape View File

@ -14,7 +14,7 @@
<script type="text/javascript" src="/static/lib/jquery/jquery-2.1.4.min.js"></script>
<script type="text/javascript" src="/static/templates/disable_wechat_menu.js?t=201607070231"></script>
<style type="text/css">
.result{
.result {
text-align: center;
margin: auto;
margin-top: 20px;
@ -23,15 +23,17 @@
font-weight: bold;
color: #000;
}
.result img{
.result img {
margin-top: 30px;
height: 100px;
}
</style>
</head>
<body style="margin: 0;padding: 0;">
<div class="result"><img src="/static/images/pay_success.png">
<div style="margin-top: 10%;font-size:32px;color: #008d4c;text-align: center;width: 100%;font-weight: bold;">Success
<div class="result"><img src="/static/images/completed.png">
<div style="margin-top: 10%;font-size:32px;color: #008d4c;text-align: center;width: 100%;font-weight: bold;">Success
</div>
</div>
</body>
</html>

38
src/main/resources/templates/refund_audit.html
Unescape View File

@ -13,8 +13,8 @@
white-space: normal
}
</style>
<script type="text/javascript">
window.refund_audit_id = /*[[*{refund_audit_id}]]*/null;
<script type="text/javascript" data-th-inline="javascript">
window.refund_audit_id = /*[[${id}]]*/'';
</script>
<script type="text/javascript" src="/static/templates/refund_audit.js?t=201607241231"></script>
</head>
@ -39,29 +39,19 @@
<p class="weui_toast_content">Submitting...</p>
</div>
</div>
<div class="weui_panel">
<div class="weui_panel_bd">
<div class="weui_media_box weui_media_appmsg">
<div class="weui_media_bd">
<h4 class="weui_media_title">Refund Audition</h4>
</div>
</div>
</div>
</div>
<div class="weui_panel">
<div class="weui_panel_bd">
<div class="weui_panel_bd">
<div class="weui_cells">
<div class="weui_cell">
<div class="weui_cell_bd weui_cell_primary">
<p>Order Fee</p>
</div>
<div class="weui_cell_ft">[[${order['currency']}]] [[${order['customer_payment_amount_string']}]]</div>
<div class="weui_cell_ft">[[${order['currency']}]] [[${order['customer_payment_amount']}]]</div>
</div>
<div class="weui_cell">
<div class="weui_cell_bd weui_cell_primary">
<p>Refund Fee</p>
</div>
<div class="weui_cell_ft">[[${order['currency']}]] [[${order['display_amount_string']}]]</div>
<div class="weui_cell_ft">[[${refund['currency']}]] [[${refund['amount']}]]</div>
</div>
<div class="weui_cell">
<div class="weui_cell_bd weui_cell_primary">
@ -81,14 +71,12 @@
</div>
<div class="weui_cell_ft" data-th-text="${order['order_description']}"></div>
</div>
<div class="weui_cell" data-th-if="${order['order_detail']}">
<div class="weui_cell_bd weui_cell_primary">
<p>>Order Detail<</p>
</div>
<div class="weui_cells_title" data-th-if="${order['order_detail']}">Order Detail</div>
<div class="weui_cells" data-th-if="${order['order_detail']}">
<div class="weui_cell">
<div class="weui_cell_bd weui_cell_primary" data-th-text="${order['order_detail']}"></div>
</div>
<div class="weui_cell_ft" data-th-text="${order['order_detail']}">></div>
</div>
<div class="weui_cells">
<div class="weui_cell">
<div class="weui_cell_bd weui_cell_primary">
<p>Order ID</p>
@ -103,17 +91,17 @@
</div>
<div class="weui_cell">
<div class="weui_cell_bd weui_cell_primary">
<p>Trade Time</p>
<p>Apply Time</p>
</div>
<div class="weui_cell_ft" data-th-text="${#dates.format(order['confirm_time'],'yyyy-MM-dd HH:mm:ss')}"></div>
<div class="weui_cell_ft"
data-th-text="${#dates.format(applytime,'yyyy-MM-dd HH:mm:ss')}"></div>
</div>
</div>
<div class="weui_btn_area">
<a class="weui_btn weui_btn_primary" id="agree-btn">Agree</a>
<a class="weui_btn weui_btn_warn" id="disagree-btn">Disagree</a>
</div>
</div>
</div>
</body>
</html>

46
src/main/resources/templates/refund_audit_list.html
Unescape View File

@ -8,9 +8,26 @@
<script type="text/javascript" src="/static/lib/jquery/jquery-2.1.4.min.js"></script>
<script type="text/javascript" src="/static/templates/disable_wechat_menu.js?t=201607070231"></script>
<style type="text/css">
.weui_cell_ft {
max-width: 60%;
white-space: normal
.result {
text-align: center;
margin: auto;
margin-top: 20px;
font-family: Helvetica;
font-size: 20px;
font-weight: bold;
color: #000;
}
.pay-brands {
text-align: center;
line-height: 20px;
font-size: 24px;
position: fixed;
width: 100%;
padding-top: 5px;
padding-bottom: 10px;
color: #dddddd;
background: #fbf9fe;
bottom: 0px;
}
</style>
</head>
@ -28,23 +45,30 @@
</div>
</div>
<div data-th-if="${auditions.size()==0}">
<p> There is no refund applies at the moment! </p>
<div class="result"><img src="/static/images/completed.png" style="width: 80%">
<div style="margin-top: 10%;font-size:32px;color: #008d4c;text-align: center;width: 100%;font-weight: bold;">
Refund audit completed!
</div>
</div>
</div>
<div data-th-if="${auditions.size()>0}">
<div class="weui_panel">
<div class="weui_panel_bd">
<div class="weui_cells weui_cells_access">
<div data-th-each="apply: ${auditions}">
<a class="weui_cell" data-th-href="/api/payment/v1.0/refund/auditions/ + @{apply.id}">
<div class="weui_cell_bd weui_cell_primary">
<p data-th-text="${apply.currency}+ ${#numbers.formatDecimal($apply.refund_fee,1,2)}"></p>
<div class="weui-cells__title" style="margin-top: 10%;">You have <span data-th-text="${auditions.size()}" style="color: red;font-size: 30px;"></span> refunds pending review</div>
<div class="weui-cells">
<a data-th-each="apply:${auditions}" class="weui-cell weui-cell_access"
data-th-href="@{'/api/payment/v1.0/refund/auditions/'+${apply['id']}}">
<div class="weui-cell__bd">
<p data-th-text="${apply['order_id']}"></p>
</div>
<div class="weui_cell_ft" data-th-text="${apply.order_id}"></div>
<div class="weui-cell__ft"></div>
</a>
</div>
</div>
</div>
</div>
</div>
<div class="pay-brands" data-th-if="${auditions.size()>0}">
<img src="/static/images/pmt_logo_royalpay.png">
</div>
</body>
</html>

BIN
src/main/ui/static/images/completed.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

1
src/main/ui/static/templates/refund_audit.js
Unescape View File

@ -3,6 +3,7 @@
*/
$(function () {
'use strict';
function audit(pass) {
var wdiv = $('#wdiv');
wdiv.show();

Write Preview
Loading…
Cancel
Save