From 41be5a173b61a619f6610d11ba86890815eacd92 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 18 Jul 2019 10:31:40 +0800
Subject: [PATCH 1/4] =?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%;"/>
                     </ul>
                 </li>
 
-                <li class="menu-group" ng-if="roleNow!=null && roleNow!='administrator' && roleNow!='developer'">
+                <li class="menu-group" ng-if="roleNow!=null && roleNow!='administrator' && roleNow!='developer'&& roleNow!='orgmanager'">
                     <p role="button" ng-class="{'active': Transaction,'is-hide':hideSideBar}" ng-click="Transaction = !Transaction">
                         <span>交易管理|Transaction</span>
                         <span class="pull-right-container">
@@ -904,6 +904,23 @@ margin-bottom: 10%;"/>
                         </li>
                     </ul>
                 </li>
+
+                <li class="menu-group" ng-if="roleNow=='orgmanager'">
+                    <p role="button" ng-class="{'active': OrgManager,'is-hide':hideSideBar}" ng-click="OrgManager = !OrgManager">
+                        <span>机构管理|OrgManager</span>
+                        <span class="pull-right-container">
+                            <i class="fa fa-angle-down pull-right"></i>
+                        </span>
+                    </p>
+                    <ul class="sidebar-menu" ng-class="{'active':OrgManager}">
+                        <li ui-sref-active="active" ng-if="('1000000000000'|withRole) && roleNow=='orgmanager'">
+                            <a ui-sref="organizations">
+                                <i class="fa fa-users"></i> <span>组织管理|Organizations</span>
+                            </a>
+                        </li>
+
+                    </ul>
+                </li>
             </ul>
 
         </section>
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 @@
         </div>
     </div>
 </div>
-<div class="panel panel-default">
+<div class="panel panel-default" ng-if="('111'|withRole) || ('retail_surcharge'|withFunc)">
     <div class="panel-heading">Retail In Store Payment(App, WePayLite, Albert)</div>
     <div class="panel-body">
         <div class="form-horizontal">
@@ -496,7 +496,7 @@
     <div class="panel-heading">Refund </div>
     <div class="panel-body">
         <div class="form-horizontal">
-            <div class="form-group" ng-if="'111'|withRole">
+            <div class="form-group" ng-if="'1000000000111'|withRole">
                 <label class="col-sm-2 control-label">Enable Refund</label>
                 <div class="col-sm-10">
                     <input type="checkbox" ng-model="paymentInfo.enable_refund" bs-switch
@@ -504,7 +504,7 @@
                 </div>
             </div>
 
-            <div class="form-group" ng-if="'1'|withRole">
+            <div class="form-group" ng-if="'1000000000001'|withRole">
                 <label class="col-sm-2 control-label">Enable Pre-authorize Refund</label>
                 <div class="col-sm-10">
                     <input type="checkbox" ng-model="paymentInfo.enable_pre_refund" bs-switch
@@ -567,18 +567,18 @@
 </div>
 
 
-<div class="panel panel-default">
+<div class="panel panel-default" ng-if="'1000000000111'|withRole">
     <div class="panel-heading">Order Config</div>
     <div class="panel-body">
         <div class="form-horizontal">
-            <div class="form-group" ng-if="'111'|withRole">
+            <div class="form-group" ng-if="'1000000000111'|withRole">
                 <label class="col-sm-2 control-label">Require Customer Information</label>
                 <div class="col-sm-10">
                     <input type="checkbox" ng-model="paymentInfo.require_custinfo" bs-switch
                            switch-change="toggleRequireCustInfo()">
                 </div>
             </div>
-            <div class="form-group" ng-if="'111'|withRole">
+            <div class="form-group" ng-if="'1000000000111'|withRole">
                 <label class="col-sm-2 control-label">Require Remark</label>
                 <div class="col-sm-10">
                     <input type="checkbox" ng-model="paymentInfo.require_remark" bs-switch
@@ -590,10 +590,10 @@
 </div>
 
 
-<div class="panel panel-default">
+<div class="panel panel-default" ng-if="'1000000000111'|withRole">
     <div class="panel-heading">Payment Page</div>
     <div class="panel-body">
-        <div class="form-horizontal" ng-if="'111'|withRole">
+        <div class="form-horizontal" ng-if="'1000000000111'|withRole">
             <div class="form-group col-sm-6">
                 <label class="col-sm-4 control-label">Select Version</label>
                 <div class="col-sm-6">

From 6089228f38c776dcc6bb99aa20143486d0b2ce8a Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 18 Jul 2019 10:53:39 +0800
Subject: [PATCH 2/4] =?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 @@
                         <!--</label>-->
                     </p>
                 </div>
-                <div class="form-group" ng-if="!currentUser.org_id &&isOrg">
+                <div class="form-group" ng-if="currentUser.org_id!=1 &&isOrg">
                     <label class="control-label">Roles</label>
                     <p class="checkbox checkbox-inline">
                         <label ng-if="!manager.admin && !manager.operator">

From 92bae223be0817443a8e1be03ba2c93260c36461 Mon Sep 17 00:00:00 2001
From: yixian <davepotter@163.com>
Date: Thu, 18 Jul 2019 17:05:10 +0800
Subject: [PATCH 3/4] abafile remark template

---
 pom.xml                                       |  2 +-
 src/db/1.0.21/update.sql                      |  3 +
 .../clearing/core/impl/CleanServiceImpl.java  | 13 ++-
 .../SettleRemarkTemplateDescriber.java        | 93 +++++++++++++++++++
 .../SettleRemarkTemplateDescriberTest.java    | 23 +++++
 5 files changed, 131 insertions(+), 3 deletions(-)
 create mode 100644 src/db/1.0.21/update.sql
 create mode 100644 src/main/java/au/com/royalpay/payment/manage/support/abafile/SettleRemarkTemplateDescriber.java
 create mode 100644 src/test/java/au/com/royalpay/payment/manage/support/abafile/SettleRemarkTemplateDescriberTest.java

diff --git a/pom.xml b/pom.xml
index 8b9c8d116..8644ecb65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
-    <version>1.0.20</version>
+    <version>1.0.21</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/db/1.0.21/update.sql b/src/db/1.0.21/update.sql
new file mode 100644
index 000000000..1d0d616f3
--- /dev/null
+++ b/src/db/1.0.21/update.sql
@@ -0,0 +1,3 @@
+alter table sys_clients add column settle_remark_tpl varchar(100) null default null after settle_hour;
+
+insert into sys_configs values ('settle.remark_template','RoyalPay{date(MMdd)}{moniker}','清算文件备注模板');
\ No newline at end of file
diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
index b89d40a3e..5a4786462 100644
--- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
@@ -16,6 +16,7 @@ import au.com.royalpay.payment.manage.signin.core.ManagerTodoNoticeProvider;
 import au.com.royalpay.payment.manage.support.abafile.ABAConfig;
 import au.com.royalpay.payment.manage.support.abafile.ABAFile;
 import au.com.royalpay.payment.manage.support.abafile.ABATemplate;
+import au.com.royalpay.payment.manage.support.abafile.SettleRemarkTemplateDescriber;
 import au.com.royalpay.payment.manage.tradelog.beans.ClearingLogQuery;
 import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApi;
 import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApiProvider;
@@ -528,8 +529,16 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
             if (settle.getBigDecimal("clearing_amount").compareTo(BigDecimal.ZERO) == 0) {
                 continue;
             }
-            String clientMoniker = settle.getString("client_moniker");
-            String remark = "RoyalPay" + DateFormatUtils.format(dt, "MMdd") + clientMoniker;
+            JSONObject client = clientManager.getClientInfo(settle.getIntValue("client_id"));
+            String remarkTpl = client.getString("settle_remark_tpl");
+            if (StringUtils.isEmpty(remarkTpl)) {
+                remarkTpl = sysConfigManager.getSysConfig().getString("settle.remark_template");
+                if (StringUtils.isEmpty(remarkTpl)) {
+                    remarkTpl = "RoyalPay{date(MMdd)}{moniker}";
+                }
+            }
+
+            String remark = new SettleRemarkTemplateDescriber(remarkTpl, settle, dt).compile();
             aba.addSettleMerchant(settle.getString("bsb_no"), settle.getString("account_no"), settle.getString("account_name"),
                     settle.getBigDecimal("clearing_amount"), remark);
         }
diff --git a/src/main/java/au/com/royalpay/payment/manage/support/abafile/SettleRemarkTemplateDescriber.java b/src/main/java/au/com/royalpay/payment/manage/support/abafile/SettleRemarkTemplateDescriber.java
new file mode 100644
index 000000000..dc5554675
--- /dev/null
+++ b/src/main/java/au/com/royalpay/payment/manage/support/abafile/SettleRemarkTemplateDescriber.java
@@ -0,0 +1,93 @@
+package au.com.royalpay.payment.manage.support.abafile;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Create by davep at 2019-07-18 15:20
+ */
+public class SettleRemarkTemplateDescriber {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+    private final Pattern pattern = Pattern.compile("\\{[^\\{\\}]+\\}");
+    private final JSONObject settle;
+    private final Date settleDate;
+    private String template;
+    private List<Replacer> replacers;
+
+    public SettleRemarkTemplateDescriber(String template, JSONObject settle, Date settleDate) {
+        this.template = template;
+        this.settle = settle;
+        this.settleDate = settleDate;
+        replacers = new ArrayList<>();
+        replacers.add(new ClientMonikerReplacer());
+        replacers.add(new SettleDateReplacer());
+    }
+
+    public String compile() {
+        Matcher matcher = pattern.matcher(template);
+        StringBuilder target = new StringBuilder();
+        int startPos = 0;
+        while (matcher.find()) {
+            int start = matcher.start();
+            int end = matcher.end();
+            target.append(template, startPos, start);
+            String group = StringUtils.substring(matcher.group(), 1, -1);
+            String replacement = replacers.stream().filter(replacer -> replacer.match(group))
+                    .limit(1)
+                    .map(replacer -> replacer.replacement(group, SettleRemarkTemplateDescriber.this))
+                    .findFirst().orElse("");
+            target.append(replacement);
+            startPos = end;
+        }
+        target.append(template.substring(startPos));
+        return target.toString();
+    }
+
+    interface Replacer {
+        boolean match(String group);
+
+        String replacement(String group, SettleRemarkTemplateDescriber describer);
+    }
+
+    class ClientMonikerReplacer implements Replacer {
+
+        @Override
+        public boolean match(String group) {
+            return "moniker".equals(group);
+        }
+
+        @Override
+        public String replacement(String group, SettleRemarkTemplateDescriber describer) {
+            return describer.settle.getString("client_moniker");
+        }
+    }
+
+    class SettleDateReplacer implements Replacer {
+        private final String regex = "^date\\((\\w+)\\)$";
+
+        @Override
+        public boolean match(String group) {
+            return group.matches(regex);
+        }
+
+        @Override
+        public String replacement(String group, SettleRemarkTemplateDescriber describer) {
+            Pattern dtPattern = Pattern.compile(regex);
+            Matcher matcher = dtPattern.matcher(group);
+            if (matcher.find()) {
+                String datePattern = matcher.group(1);
+                return DateFormatUtils.format(describer.settleDate, datePattern);
+            }
+            return "";
+        }
+    }
+}
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
new file mode 100644
index 000000000..82cfcd2df
--- /dev/null
+++ b/src/test/java/au/com/royalpay/payment/manage/support/abafile/SettleRemarkTemplateDescriberTest.java
@@ -0,0 +1,23 @@
+package au.com.royalpay.payment.manage.support.abafile;
+
+import com.alibaba.fastjson.JSONObject;
+import org.junit.Test;
+
+import java.util.Date;
+
+import static org.junit.Assert.*;
+
+/**
+ * Create by davep at 2019-07-18 15:27
+ */
+public class SettleRemarkTemplateDescriberTest {
+
+    @Test
+    public void compile() {
+        JSONObject settle = new JSONObject();
+        settle.put("client_moniker", "PINE");
+        SettleRemarkTemplateDescriber describer = new SettleRemarkTemplateDescriber("RoyalPay{date(MMdd)}{moniker}", settle, new Date());
+        String result = describer.compile();
+        System.out.println(result);
+    }
+}
\ No newline at end of file

From 0f0f7a7b2030e245732af545af93ef8e37ce1bf6 Mon Sep 17 00:00:00 2001
From: yixian <davepotter@163.com>
Date: Thu, 18 Jul 2019 17:12:40 +0800
Subject: [PATCH 4/4] 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