From e32493f654f992efcd608304c107542520b1ea64 Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 27 Feb 2020 11:44:26 +0800 Subject: [PATCH 01/11] =?UTF-8?q?add=20=E8=B7=A8=E5=A2=83=E5=95=86?= =?UTF-8?q?=E5=9F=8ERP=E4=BB=98=E8=B4=B9=E6=89=A3=E6=AC=BE=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=89=A3=E6=AC=BE=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../core/impl/RServicesApplyServiceImpl.java | 26 +++++++++++++++++++ .../manage/mappers/payment/OrderMapper.xml | 3 ++- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index eef42473c..980a5eab5 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.3.62 + 1.3.65 UTF-8 1.8.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/rservices/core/impl/RServicesApplyServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/rservices/core/impl/RServicesApplyServiceImpl.java index 85e3afa83..5d7a07efa 100644 --- a/src/main/java/au/com/royalpay/payment/manage/rservices/core/impl/RServicesApplyServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/rservices/core/impl/RServicesApplyServiceImpl.java @@ -1,6 +1,7 @@ package au.com.royalpay.payment.manage.rservices.core.impl; import au.com.royalpay.payment.core.TransactionService; +import au.com.royalpay.payment.core.mappers.PmtOrderMapper; import au.com.royalpay.payment.manage.appclient.core.RetailAppService; import au.com.royalpay.payment.manage.mappers.system.ClientAccountMapper; import au.com.royalpay.payment.manage.mappers.system.ClientIncrementalMapper; @@ -64,6 +65,8 @@ public class RServicesApplyServiceImpl implements RServicesApplyService { private MailService mailService; @Resource private ClientIncrementalMapper clientIncrementalMapper; + @Resource + private PmtOrderMapper pmtOrderMapper; @Override public JSONObject getServicesApply(RServicesApplyQuery applyQuery) { @@ -157,6 +160,29 @@ public class RServicesApplyServiceImpl implements RServicesApplyService { transaction.put("remark", applyInfo.getString("service_code") + ":" + applyInfo.getString("title")); transaction.put("system_generate", 1); transactionService.saveTransaction(transaction); + JSONObject order = new JSONObject(); + order.put("order_id", orderId); + order.put("org_id", client.getIntValue("org_id")); + order.put("client_id", applyInfo.getIntValue("client_id")); + order.put("transaction_date", new Date()); + order.put("order_description", applyInfo.getString("title")); + order.put("order_detail", applyInfo.getString("title")); + order.put("currency", "AUD"); + order.put("display_amount", applyInfo.getBigDecimal("amount")); + order.put("total_amount", applyInfo.getBigDecimal("amount")); + order.put("coupon_payment_amount", 0); + order.put("customer_payment_amount", applyInfo.getBigDecimal("amount")); + order.put("refund_amount", applyInfo.getBigDecimal("amount")); + order.put("customer_ip", "0.0.0.0"); + order.put("surcharge_rate", "0"); + order.put("create_time", new Date()); + order.put("expire_time", new Date()); + order.put("confirm_time", new Date()); + order.put("gateway", 0); + order.put("status", 7); + order.put("channel", "System"); + pmtOrderMapper.save(order); + sendNotify(applyInfo, client); } diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml index bbcb11c6c..4777e7c9c 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml @@ -922,7 +922,8 @@ t.settle_amount, t.clearing_status = 2 pre_auth from pmt_orders o - left join pmt_transactions t on t.order_id=o.order_id and t.channel!='Settlement' and t.system_generate=0 + left join pmt_transactions t on t.order_id=o.order_id and t.channel!='Settlement' + AND (t.system_generate = 0 or (t.system_generate = 1 and t.remark like '%RYCBSM%')) AND o.client_id IN From 3cc9623569e882479fc2d27d24ea714bbd889a06 Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 27 Feb 2020 17:33:50 +0800 Subject: [PATCH 02/11] =?UTF-8?q?fix=20=E8=B7=A8=E5=A2=83=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../core/impls/RetailAppServiceImp.java | 2 +- src/main/ui/login.html | 3 +- src/main/ui/login_v1.html | 3 +- .../partner-incremental-service.js | 8 ++-- .../partner_incremental_service.html | 41 +++++++++++++++---- .../partner_incremental_service_info.html | 2 - 7 files changed, 40 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index 980a5eab5..e5b8ca2b2 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.3.65 + 1.3.66 UTF-8 1.8.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index 108bcf969..5265493aa 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -3071,7 +3071,7 @@ public class RetailAppServiceImp implements RetailAppService { private boolean geekShowActVersion(String version) { boolean result = false; - String geekShowVersion = "2.10.11"; + String geekShowVersion = "2.12.11"; String[] nowAppVersion = version.split("\\."); String[] geekVersion = geekShowVersion.split("\\."); for (int i = 0; i < geekVersion.length; i++) { diff --git a/src/main/ui/login.html b/src/main/ui/login.html index 942c6f54c..6481fe9af 100644 --- a/src/main/ui/login.html +++ b/src/main/ui/login.html @@ -362,8 +362,7 @@ method: 'get', success: function (res) { url += res.token; - window.open(url, '_blank'); - location.href = '/index.html'; + location.href = url; }, error: function (resp) { console.log(resp.message) diff --git a/src/main/ui/login_v1.html b/src/main/ui/login_v1.html index e4da93947..a7d2ae33f 100644 --- a/src/main/ui/login_v1.html +++ b/src/main/ui/login_v1.html @@ -343,8 +343,7 @@ method: 'get', success: function (res) { url += res.token; - window.open(url, '_blank'); - location.href = '/index.html'; + location.href = url; }, error: function (resp) { console.log(resp.message) diff --git a/src/main/ui/static/incrementalService/partner-incremental-service.js b/src/main/ui/static/incrementalService/partner-incremental-service.js index 0b9d80a1a..544a398c6 100644 --- a/src/main/ui/static/incrementalService/partner-incremental-service.js +++ b/src/main/ui/static/incrementalService/partner-incremental-service.js @@ -46,10 +46,10 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) { var url = "https://mch.royalpay.com.au/#/sso_login?token="; $http.get("/client/partner_info/incremental_service/RYCBSM/login_token").then(function (res) { url += res.data.token; - window.open(url, '_blank'); + location.href = url; }, function (resp) { console.log(resp.data.message) - window.open("https://mch.geekforbest.com/#/login", '_blank'); + location.href = "https://mch.geekforbest.com/#/login"; }); }; @@ -95,10 +95,10 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) { var url = "https://mch.royalpay.com.au/#/sso_login?token="; $http.get("/client/partner_info/incremental_service/RYCBSM/login_token").then(function (res) { url += res.data.token; - window.open(url, '_blank'); + location.href = url; }, function (resp) { console.log(resp.data.message) - window.open("https://mch.geekforbest.com/#/login", '_blank'); + location.href = "https://mch.geekforbest.com/#/login"; }); }; diff --git a/src/main/ui/static/incrementalService/templates/partner_incremental_service.html b/src/main/ui/static/incrementalService/templates/partner_incremental_service.html index bcc9316f0..0b5656eef 100644 --- a/src/main/ui/static/incrementalService/templates/partner_incremental_service.html +++ b/src/main/ui/static/incrementalService/templates/partner_incremental_service.html @@ -109,12 +109,23 @@ {{service.is_valid?'已启用':'未启用' }} -
+
@@ -147,14 +158,26 @@ 一站式跨境进口电商SaaS平台，帮您快速构建自己的品牌自营商城系统，直达10亿+中国消费者，快速实现获客和交易变现。 -
- - 查看详情 - + +
diff --git a/src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html b/src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html index 72859b52f..678a51955 100644 --- a/src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html +++ b/src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html @@ -84,8 +84,6 @@ {{serviceInfo.channel}} Service Info - 前去跨境商城
  1. From 90aeded68c7dc93f43c9dfb910145b784d82a917 Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 27 Feb 2020 17:35:02 +0800 Subject: [PATCH 03/11] =?UTF-8?q?fix=20=E8=B7=A8=E5=A2=83=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/appclient/core/impls/RetailAppServiceImp.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index e5b8ca2b2..0df81feea 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.3.66 + 1.3.67 UTF-8 1.8.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index 5265493aa..25bfd5fa3 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -3071,11 +3071,11 @@ public class RetailAppServiceImp implements RetailAppService { private boolean geekShowActVersion(String version) { boolean result = false; - String geekShowVersion = "2.12.11"; + String geekShowVersion = "2.12.10"; String[] nowAppVersion = version.split("\\."); String[] geekVersion = geekShowVersion.split("\\."); for (int i = 0; i < geekVersion.length; i++) { - if (Integer.parseInt(nowAppVersion[i]) >= Integer.parseInt(geekVersion[i])) { + if (Integer.parseInt(nowAppVersion[i]) > Integer.parseInt(geekVersion[i])) { result = true; } } From 1088e2bbdc7d84699ce3fd869155e86f8e32be72 Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 28 Feb 2020 14:10:49 +0800 Subject: [PATCH 04/11] =?UTF-8?q?fix=20app=20=E5=BC=B9=E7=AA=97=E6=AC=A1?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++-- .../core/impls/RetailAppServiceImp.java | 12 +++++------- .../impls/CityPartnerPrizeServiceImplTest.java | 16 +++++++--------- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 0df81feea..344a0e40a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ au.com.royalpay.payment payment-parent - 1.1.12 + 1.1.13 4.0.0 manage - 1.3.67 + 1.3.72 UTF-8 1.8.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index 25bfd5fa3..b1dc36644 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -1583,9 +1583,6 @@ public class RetailAppServiceImp implements RetailAppService { JSONObject latestAct = appActService.getAppActPopup(); if (latestAct != null) { - if (accountIsRead(device.getString("account_id"), latestAct)) { - return result; - } latestAct.put("id", latestAct.getString("act_id")); latestAct.put("url", latestAct.getString("act_url")); latestAct.put("title", latestAct.getString("act_name")); @@ -1601,6 +1598,9 @@ public class RetailAppServiceImp implements RetailAppService { return result; } } + if (accountIsRead(device.getString("account_id"), latestAct)) { + return result; + } latestAct.remove("act_id"); latestAct.remove("act_name"); latestAct.remove("act_url"); @@ -1769,10 +1769,8 @@ public class RetailAppServiceImp implements RetailAppService { List newActs = new ArrayList<>(); for (JSONObject act : JSON.parseArray(acts.toJSONString(), JSONObject.class)) { if (act.getString("page_desc") != null && !act.getString("page_desc").equals("0")) { - JSONObject reference = act.getJSONObject("reference"); - String geekUrl = "https://opt.royalpay.com.au/geekforbest/v1/operation/purpose_apply/index?source=app"; - if (reference != null && StringUtils.isNotBlank(reference.getString("url")) - && StringUtils.equalsIgnoreCase(geekUrl, reference.getString("url"))) { + logger.info("app get banner{}-{}", device.getIntValue("client_id"), act.toJSONString()); + if (StringUtils.equalsIgnoreCase(act.getString("page_keywords"), "RYCBSM")) { if (geekShowActVersion(device.getString("version"))) { newActs.add(act); } diff --git a/src/test/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImplTest.java b/src/test/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImplTest.java index 13ff97c55..0724d80a0 100644 --- a/src/test/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImplTest.java +++ b/src/test/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImplTest.java @@ -81,8 +81,6 @@ public class CityPartnerPrizeServiceImplTest { put("client_pay_type", "2"); put("client_pay_desc", "201"); put("royalpay_industry", "10001"); - put("wechat_industry", "339"); - put("alipay_industry", "4511"); put("company_photo", "https://c-ssl.duitang.com/uploads/item/201812/10/20181210170153_xPUVk.jpeg"); put("store_photo", "https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=3199241964,979639112&fm=26&gp=0.jpg"); put("company_website", "https://11.com"); @@ -120,7 +118,7 @@ public class CityPartnerPrizeServiceImplTest { JSONObject params = new JSONObject() {{ - put("apply_id", "orgapply1"); + put("apply_id", "orgtestadmin4"); put("notify_url", "http://127.0.0.1:9002/sys/partners/7CMV/qrcode"); put("company_info", companyInfo); put("contact_info", contactInfo); @@ -129,7 +127,7 @@ public class CityPartnerPrizeServiceImplTest { put("settle_info", settleConfig); put("compliance_file_info", complianceInfo); }}; - String originUrl = "https://mpay.royalpay.com.au/api/v1.0/org_gateway/partner/AXLCEXDDMB/merchant/application"; + String originUrl = "https://sandbox.royalpay.com.au/api/v1.0/org_gateway/partner/RE2ZLPEAZL/merchant/application"; String url = addSignUrl(originUrl, params, PRIKEY); HttpRequestGenerator gen = new HttpRequestGenerator(url, RequestMethod.POST); gen.setJSONEntity(params); @@ -145,8 +143,8 @@ public class CityPartnerPrizeServiceImplTest { @Test public void queryMerchantStatus() throws Exception{ - String partnerCode = "PBAR"; - String originUrl = "https://mpay.royalpay.com.au/api/v1.0/org_gateway/partner/AXLCEXDDMB/merchant/" + partnerCode + "/status"; + String partnerCode = "PHQ3"; + String originUrl = "https://sandbox.royalpay.com.au/api/v1.0/org_gateway/partner/RE2ZLPEAZL/merchant/" + partnerCode + "/status"; String url = addSignUrl(originUrl, null, PRIKEY); HttpRequestGenerator gen = new HttpRequestGenerator(url, RequestMethod.GET); HttpRequestResult result = gen.execute(); @@ -159,13 +157,13 @@ public class CityPartnerPrizeServiceImplTest { @Test public void updateFile() throws Exception{ - String originUrl = "https://mpay.royalpay.com.au/api/v1.0/org_gateway/partner/RQ6CJ4CGJZ/attachment/files"; + String originUrl = "https://sandbox.royalpay.com.au/api/v1.0/org_gateway/partner/RE2ZLPEAZL/attachment/files"; String url = addSignUrl(originUrl, null, PRIKEY); - File file = new File("/Users/luoyang/Downloads/121.jpg"); + File file = new File("/Users/luoyang/Downloads/banner_eshop.jpg"); InputStream stream = new FileInputStream(file); HttpRequestGenerator gen = new HttpRequestGenerator(url, RequestMethod.POST); gen.setTimeout(10000); - gen.initFileEntity().attachFile("file", "121.jpg", stream); + gen.initFileEntity().attachFile("file", "banner_eshop.jpg", stream); HttpRequestResult result = gen.execute(); if (result.isSuccess()) { System.out.println(result.getResponseContentJSONObj().toJSONString()); From 370ea700ea6bece6a597a87499b95b36061e8933 Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 28 Feb 2020 15:48:34 +0800 Subject: [PATCH 05/11] fix app boolean int --- pom.xml | 2 +- .../royalpay/payment/manage/mappers/payment/OrderMapper.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 344a0e40a..4a5a017bd 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.3.72 + 1.3.73 UTF-8 1.8.0 diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml index 4777e7c9c..6aa7d2669 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml @@ -920,7 +920,8 @@ t.exchange_rate, t.clearing_status, t.settle_amount, - t.clearing_status = 2 pre_auth + t.clearing_status = 2 pre_auth, + IF( t.remark like '%RYCBSM%',TRUE,FALSE) as geek_apply_deduction from pmt_orders o left join pmt_transactions t on t.order_id=o.order_id and t.channel!='Settlement' AND (t.system_generate = 0 or (t.system_generate = 1 and t.remark like '%RYCBSM%')) From 85e0ae4a503b41c6413de3aa64cdee979dc2f045 Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 28 Feb 2020 18:09:46 +0800 Subject: [PATCH 06/11] fix app boolean int --- pom.xml | 2 +- .../manage/appclient/core/impls/RetailAppServiceImp.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4a5a017bd..922716036 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.3.73 + 1.3.74 UTF-8 1.8.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index b1dc36644..84301c7bf 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -985,6 +985,7 @@ public class RetailAppServiceImp implements RetailAppService { TimeZoneUtils.switchTimeZone(orders, query.getTimezone(), "create_time", "transaction_time", "confirm_time"); ArrayList dateContains = new ArrayList<>(); for (JSONObject order : orders) { + order.put("geek_apply_deduction", order.getBooleanValue("geek_apply_deduction")); Calendar calendar = (Calendar) order.get("transaction_time"); if (timezone != null) { calendar.setTimeZone(TimeZone.getTimeZone(timezone)); From e4a0a4ebfae0ce18593d1c3bb0d2bf22ceecfc7b Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 28 Feb 2020 19:28:16 +0800 Subject: [PATCH 07/11] fix app boolean int --- pom.xml | 2 +- .../activities/app_index/core/impls/AppActServiceImp.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 922716036..4d83957a0 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.3.74 + 1.3.75 UTF-8 1.8.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java index 3c75e180f..5bd61fb08 100644 --- a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/core/impls/AppActServiceImp.java @@ -71,7 +71,7 @@ public class AppActServiceImp implements AppActService { public JSONObject getAppActPopup(){ JSONObject appActPopup = actAppMapper.getAppActPopup(); if (appActPopup == null) { - return new JSONObject(); + return null; } int appLinkType = appActPopup.getIntValue("show_type"); switch (appLinkType) { From 7afb445ddee57567d92c3301c4f4ed091f042313 Mon Sep 17 00:00:00 2001 From: liuxinxin Date: Fri, 28 Feb 2020 21:26:58 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E3=80=90R=E3=80=91=20=E5=95=86=E6=88=B7?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=96=B0=E5=A2=9E=E5=AF=B9=E6=8E=A5=E4=BA=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../merchants/beans/ClientRegisterInfo.java | 72 ++++++++ .../core/impls/ClientManagerImpl.java | 14 ++ .../static/payment/partner/partner-manage.js | 63 ++++++- src/main/ui/static/payment/partner/partner.js | 21 +++ .../partner/templates/add_partner.html | 169 ++++++++++++++++++ .../templates/add_sub_partner_dialog.html | 169 +++++++++++++++++- .../templates/client_partner_detail.html | 73 +++++++- .../templates/client_partner_edit.html | 139 ++++++++++++++ .../partner/templates/partner_detail.html | 74 +++++++- .../partner/templates/partner_edit.html | 169 +++++++++++++++++- 10 files changed, 944 insertions(+), 19 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java index 4681fe714..237427b42 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java @@ -67,6 +67,14 @@ public class ClientRegisterInfo { private String representativeEmail; @JSONField(name = "legal_representative_job") private String representativeJobTitle; + @JSONField(name = "marketing_person") + private String marketingPerson ; + @JSONField(name = "marketing_phone") + private String marketingPhone; + @JSONField(name = "marketing_email") + private String marketingEmail; + @JSONField(name = "marketing_job") + private String marketingJobTitle; @JSONField(name = "registered_address") private String registeredAddress; @JSONField(name = "registered_suburb") @@ -75,6 +83,14 @@ public class ClientRegisterInfo { private String registeredPostcode; @JSONField(name = "registered_state") private String registeredState; + + @JSONField(name = "contact_wechatid") + private String contactWechatId; + @JSONField(name = "legal_representative_wechatid") + private String representativeWechatId; + @JSONField(name = "marketing_wechatid") + private String marketingWechatId; + @NotEmpty(message = "error.payment.valid.param_missing") private String country; @Pattern(regexp = "^((Australia/West)|(Australia/Eucla)|(Australia/North)|(Australia/South)|(Australia/Brisbane)|(Australia/Melbourne)|(Australia/LHI))$", message = "error.payment.valid.invalid_timezone") @@ -523,4 +539,60 @@ public class ClientRegisterInfo { public void setContactJob(String contactJob) { this.contactJob = contactJob; } + + public String getMarketingPerson() { + return marketingPerson; + } + + public void setMarketingPerson(String marketingPerson) { + this.marketingPerson = marketingPerson; + } + + public String getMarketingPhone() { + return marketingPhone; + } + + public void setMarketingPhone(String marketingPhone) { + this.marketingPhone = marketingPhone; + } + + public String getMarketingEmail() { + return marketingEmail; + } + + public void setMarketingEmail(String marketingEmail) { + this.marketingEmail = marketingEmail; + } + + public String getMarketingJobTitle() { + return marketingJobTitle; + } + + public void setMarketingJobTitle(String marketingJobTitle) { + this.marketingJobTitle = marketingJobTitle; + } + + public String getContactWechatId() { + return contactWechatId; + } + + public void setContactWechatId(String contactWechatId) { + this.contactWechatId = contactWechatId; + } + + public String getRepresentativeWechatId() { + return representativeWechatId; + } + + public void setRepresentativeWechatId(String representativeWechatId) { + this.representativeWechatId = representativeWechatId; + } + + public String getMarketingWechatId() { + return marketingWechatId; + } + + public void setMarketingWechatId(String marketingWechatId) { + this.marketingWechatId = marketingWechatId; + } } diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index e5062db40..5b0d1d746 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -801,6 +801,13 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid representativeInfo.put("suburb", partner.getString("registered_suburb")); representativeInfo.put("postcode", partner.getString("registered_postcode")); representativeInfo.put("state", partner.getString("registered_state")); + representativeInfo.put("wechatid", partner.getString("legal_representative_wechatid")); +// marking联系人 + representativeInfo.put("marketing_person", partner.getString("marketing_person")); + representativeInfo.put("marketing_phone", partner.getString("marketing_phone")); + representativeInfo.put("marketing_email", partner.getString("marketing_email")); + representativeInfo.put("marketing_job_title", partner.getString("marketing_job")); + representativeInfo.put("marketing_wechatid", partner.getString("marketing_wechatid")); sysClientLegalPersonMapper.save(representativeInfo); } catch (Exception e) { throw new BadRequestException("error.partner.valid.dumplicate_client_moniker"); @@ -865,6 +872,13 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid representativeInfo.put("suburb", info.getRegisteredSuburb()); representativeInfo.put("postcode", info.getRegisteredPostcode()); representativeInfo.put("state", info.getRegisteredState()); + representativeInfo.put("wechatid", info.getRepresentativeWechatId()); +// marketing 联系人 + representativeInfo.put("marketing_person", info.getMarketingPerson()); + representativeInfo.put("marketing_phone", info.getMarketingPhone()); + representativeInfo.put("marketing_email", info.getMarketingEmail()); + representativeInfo.put("marketing_job_title", info.getMarketingJobTitle()); + representativeInfo.put("marketing_wechatid", info.getMarketingWechatId()); if (sysClientLegalPersonMapper.findRepresentativeInfo(clientId) != null) { sysClientLegalPersonMapper.update(representativeInfo); diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index e44b62c50..33bd3d61c 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -437,6 +437,21 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.partner.legal_representative_phone_p = $scope.partner.contact_phone_p; $scope.partner.legal_representative_email = $scope.partner.contact_email; $scope.partner.legal_representative_job = $scope.partner.contact_job; + $scope.partner.legal_representative_wechatid = $scope.partner.contact_wechatid; + } + } + + $scope.partner.marketingSameAsContact = false; + $scope.checkMarketingSameAsContact = function (){ + $scope.partner.marketingSameAsContact = !($scope.partner.marketingSameAsContact); + if($scope.partner.marketingSameAsContact) { + $scope.partner.marketing_person = $scope.partner.contact_person; + $scope.partner.marketing_phone_a = $scope.partner.contact_phone_a; + $scope.partner.marketing_phone_c = $scope.partner.contact_phone_c; + $scope.partner.marketing_phone_p = $scope.partner.contact_phone_p; + $scope.partner.marketing_email = $scope.partner.contact_email; + $scope.partner.marketing_job = $scope.partner.contact_job; + $scope.partner.marketing_wechatid = $scope.partner.contact_wechatid; } } @@ -630,7 +645,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.partner.company_phone = '+' + $scope.partner.company_phone_c + ($scope.partner.company_phone_a || '') + $scope.partner.company_phone_p; $scope.partner.contact_phone = '+' + $scope.partner.contact_phone_c + ($scope.partner.contact_phone_a || '') + $scope.partner.contact_phone_p; $scope.partner.legal_representative_phone = '+' + $scope.partner.legal_representative_phone_c + ( $scope.partner.legal_representative_phone_a || '') + $scope.partner.legal_representative_phone_p; - + $scope.partner.marketing_phone = '+' + $scope.partner.marketing_phone_c + ( $scope.partner.marketing_phone_a || '') + $scope.partner.marketing_phone_p; if ($scope.partner.company_phone.indexOf(' ') != -1) { alert('Company Phone can not contain space character'); return; @@ -643,6 +658,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter alert('Representative phone can not contain space character'); return; } + if ($scope.partner.marketing_phone.indexOf(' ') != -1) { + alert('Marketing phone can not contain space character'); + return; + } if ($scope.partner.contact_email.indexOf(' ') != -1) { alert('Contact email Phone can not contain space character'); return; @@ -651,6 +670,10 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter alert('Representative email Phone can not contain space character'); return; } + if ($scope.partner.marketing_email.indexOf(' ') != -1) { + alert('Marketing email Phone can not contain space character'); + return; + } if ($scope.partner.suburb.indexOf(' ') != -1) { alert('suburb can not contain two and more continuous space characters'); return; @@ -1290,6 +1313,14 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.partner.legal_representative_phone = $scope.partner.representativeInfo.phone; $scope.partner.legal_representative_email = $scope.partner.representativeInfo.email; $scope.partner.legal_representative_job = $scope.partner.representativeInfo.job_title; + + $scope.partner.marketing_person = $scope.partner.representativeInfo.marketing_person; + $scope.partner.marketing_phone = $scope.partner.representativeInfo.marketing_phone; + $scope.partner.marketing_email = $scope.partner.representativeInfo.marketing_email; + $scope.partner.marketing_job = $scope.partner.representativeInfo.marketing_job_title; + + $scope.partner.legal_representative_wechatid = $scope.partner.representativeInfo.wechatid; + $scope.partner.marketing_wechatid = $scope.partner.representativeInfo.marketing_wechatid; } function hasRole() { @@ -1401,6 +1432,19 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.partner.legal_representative_phone = $scope.partner.contact_phone; $scope.partner.legal_representative_email = $scope.partner.contact_email; $scope.partner.legal_representative_job = $scope.partner.contact_job; + $scope.partner.legal_representative_wechatid = $scope.partner.contact_wechatid; + } + } + + $scope.partner.marketingSameAsContact = false; + $scope.checkMarketingSameAsContact = function (){ + $scope.partner.marketingSameAsContact = !($scope.partner.marketingSameAsContact); + if($scope.partner.marketingSameAsContact) { + $scope.partner.marketing_person = $scope.partner.contact_person; + $scope.partner.marketing_phone = $scope.partner.contact_phone; + $scope.partner.marketing_email = $scope.partner.contact_email; + $scope.partner.marketing_job = $scope.partner.contact_job; + $scope.partner.marketing_wechatid = $scope.partner.contact_wechatid; } } @@ -3107,6 +3151,22 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.partner.legal_representative_phone_p = $scope.partner.contact_phone_p; $scope.partner.legal_representative_email = $scope.partner.contact_email; $scope.partner.legal_representative_job = $scope.partner.contact_job; + $scope.partner.legal_representative_wechatid = $scope.partner.contact_wechatid; + } + } + + + $scope.partner.marketingSameAsContact = false; + $scope.checkMarketingSameAsContact = function (){ + $scope.partner.marketingSameAsContact = !($scope.partner.marketingSameAsContact); + if($scope.partner.marketingSameAsContact) { + $scope.partner.marketing_person = $scope.partner.contact_person; + $scope.partner.marketing_phone_a = $scope.partner.contact_phone_a; + $scope.partner.marketing_phone_c = $scope.partner.contact_phone_c; + $scope.partner.marketing_phone_p = $scope.partner.contact_phone_p; + $scope.partner.marketing_email = $scope.partner.contact_email; + $scope.partner.marketing_job = $scope.partner.contact_job; + $scope.partner.marketing_wechatid = $scope.partner.contact_wechatid; } } @@ -3165,6 +3225,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter $scope.partner.company_phone = '+' + $scope.partner.company_phone_c + ($scope.partner.company_phone_a || '') + $scope.partner.company_phone_p; $scope.partner.contact_phone = '+' + $scope.partner.contact_phone_c + ($scope.partner.contact_phone_a || '') + $scope.partner.contact_phone_p; $scope.partner.legal_representative_phone = '+' + $scope.partner.legal_representative_phone_c + ( $scope.partner.legal_representative_phone_a || '') + $scope.partner.legal_representative_phone_p; + $scope.partner.marketing_phone = '+' + $scope.partner.marketing_phone_c + ( $scope.partner.marketing_phone_a || '') + $scope.partner.marketing_phone_p; if ($scope.partner.company_phone.indexOf(' ') != -1) { alert('Company Phone can not contain space character'); diff --git a/src/main/ui/static/payment/partner/partner.js b/src/main/ui/static/payment/partner/partner.js index c5eb0484c..7b0300a6c 100644 --- a/src/main/ui/static/payment/partner/partner.js +++ b/src/main/ui/static/payment/partner/partner.js @@ -416,6 +416,14 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo $scope.partner.legal_representative_phone = $scope.partner.representativeInfo.phone; $scope.partner.legal_representative_email = $scope.partner.representativeInfo.email; $scope.partner.legal_representative_job = $scope.partner.representativeInfo.job_title; + + $scope.partner.marketing_person = $scope.partner.representativeInfo.marketing_person; + $scope.partner.marketing_phone = $scope.partner.representativeInfo.marketing_phone; + $scope.partner.marketing_email = $scope.partner.representativeInfo.marketing_email; + $scope.partner.marketing_job = $scope.partner.representativeInfo.marketing_job_title; + + $scope.partner.legal_representative_wechatid = $scope.partner.representativeInfo.wechatid; + $scope.partner.marketing_wechatid = $scope.partner.representativeInfo.marketing_wechatid; } $scope.uploadLogo = function (file) { @@ -542,9 +550,22 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo $scope.partner.legal_representative_phone = $scope.partner.contact_phone; $scope.partner.legal_representative_email = $scope.partner.contact_email; $scope.partner.legal_representative_job = $scope.partner.contact_job; + $scope.partner.legal_representative_wechatid = $scope.partner.contact_wechatid; } }; + $scope.partner.marketingSameAsContact = false; + $scope.checkMarketingSameAsContact = function (){ + $scope.partner.marketingSameAsContact = !($scope.partner.marketingSameAsContact); + if($scope.partner.marketingSameAsContact) { + $scope.partner.marketing_person = $scope.partner.contact_person; + $scope.partner.marketing_phone = $scope.partner.contact_phone; + $scope.partner.marketing_email = $scope.partner.contact_email; + $scope.partner.marketing_job = $scope.partner.contact_job; + $scope.partner.marketing_wechatid = $scope.partner.contact_wechatid; + } + } + $scope.partner.sameAsAddress=false; $scope.sameAddress = function (){ $scope.partner.sameAsAddress=!($scope.partner.sameAsAddress); diff --git a/src/main/ui/static/payment/partner/templates/add_partner.html b/src/main/ui/static/payment/partner/templates/add_partner.html index da56df344..58028bc61 100644 --- a/src/main/ui/static/payment/partner/templates/add_partner.html +++ b/src/main/ui/static/payment/partner/templates/add_partner.html @@ -688,10 +688,32 @@
+
+ +
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
+
+
+
+ +
@@ -802,6 +824,153 @@ Characters(including symbols and spaces)

+
+ +
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
+
+ + + +
+
  Marketing Person
+
+
+
+ +
+ +
+

Required + Field

+

Less + Than 50 + Characters(including symbols and spaces)

+
+
+
+
+ +
+
+
+
+ +
+ +
+

Required + Field

+

Less + Than 20 Characters

+
+
+
+ +
+

Less + Than 2 Characters

+
+
+
+ +
+

Required + Field

+

Less + Than 11 Characters

+
+
+
+
+ +
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
+
+ +
+ +
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
+
+
+ +
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
+
diff --git a/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html b/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html index 304abd8f7..046b2988a 100644 --- a/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html +++ b/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html @@ -592,10 +592,31 @@ Characters(including symbols and spaces)

+
+ +
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
+
+
+ +
  Legal Representative
@@ -686,7 +707,6 @@ Characters(including symbols and spaces)

-
+
+ +
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
+
+ + + +
+
  Marketing Person
+
+
+
+ +
+ +
+

Required + Field

+

Less + Than 50 + Characters(including symbols and spaces)

+
+
+
+
+ +
+
+
+
+ +
+ +
+

Required + Field

+

Less + Than 20 Characters

+
+
+
+ +
+

Less + Than 2 Characters

+
+
+
+ +
+

Required + Field

+

Less + Than 11 Characters

+
+
+
+
+ +
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
+
+ +
+ +
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
+
+
+ +
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
+
diff --git a/src/main/ui/static/payment/partner/templates/client_partner_detail.html b/src/main/ui/static/payment/partner/templates/client_partner_detail.html index 9f04c7df7..3e7f3cd98 100644 --- a/src/main/ui/static/payment/partner/templates/client_partner_detail.html +++ b/src/main/ui/static/payment/partner/templates/client_partner_detail.html @@ -343,13 +343,20 @@
Partner Contact Information
-
- +
+ -
+

+
+ + +
+

+
+
@@ -399,13 +406,20 @@
Legal Representative
-
- +
+ -
+

+
+ + +
+

+
+
@@ -434,6 +448,53 @@
+ +
+
Marketing Person
+
+
+
+ + +
+

+
+
+
+ + +
+

+
+
+
+ + +
+

+
+
+
+ + +
+

+ +

+
+
+
+ + +
+

+ +

+
+
+
+
+
diff --git a/src/main/ui/static/payment/partner/templates/client_partner_edit.html b/src/main/ui/static/payment/partner/templates/client_partner_edit.html index 21dfb1f00..0cd9fc0fc 100644 --- a/src/main/ui/static/payment/partner/templates/client_partner_edit.html +++ b/src/main/ui/static/payment/partner/templates/client_partner_edit.html @@ -408,9 +408,30 @@ Characters(including symbols and spaces)

+
+ +
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
+
+
+ +
@@ -491,6 +512,124 @@
+
+ +
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
+
+ +
+ + +
+
  Marketing Person
+
+
+
+ +
+ +
+

Required + Field

+

Less + Than 50 + Characters(including symbols and spaces)

+
+
+
+ +
+ +
+ +
+
+

Required Field

+

Less Than 20 + Characters(including symbols and spaces)

+
+
+ +
+ +
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
+
+ +
+ +
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
+
+ +
+ +
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
+
+
diff --git a/src/main/ui/static/payment/partner/templates/partner_detail.html b/src/main/ui/static/payment/partner/templates/partner_detail.html index 54ff61fe9..e595f4a34 100644 --- a/src/main/ui/static/payment/partner/templates/partner_detail.html +++ b/src/main/ui/static/payment/partner/templates/partner_detail.html @@ -700,13 +700,21 @@
Partner Contact Information
-
- +
+ -
+

+ +
+ + +
+

+
+
@@ -753,13 +761,20 @@
Legal Representative
-
- +
+ -
+

+
+ + +
+

+
+
@@ -788,6 +803,53 @@
+ +
+
Marketing Person
+
+
+
+ + +
+

+
+
+
+ + +
+

+
+
+
+ + +
+

+
+
+
+ + +
+

+ +

+
+
+
+ + +
+

+ +

+
+
+
+
+
diff --git a/src/main/ui/static/payment/partner/templates/partner_edit.html b/src/main/ui/static/payment/partner/templates/partner_edit.html index f2bd3dccd..f4884eecd 100644 --- a/src/main/ui/static/payment/partner/templates/partner_edit.html +++ b/src/main/ui/static/payment/partner/templates/partner_edit.html @@ -595,11 +595,30 @@ Characters(including symbols and spaces)

- - +
+ +
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
+
+
+ +
@@ -633,7 +652,6 @@
-
@@ -652,7 +670,6 @@ Characters(including symbols and spaces)

-
-
+
+ +
+ +
+
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
+
+ + + +
  Marketing Person
+
+
+
+ +
+
+ +
+
+ +
+
+

Required + Field

+

Less + Than 50 + Characters(including symbols and spaces)

+
+
+
+
+ +
+ +
+
+ +
+
+

Required Field

+

Less Than 20 + Characters(including symbols and spaces)

+
+
+
+ +
+ +
+
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
+
+ +
+ +
+ +
+
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
+
+
+ +
+ +
+
+ +
+
+

Required + Field

+

Less Than 50 + Characters(including symbols and spaces)

+
+
From f1b2c2f453822ba4393ed467e14c1277b783c2eb Mon Sep 17 00:00:00 2001 From: liuxinxin Date: Fri, 28 Feb 2020 21:29:51 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E3=80=90R=E3=80=91=20=E5=95=86=E6=88=B7?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=96=B0=E5=A2=9E=E5=AF=B9=E6=8E=A5=E4=BA=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4d83957a0..3fc2220f7 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.3.75 + 1.3.76 UTF-8 1.8.0 From 7575fb56b9804aa0f117cb8390eb592cd42d47a9 Mon Sep 17 00:00:00 2001 From: luoyang Date: Mon, 2 Mar 2020 13:37:22 +0800 Subject: [PATCH 10/11] delete app not found test --- pom.xml | 2 +- .../manage/appclient/core/impls/RetailRSvcServiceImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3fc2220f7..9b6f4228a 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.3.76 + 1.3.78 UTF-8 1.8.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java index 14bea82e8..b8d8aa0af 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java @@ -11,6 +11,7 @@ import au.com.royalpay.payment.tools.codec.AESCrypt; import au.com.royalpay.payment.tools.device.DeviceSupport; import au.com.royalpay.payment.tools.encryptalgorithm.SignUtils; import au.com.royalpay.payment.tools.exceptions.BadRequestException; +import au.com.royalpay.payment.tools.exceptions.NotFoundException; import au.com.royalpay.payment.tools.mappers.CommonIncrementalChannelMapper; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; From 3f123eee4181ca398810bf5a566187bfb0bbf9c2 Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 4 Mar 2020 10:20:41 +0800 Subject: [PATCH 11/11] =?UTF-8?q?add=20App=20=E5=BC=B9=E7=AA=97=E9=BB=91?= =?UTF-8?q?=E5=90=8D=E5=8D=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/activities/app_index/beans/AppActBean.java | 10 ++++++++++ .../appclient/core/impls/RetailAppServiceImp.java | 7 +++++++ .../ui/static/actapp/templates/act_app_detail.html | 7 +++++++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9b6f4228a..15508715d 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.3.78 + 1.3.79 UTF-8 1.8.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/beans/AppActBean.java b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/beans/AppActBean.java index 43df823cd..aca4ea5e8 100644 --- a/src/main/java/au/com/royalpay/payment/manage/activities/app_index/beans/AppActBean.java +++ b/src/main/java/au/com/royalpay/payment/manage/activities/app_index/beans/AppActBean.java @@ -19,6 +19,7 @@ public class AppActBean { private String act_img; private String active_date; private String expire_date; + private String partner_black_list; public JSONObject toJsonParam(){ @@ -28,6 +29,7 @@ public class AppActBean { params.put("show_type",show_type); params.put("act_img",act_img); params.put("is_valid",is_valid); + params.put("partner_black_list", partner_black_list); if (active_date != null) { try { Date fromDate = DateUtils.parseDate(active_date, DATE_PATTERNS); @@ -110,4 +112,12 @@ public class AppActBean { public void setIs_valid(boolean is_valid) { this.is_valid = is_valid; } + + public String getPartner_black_list() { + return partner_black_list; + } + + public void setPartner_black_list(String partner_black_list) { + this.partner_black_list = partner_black_list; + } } diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index 84301c7bf..6a22830e3 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -1584,6 +1584,13 @@ public class RetailAppServiceImp implements RetailAppService { JSONObject latestAct = appActService.getAppActPopup(); if (latestAct != null) { + if (StringUtils.isNotBlank(latestAct.getString("partner_black_list"))) { + JSONObject client = clientManager.getClientInfo(clientId); + String[] blackList = latestAct.getString("partner_black_list").split(","); + if (client == null || Arrays.asList(blackList).contains(client.getString("client_moniker"))) { + return result; + } + } latestAct.put("id", latestAct.getString("act_id")); latestAct.put("url", latestAct.getString("act_url")); latestAct.put("title", latestAct.getString("act_name")); diff --git a/src/main/ui/static/actapp/templates/act_app_detail.html b/src/main/ui/static/actapp/templates/act_app_detail.html index 0dfdba7e5..b9ed670c9 100644 --- a/src/main/ui/static/actapp/templates/act_app_detail.html +++ b/src/main/ui/static/actapp/templates/act_app_detail.html @@ -87,6 +87,13 @@ ng-model="actDetail.act_url"> +
+ +
+