diff --git a/src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java b/src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java index 39009ee7d..a536f7ed8 100644 --- a/src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java +++ b/src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java @@ -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 { 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 26d81f8e2..33c191e34 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,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 auditions = refundAuditionMapper.listAuditingRefundsOfClient(clientId); + res.put("auditions", auditions); + res.put("counts", auditions.size()); return res; } diff --git a/src/main/resources/templates/manager_bind_success.html b/src/main/resources/templates/manager_bind_success.html index c0470987d..f83b8c260 100644 --- a/src/main/resources/templates/manager_bind_success.html +++ b/src/main/resources/templates/manager_bind_success.html @@ -14,7 +14,7 @@ -
-
Success +
+
Success +
\ No newline at end of file diff --git a/src/main/resources/templates/refund_audit.html b/src/main/resources/templates/refund_audit.html index ffa7abb40..62698590c 100644 --- a/src/main/resources/templates/refund_audit.html +++ b/src/main/resources/templates/refund_audit.html @@ -13,8 +13,8 @@ white-space: normal } - @@ -39,81 +39,69 @@

Submitting...

-
-
-
-
-

Refund Audition

+
+
+
+
+

Order Fee

+
[[${order['currency']}]] [[${order['customer_payment_amount']}]]
-
-
-
-
-
-
-
-

Order Fee

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

Refund Fee

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

Refund Fee

-
-
-

Applyer

-
-
-
-
-
-

Apply Time

-
-
+
[[${refund['currency']}]] [[${refund['amount']}]]
+
+
+
+

Applyer

-
-
-

Order Title

-
-
+
+
+
+
+

Apply Time

+
-
Order Detail
-
-
-
+
+
+

Order Title

+
-
-
-
-

Order ID

-
-
+
+
+

>Order Detail<

-
> -
-

Partner Order ID

-
-
+
>
+
+
+
+

Order ID

-
-
-

Trade Time

-
-
+
+
+
> +
+

Partner Order ID

- +
-
- Agree - Disagree +
+
+

Apply 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 9594626d9..73ea5e5a3 100644 --- a/src/main/resources/templates/refund_audit_list.html +++ b/src/main/resources/templates/refund_audit_list.html @@ -8,9 +8,26 @@ @@ -28,23 +45,30 @@
-

There is no refund applies at the moment!

+
+
+ Refund audit completed! +
+
-
- +
You have refunds pending review
+
+ +
+

+
+
+
+
+ +
\ No newline at end of file diff --git a/src/main/ui/static/images/completed.png b/src/main/ui/static/images/completed.png new file mode 100644 index 000000000..a51426bf6 Binary files /dev/null and b/src/main/ui/static/images/completed.png differ diff --git a/src/main/ui/static/templates/refund_audit.js b/src/main/ui/static/templates/refund_audit.js index 1a40bf358..abfb58aac 100644 --- a/src/main/ui/static/templates/refund_audit.js +++ b/src/main/ui/static/templates/refund_audit.js @@ -3,6 +3,7 @@ */ $(function () { 'use strict'; + function audit(pass) { var wdiv = $('#wdiv'); wdiv.show();