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

cashier退款审核

Browse Source
master
taylor.dang 6 years ago
parent 578bb08fe5
commit b65f706555
6 changed files with 129 additions and 10 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/au/com/royalpay/payment/manage/mappers/payment/RefundAuditionMapper.java
Unescape View File

@ -25,7 +25,7 @@ public interface RefundAuditionMapper {
List<JSONObject> listAuditingRefundsOfOrder(@Param("order_id") String orderId);
@AutoSql(type = SqlType.SELECT)
JSONObject find(@Param("id") String applyId);
JSONObject find(@Param("id") String refundAuditId);
List<JSONObject> listAuditingRefundsOfClient(@Param("client_id") int clientId);

2
src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.java
Unescape View File

@ -60,7 +60,7 @@ public interface ClientAccountMapper {
List<JSONObject> listPaymentNoticeAccounts(@Param("client_id") int clientId);
@AutoSql(type = SqlType.SELECT)
@AdvanceSelect(addonWhereClause = "is_valid=1 and refund_authorised=1 and wechat_openid is not null", excludeColumns = {"salt", "password_hash"})
@AdvanceSelect(addonWhereClause = "is_valid=1 and (refund_authorised = 1 OR role = 1) and wechat_openid is not null", excludeColumns = {"salt", "password_hash"})
List<JSONObject> listRefundAuditAccounts(@Param("client_id") int clientId);
@AutoSql(type = SqlType.SELECT)

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

@ -287,6 +287,7 @@ 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;
}

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

@ -0,0 +1,119 @@
<!doctype html>
<html>
<head>
<title>Refund Audition</title>
<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0">
<link rel="stylesheet" type="text/css" href="/static/lib/weui/weui.min.css">
<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
<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
}
</style>
<script type="text/javascript">
window.refund_audit_id = /*[[*{refund_audit_id}]]*/null;
</script>
<script type="text/javascript" src="/static/templates/refund_audit.js?t=201607241231"></script>
</head>
<body>
<div id="wdiv" class="weui_loading_toast" style="display:none;">
<div class="weui_mask_transparent"></div>
<div class="weui_toast">
<div class="weui_loading">
<div class="weui_loading_leaf weui_loading_leaf_0"></div>
<div class="weui_loading_leaf weui_loading_leaf_1"></div>
<div class="weui_loading_leaf weui_loading_leaf_2"></div>
<div class="weui_loading_leaf weui_loading_leaf_3"></div>
<div class="weui_loading_leaf weui_loading_leaf_4"></div>
<div class="weui_loading_leaf weui_loading_leaf_5"></div>
<div class="weui_loading_leaf weui_loading_leaf_6"></div>
<div class="weui_loading_leaf weui_loading_leaf_7"></div>
<div class="weui_loading_leaf weui_loading_leaf_8"></div>
<div class="weui_loading_leaf weui_loading_leaf_9"></div>
<div class="weui_loading_leaf weui_loading_leaf_10"></div>
<div class="weui_loading_leaf weui_loading_leaf_11"></div>
</div>
<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_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>
<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>
<div class="weui_cell">
<div class="weui_cell_bd weui_cell_primary">
<p>Applyer</p>
</div>
<div class="weui_cell_ft" data-th-text="${applyername}"></div>
</div>
<div class="weui_cell">
<div class="weui_cell_bd weui_cell_primary">
<p>Apply Time</p>
</div>
<div class="weui_cell_ft" data-th-text="${#dates.format(applytime,'yyyy-MM-dd HH:mm:ss')}"></div>
</div>
<div class="weui_cell">
<div class="weui_cell_bd weui_cell_primary">
<p>Order Title</p>
</div>
<div class="weui_cell_ft" data-th-text="${order['order_description']}"></div>
</div>
</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>
<div class="weui_cells">
<div class="weui_cell">
<div class="weui_cell_bd weui_cell_primary">
<p>Order ID</p>
</div>
<div class="weui_cell_ft" data-th-text="${order['order_id']}"></div>
</div>
<div class="weui_cell" data-th-if="${order['client_order_id']}">>
<div class="weui_cell_bd weui_cell_primary">
<p>Partner Order ID</p>
</div>
<div class="weui_cell_ft" data-th-text="${order['client_order_id']}"></div>
</div>
<div class="weui_cell">
<div class="weui_cell_bd weui_cell_primary">
<p>Trade Time</p>
</div>
<div class="weui_cell_ft" data-th-text="${#dates.format(order['confirm_time'],'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>

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

@ -1,7 +1,7 @@
<!doctype html>
<html>
<head>
<title>Payment Notice</title>
<title>Refund Auditions List</title>
<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0">
<link rel="stylesheet" type="text/css" href="/static/lib/weui1/weui.min.css">
<script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
@ -17,9 +17,9 @@
<body>
<div class="weui_panel">
<div class="weui_panel_bd">
<div class="weui_media_box weui_media_appmsg">
<div class="weui_media_hd">
<img class="weui_media_appmsg_thumb" data-th-src="${client.logo_url}" alt="">
<div class="weui_media_box weui_media_appmsg" style="text-align: center;">
<div class="weui_media_hd" st>
<img class="weui_media_appmsg_thumb" data-th-src="${client.logo_url}" alt="" style="height: 60px;">
</div>
<div class="weui_media_bd">
<h4 class="weui_media_title" data-th-text="${client.company_name}"></h4>
@ -31,16 +31,15 @@
<p> There is no refund applies at the moment! </p>
</div>
<div data-th-if="${auditions.size()>0}">
asdlkjasd
<div class="weui_panel">
<div class="weui_panel_bd">
<div class="weui_cells weui_cells_access">
<div th-each="apply: ${audition}}">
<div th-each="apply: ${auditions}">
<a class="weui_cell" th-href="/api/payment/v1.0/refund/auditions/ + @{apply.id}">
<div class="weui_cell_bd weui_cell_primary">
<p th-text="${apply.currency}+ ${#numbers.formatDecimal($apply.refund_fee,1,2)}"></p>
</div>
<div class="weui_cell_ft" th-text="${apply.order_id}}"></div>
<div class="weui_cell_ft" th-text="${apply.order_id}"></div>
</a>
</div>
</div>

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

@ -7,7 +7,7 @@ $(function () {
var wdiv = $('#wdiv');
wdiv.show();
$.ajax({
url: '/api/payment/v1.0/refund/auditions/' + window.dataCache.id + '/wx_audit',
url: '/api/payment/v1.0/refund/auditions/' + window.refund_audit_id + '/wx_audit',
method: 'PUT',
dataType: 'json',
contentType: 'application/json',

Write Preview
Loading…
Cancel
Save