From dbc0af8bdae271c68969988dfb9a369fb8a3e302 Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 18 Jul 2019 10:30:05 +0800 Subject: [PATCH 1/9] =?UTF-8?q?fix=20=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E6=98=BE=E7=A4=BAclient=20payment=20info?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/manage.html | 19 ++++++++++++++++++- .../templates/partner_payment_info.html | 16 ++++++++-------- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html index 615b152f1..389d60348 100644 --- a/src/main/ui/manage.html +++ b/src/main/ui/manage.html @@ -330,7 +330,7 @@ margin-bottom: 10%;"/> -
  • +

  • 交易管理|Transaction @@ -904,6 +904,23 @@ margin-bottom: 10%;"/>

    • + +
  • +

    + 机构管理|OrgManager + + + +

    + +
    • diff --git a/src/main/ui/static/payment/partner/templates/partner_payment_info.html b/src/main/ui/static/payment/partner/templates/partner_payment_info.html index 3ac68bc59..212398f7f 100644 --- a/src/main/ui/static/payment/partner/templates/partner_payment_info.html +++ b/src/main/ui/static/payment/partner/templates/partner_payment_info.html @@ -470,7 +470,7 @@ -
    +
    Retail In Store Payment(App, WePayLite, Albert)
    @@ -496,7 +496,7 @@
    Refund
    -
    +
    -
    +
    -
    +
    Order Config
    -
    +
    -
    +
    -
    +
    Payment Page
    -
    +
    From 24f9b6d23f8bf84340a7201b1982d1e5fb30ac42 Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 18 Jul 2019 10:54:24 +0800 Subject: [PATCH 2/9] =?UTF-8?q?fix=20=E6=96=B0=E5=BB=BA=E8=B4=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/static/config/managers/templates/new_manager.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/ui/static/config/managers/templates/new_manager.html b/src/main/ui/static/config/managers/templates/new_manager.html index 733191e99..dbfbebff9 100644 --- a/src/main/ui/static/config/managers/templates/new_manager.html +++ b/src/main/ui/static/config/managers/templates/new_manager.html @@ -123,7 +123,7 @@

    -
    +

    +
    + + +
    需要报备的商户编码

    From 0f0f7a7b2030e245732af545af93ef8e37ce1bf6 Mon Sep 17 00:00:00 2001 From: yixian Date: Thu, 18 Jul 2019 17:12:40 +0800 Subject: [PATCH 4/9] test unit --- .../SettleRemarkTemplateDescriberTest.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/test/java/au/com/royalpay/payment/manage/support/abafile/SettleRemarkTemplateDescriberTest.java b/src/test/java/au/com/royalpay/payment/manage/support/abafile/SettleRemarkTemplateDescriberTest.java index 82cfcd2df..7ba990ab5 100644 --- a/src/test/java/au/com/royalpay/payment/manage/support/abafile/SettleRemarkTemplateDescriberTest.java +++ b/src/test/java/au/com/royalpay/payment/manage/support/abafile/SettleRemarkTemplateDescriberTest.java @@ -1,6 +1,8 @@ package au.com.royalpay.payment.manage.support.abafile; import com.alibaba.fastjson.JSONObject; +import org.joda.time.DateTime; +import org.junit.Assert; import org.junit.Test; import java.util.Date; @@ -16,8 +18,17 @@ public class SettleRemarkTemplateDescriberTest { public void compile() { JSONObject settle = new JSONObject(); settle.put("client_moniker", "PINE"); - SettleRemarkTemplateDescriber describer = new SettleRemarkTemplateDescriber("RoyalPay{date(MMdd)}{moniker}", settle, new Date()); + SettleRemarkTemplateDescriber describer = new SettleRemarkTemplateDescriber("RoyalPay{date(MMdd)}{moniker}", settle, DateTime.parse("2019-07-18").toDate()); String result = describer.compile(); - System.out.println(result); + Assert.assertEquals("RoyalPay0718PINE", result); + } + + @Test + public void compile2() { + JSONObject settle = new JSONObject(); + settle.put("client_moniker", "AUPO"); + SettleRemarkTemplateDescriber describer = new SettleRemarkTemplateDescriber("Pay By App {date(ddMMyy)}", settle, DateTime.parse("2019-07-18").toDate()); + String res = describer.compile(); + Assert.assertEquals("Pay By App 180719", res); } } \ No newline at end of file From 27bbad34e349b64849c0f0c39416dd2e310d5f50 Mon Sep 17 00:00:00 2001 From: luoyang Date: Sat, 20 Jul 2019 19:58:35 +0800 Subject: [PATCH 5/9] =?UTF-8?q?fix=20=E7=BB=84=E7=BB=87=E5=90=88=E4=BC=99?= =?UTF-8?q?=E4=BA=BA=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/static/config/managers/templates/new_manager.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/ui/static/config/managers/templates/new_manager.html b/src/main/ui/static/config/managers/templates/new_manager.html index dbfbebff9..811f571cc 100644 --- a/src/main/ui/static/config/managers/templates/new_manager.html +++ b/src/main/ui/static/config/managers/templates/new_manager.html @@ -129,7 +129,7 @@ -