From ae8ea53870be271fef9d686133a4391640ff9280 Mon Sep 17 00:00:00 2001 From: yuan <1551130722@qq.com> Date: Fri, 20 Apr 2018 14:43:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E7=AE=A1=E7=90=86=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0suburb=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payment/manage/merchants/beans/PartnerQuery.java | 12 ++++++++++++ .../payment/manage/mappers/system/ClientMapper.xml | 4 ++++ .../static/payment/partner/templates/partners.html | 10 ++++++++++ 3 files changed, 26 insertions(+) diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/PartnerQuery.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/PartnerQuery.java index bf49ecdb6..56e39c370 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/PartnerQuery.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/PartnerQuery.java @@ -19,6 +19,7 @@ public class PartnerQuery { private String searchText; private String client_moniker; private String state; + private String suburb; private String short_name; private String sub_merchant_id; private String org_id; @@ -105,6 +106,9 @@ public class PartnerQuery { if (StringUtils.isNotBlank(state)) { param.put("state", state); } + if (StringUtils.isNotBlank(suburb)) { + param.put("suburb", suburb); + } if (StringUtils.isNotBlank(searchText)) { param.put("search_text", searchText); if (StringUtils.isNotBlank(textType)) { @@ -460,4 +464,12 @@ public class PartnerQuery { public void setMerchant_id(String merchant_id) { this.merchant_id = merchant_id; } + + public String getSuburb() { + return suburb; + } + + public void setSuburb(String suburb) { + this.suburb = suburb; + } } diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml index f84a21e55..9fdde49bc 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml @@ -100,6 +100,10 @@ and c.short_name like #{short_name_pattern} + + + and c.suburb like #{suburb_pattern} + and ((c.approve_result=4 and c.open_status is null) or (c.approve_result=3 and c.open_status is null) or c.open_status=1 or c.open_status=2 or c.open_status=4) diff --git a/src/main/ui/static/payment/partner/templates/partners.html b/src/main/ui/static/payment/partner/templates/partners.html index 5b97b8e71..ea6f15944 100644 --- a/src/main/ui/static/payment/partner/templates/partners.html +++ b/src/main/ui/static/payment/partner/templates/partners.html @@ -148,6 +148,16 @@ + +
+ +
+ +
+