diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/RefundAuditionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/RefundAuditionMapper.java index 1500e5234..a86b144f3 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/RefundAuditionMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/RefundAuditionMapper.java @@ -25,7 +25,7 @@ public interface RefundAuditionMapper { List listAuditingRefundsOfOrder(@Param("order_id") String orderId); @AutoSql(type = SqlType.SELECT) - JSONObject find(@Param("id") String applyId); + JSONObject find(@Param("id") String refundAuditId); List listAuditingRefundsOfClient(@Param("client_id") int clientId); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.java index 60542974a..d6408a70a 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.java @@ -60,7 +60,7 @@ public interface ClientAccountMapper { List 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 listRefundAuditAccounts(@Param("client_id") int clientId); @AutoSql(type = SqlType.SELECT) diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/impls/RefundServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/impls/RefundServiceImpl.java index 130e8b1b7..26d81f8e2 100644 --- a/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/impls/RefundServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/impls/RefundServiceImpl.java @@ -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; } diff --git a/src/main/resources/templates/refund_audit.html b/src/main/resources/templates/refund_audit.html new file mode 100644 index 000000000..ffa7abb40 --- /dev/null +++ b/src/main/resources/templates/refund_audit.html @@ -0,0 +1,119 @@ + + + + Refund Audition + + + + + + + + + + + +
+
+
+
+

Refund Audition

+
+
+
+
+
+
+
+
+
+

Order Fee

+
+
[[${order['currency']}]] [[${order['customer_payment_amount_string']}]]
+
+
+
+

Refund Fee

+
+
[[${order['currency']}]] [[${order['display_amount_string']}]]
+
+
+
+

Applyer

+
+
+
+
+
+

Apply Time

+
+
+
+
+
+

Order Title

+
+
+
+
+
Order Detail
+
+
+
+
+
+
+
+
+

Order ID

+
+
+
+
> +
+

Partner Order ID

+
+
+
+
+
+

Trade Time

+
+
+
+ +
+
+ Agree + Disagree +
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/refund_audit_list.html b/src/main/resources/templates/refund_audit_list.html index caa80d3f7..e22435b49 100644 --- a/src/main/resources/templates/refund_audit_list.html +++ b/src/main/resources/templates/refund_audit_list.html @@ -1,7 +1,7 @@ - Payment Notice + Refund Auditions List @@ -17,9 +17,9 @@
-
-
- +
+
+

@@ -31,16 +31,15 @@

There is no refund applies at the moment!

- asdlkjasd
- diff --git a/src/main/ui/static/templates/refund_audit.js b/src/main/ui/static/templates/refund_audit.js index 97fafdb7e..1a40bf358 100644 --- a/src/main/ui/static/templates/refund_audit.js +++ b/src/main/ui/static/templates/refund_audit.js @@ -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',