From dbc0af8bdae271c68969988dfb9a369fb8a3e302 Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 18 Jul 2019 10:30:05 +0800 Subject: [PATCH 01/43] =?UTF-8?q?fix=20=E7=BB=84=E7=BB=87=E7=AE=A1?= =?UTF-8?q?=E7=90=86=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 02/43] =?UTF-8?q?fix=20=E6=96=B0=E5=BB=BA=E8=B4=A6?= =?UTF-8?q?=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 04/43] 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 831658f3228698c9a81b9cdcc0c121eadca7e1f8 Mon Sep 17 00:00:00 2001 From: luoyang Date: Sat, 20 Jul 2019 19:58:03 +0800 Subject: [PATCH 05/43] =?UTF-8?q?fix=20=E7=BB=84=E7=BB=87=E5=90=88?= =?UTF-8?q?=E4=BC=99=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 @@ -
    +
    + +
    + +
    +
    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 212398f7f..b3637e7a8 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 @@ -426,6 +426,12 @@
    +
    + +
    + +
    +
    From cd005fd83264f847187e323d2d6b0a881536143a Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 23 Jul 2019 09:37:20 +0800 Subject: [PATCH 13/43] =?UTF-8?q?add=20CBBank=E6=89=8B=E7=BB=AD=E8=B4=B9?= =?UTF-8?q?=E5=BC=80=E5=85=B3=20&&=20=E5=A2=9E=E5=8A=A0clientconfig?= =?UTF-8?q?=E5=8D=95=E7=8B=AC=E9=85=8D=E7=BD=AE=E6=96=B9=E6=B3=95=20boolea?= =?UTF-8?q?n=20onlyModifyConfig?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/merchants/core/ClientManager.java | 4 +++ .../merchants/core/ClientModifySupport.java | 2 ++ .../core/impls/ClientManagerImpl.java | 26 ++++++++++++++++++- .../core/impls/ClientModifySupportImpl.java | 6 +++++ .../merchants/entity/ClientConfigModify.java | 14 ++++++++++ .../web/PartnerManageController.java | 5 ++++ .../merchants/web/PartnerViewController.java | 6 +++++ .../static/payment/partner/partner-manage.js | 15 +++++++++++ src/main/ui/static/payment/partner/partner.js | 14 ++++++++++ .../templates/client_payment_info.html | 6 +++++ .../templates/partner_payment_info.html | 6 +++++ 12 files changed, 104 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ddbda2b3a..47d670924 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.0.22 + 1.0.23 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java index 8130e20e7..80fd0479f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java @@ -213,6 +213,8 @@ public interface ClientManager { void setClientRetailPaySurCharge(JSONObject account,String clientMoniker, boolean paySurcharge); + void setClientCBBankPaySurCharge(JSONObject account,String clientMoniker, boolean paySurcharge); + void setClientTaxInSurcharge(JSONObject account,String clientMoniker, boolean taxInSurcharge); void setClientCustomerTaxFree(JSONObject account,String clientMoniker, boolean customerTaxFree); @@ -267,6 +269,8 @@ public interface ClientManager { void changeRetailPaySurcharge(JSONObject account, boolean paySurcharge); + void changeCBBankPaySurcharge(JSONObject account, boolean paySurcharge); + void changeRequireCustinfo(JSONObject account, boolean requireCustinfo); void changeRequireRemark(JSONObject account, boolean requireRemark); diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientModifySupport.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientModifySupport.java index c27c697c6..8d32edf4e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientModifySupport.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientModifySupport.java @@ -13,5 +13,7 @@ public interface ClientModifySupport { void processClientConfigModify(ClientConfigModify clientConfigModify); + void processClientConfigModify(ClientConfigModify clientConfigModify, boolean onlyModifyConfig); + void processClientGatewaySignModify(ClientGatewaySignModify clientGatewaySignModify); } 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 fea78aecf..29012451f 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 @@ -2899,6 +2899,16 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid } + @Override + public void setClientCBBankPaySurCharge(JSONObject account, String clientMoniker, boolean paySurcharge) { + JSONObject client = getClientInfoByMoniker(clientMoniker); + if (client == null) { + throw new InvalidShortIdException(); + } + clientModifySupport.processClientConfigModify(new SwitchPermissionModify(account, clientMoniker, "cbbank_surcharge", paySurcharge), true); + + } + @Override public void setClientTaxInSurcharge(JSONObject account, String clientMoniker, boolean taxInSurcharge) { JSONObject client = getClientInfoByMoniker(clientMoniker); @@ -2906,7 +2916,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid throw new InvalidShortIdException(); } clientModifySupport.processClientConfigModify(new SwitchPermissionModify(account, clientMoniker, "tax_in_surcharge", taxInSurcharge)); - } @Override @@ -3434,6 +3443,21 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid .processClientConfigModify(new SwitchPermissionModify(account, client.getString("client_moniker"), "retail_surcharge", paySurcharge)); } + @Override + public void changeCBBankPaySurcharge(JSONObject account, boolean paySurcharge) { + int clientId = account.getIntValue("client_id"); + JSONObject client = getClientInfo(clientId); + if (client == null) { + throw new InvalidShortIdException(); + } + if (account.getIntValue("role") == 3) { + // cashier cannot change this config + throw new ForbiddenException("Cashier has no permission to switch retail surcharge"); + } + clientModifySupport + .processClientConfigModify(new SwitchPermissionModify(account, client.getString("client_moniker"), "cbbank_surcharge", paySurcharge),true); + } + @Override public void changeRequireCustinfo(JSONObject account, boolean requireCustinfo) { int clientId = account.getIntValue("client_id"); diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientModifySupportImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientModifySupportImpl.java index 06b629aa9..f1a1b002b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientModifySupportImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientModifySupportImpl.java @@ -45,6 +45,12 @@ public class ClientModifySupportImpl implements ClientModifySupport { clientInfoCacheSupport.clearClientCache(clientId); } + @Override + public void processClientConfigModify(ClientConfigModify clientConfigModify,boolean onlyModifyConfig) { + int clientId =clientConfigModify.doModify(merchantInfoProvider, clientConfigMapper,clientMapper,mongoTemplate,onlyModifyConfig); + clientInfoCacheSupport.clearClientConfigCache(clientId); + } + @Override public void processClientGatewaySignModify(ClientGatewaySignModify clientGatewaySignModify) { int clientId =clientGatewaySignModify.doModify(merchantInfoProvider, merchantSignInfoMapper,mongoTemplate); diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/entity/ClientConfigModify.java b/src/main/java/au/com/royalpay/payment/manage/merchants/entity/ClientConfigModify.java index 0320aa2c5..18c50176c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/entity/ClientConfigModify.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/entity/ClientConfigModify.java @@ -50,6 +50,20 @@ public abstract class ClientConfigModify { return clientId; } + public int doModify(MerchantInfoProvider merchantInfoProvider, ClientConfigMapper clientConfigMapper, ClientMapper clientMapper, MongoTemplate mongoTemplate,boolean onlyModifyConfig) { + JSONObject clientConfig = merchantInfoProvider.getClientConfigInfoByMoniker(clientMoniker); + JSONObject modifyResult = getModifyResult(); + try { + saveModifyHistory(clientConfig, modifyResult, mongoTemplate); + }catch (Exception e){ + + } + int clientId = clientConfig.getIntValue("client_id"); + modifyResult.put("client_id", clientId); + clientConfigMapper.update(modifyResult); + return clientId; + } + private void saveModifyHistory(JSONObject client, JSONObject modifyResult,MongoTemplate mongoTemplate) { if (account == null) { return; diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java index 8d7ddadfa..1fb19d5d2 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java @@ -230,6 +230,11 @@ public class PartnerManageController { clientManager.setClientRetailPaySurCharge(manager,clientMoniker, config.getBooleanValue("retail_surcharge")); } + @ManagerMapping(value = "/{clientMoniker}/cbbank_surcharge", method = RequestMethod.PUT, role = {ManagerRole.OPERATOR, ManagerRole.ADMIN, ManagerRole.BD_USER}) + public void setClientCBBankPaySurCharge(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager,@PathVariable String clientMoniker, @RequestBody JSONObject config) { + clientManager.setClientCBBankPaySurCharge(manager,clientMoniker, config.getBooleanValue("cbbank_surcharge")); + } + @ManagerMapping(value = "/{clientMoniker}/tax_in_surcharge", method = RequestMethod.PUT, role = {ManagerRole.OPERATOR, ManagerRole.ADMIN}) public void setClientTaxPayer(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager,@PathVariable String clientMoniker, @RequestBody JSONObject config) { clientManager.setClientTaxInSurcharge(manager,clientMoniker, config.getBooleanValue("tax_in_surcharge")); diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java index be7823494..58d389800 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java @@ -419,6 +419,12 @@ public class PartnerViewController { clientManager.changeRetailPaySurcharge(account, pass.getBooleanValue("retail_surcharge")); } + @PartnerMapping(value = "/cbbank_surcharge", method = RequestMethod.PUT) + @ResponseBody + public void changeCBBankPaySurCharge(@RequestBody JSONObject pass, @ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject account) { + clientManager.changeCBBankPaySurcharge(account, pass.getBooleanValue("cbbank_surcharge")); + } + @PartnerMapping(value = "/require_custinfo", method = RequestMethod.PUT) @ResponseBody public void changeRequireCustinfo(@RequestBody JSONObject pass, @ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject account) { diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index 2893d7854..67764f20a 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -1659,6 +1659,21 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) }); }; + $scope.updateClientCBBankPaySurCharge = function () { + if (!$scope.paymentInfo) { + return; + } + $http.put('/sys/partners/' + $scope.partner.client_moniker + '/cbbank_surcharge', {cbbank_surcharge: $scope.paymentInfo.cbbank_surcharge}).then(function () { + // $scope.loadPartnerPaymentInfo(); + }, function (resp) { + commonDialog.alert({ + title: 'failed to change Customer Pay for Surcharge for Retail', + content: resp.data.message, + type: 'error' + }) + }) + } + $scope.updateClientApiSurCharge = function () { if (!$scope.paymentInfo) { return; diff --git a/src/main/ui/static/payment/partner/partner.js b/src/main/ui/static/payment/partner/partner.js index 3c6b279d4..b13eab1ba 100644 --- a/src/main/ui/static/payment/partner/partner.js +++ b/src/main/ui/static/payment/partner/partner.js @@ -999,6 +999,20 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload','uiBoot }) }) } + $scope.updateClientCBBankPaySurCharge = function () { + if (!$scope.paymentInfo) { + return; + } + $http.put('/client/partner_info/cbbank_surcharge', {cbbank_surcharge: $scope.paymentInfo.cbbank_surcharge}).then(function () { + // $scope.loadPartnerPaymentInfo(); + }, function (resp) { + commonDialog.alert({ + title: 'failed to change Customer Pay for Surcharge for Retail', + content: resp.data.message, + type: 'error' + }) + }) + } $scope.toggleRequireCustInfo = function () { if (!$scope.paymentInfo) { return; diff --git a/src/main/ui/static/payment/partner/templates/client_payment_info.html b/src/main/ui/static/payment/partner/templates/client_payment_info.html index f5efdb855..62752c87d 100644 --- a/src/main/ui/static/payment/partner/templates/client_payment_info.html +++ b/src/main/ui/static/payment/partner/templates/client_payment_info.html @@ -444,6 +444,12 @@

    +
    + +
    + +
    +
    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 212398f7f..b3637e7a8 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 @@ -426,6 +426,12 @@
    +
    + +
    + +
    +
    From 50e7c4796aae9a988ecb8d16740b76b861c0cc64 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 23 Jul 2019 09:43:36 +0800 Subject: [PATCH 14/43] fix pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 47d670924..c7438fbd4 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.0.23 + 1.0.24 UTF-8 From cf78550b992c17ab231cc89cc3aa2906889e3bdb Mon Sep 17 00:00:00 2001 From: "taylor.dang" Date: Tue, 23 Jul 2019 21:00:44 +0800 Subject: [PATCH 15/43] =?UTF-8?q?[Y]=20=E9=80=9A=E7=9F=A5=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E5=95=86=E6=88=B7=E5=90=8D=E5=8D=95=E4=B8=BA30?= =?UTF-8?q?=E5=A4=A9=E5=86=85=E6=B4=BB=E8=B7=83=E5=95=86=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../payment/manage/mappers/system/ClientMapper.java | 2 ++ .../manage/notice/core/impls/NoticeManageImpl.java | 7 +++---- .../payment/manage/mappers/system/ClientMapper.xml | 11 +++++++++++ 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index ddbda2b3a..47d670924 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.0.22 + 1.0.23 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java index df5996629..d5d58734c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java @@ -26,6 +26,8 @@ public interface ClientMapper { List listValidClient(); + List listValidClientFor30Days(); + List listGreenChannel(JSONObject params); @AutoSql(type = SqlType.SELECT) diff --git a/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java b/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java index 4b76f34ab..65e7f0769 100644 --- a/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java @@ -108,7 +108,7 @@ public class NoticeManageImpl implements NoticeManage { notice.put("create_name", manager.getString("display_name")); if (!notice.getBoolean("merchants_type")){ StringBuilder sendClients = new StringBuilder(); - List clients = clientMapper.listValidClient(); + List clients = clientMapper.listValidClientFor30Days(); clients.forEach(c -> { if (c.getInteger("parent_client_id")==null || c.getInteger("parent_client_id")!=9){ String p = c.getString("client_moniker")+","; @@ -146,7 +146,7 @@ public class NoticeManageImpl implements NoticeManage { if (!notice.getBoolean("merchants_type")){ StringBuilder sendClients = new StringBuilder(); - List clients = clientMapper.listValidClient(); + List clients = clientMapper.listValidClientFor30Days(); clients.forEach(c -> { if (c.getInteger("parent_client_id")==null || c.getInteger("parent_client_id")!=9){ String p = c.getString("client_moniker")+","; @@ -292,8 +292,7 @@ public class NoticeManageImpl implements NoticeManage { public int listNoticeClients(String noticeId) { JSONObject params = new JSONObject(); params.put("notice_id", noticeId); - int clients = noticePartnerMapper.countClientsByNoticeId(params); - return clients; + return noticePartnerMapper.countClientsByNoticeId(params); } 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 2835f44e2..cd0e4c957 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 @@ -5,6 +5,17 @@ SELECT client_id,client_moniker,parent_client_id FROM sys_clients WHERE is_valid=1 and (approve_result = 1 or approve_result = 2) + + + + + diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientBDMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientBDMapper.xml index a80c8423e..6b85ccc3c 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientBDMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientBDMapper.xml @@ -80,4 +80,10 @@ WHERE sysm.org_id = #{org_id} AND sysm.is_valid = 1) + + + + \ No newline at end of file diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ManagerMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ManagerMapper.xml index c6d046fd4..bc421783e 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ManagerMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ManagerMapper.xml @@ -102,5 +102,12 @@ ]]> + From 9c9d00cc68062dc457b9a42c0c94af7fcdd14b43 Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 24 Jul 2019 13:52:36 +0800 Subject: [PATCH 18/43] =?UTF-8?q?add=20=E6=94=AF=E4=BB=98=E5=AE=9Donline?= =?UTF-8?q?=20insert=20partner=E6=89=B9=E9=87=8F=E6=8A=A5=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/dev/core/AliforexcelService.java | 2 + .../dev/core/impl/AliforexcelServiceImpl.java | 59 +++++++++++++++++++ .../manage/dev/web/TestController.java | 5 ++ .../ui/static/config/devtools/devtools.js | 18 ++++++ .../registerAlipayOnlineMerchant.html | 4 ++ 6 files changed, 89 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a1e8c8032..55932b945 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.0.25 + 1.0.26 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/AliforexcelService.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/AliforexcelService.java index ea77df4ec..e854e4423 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/core/AliforexcelService.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/AliforexcelService.java @@ -17,6 +17,8 @@ public interface AliforexcelService { JSONObject registerInsertAlipayMerchant(String partners); + JSONObject registerInsertAlipayOnlineMerchant(String partners); + JSONObject getLessPartnerInfo(); void initClientPayType(int begin,int end); diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java index 5c50f54fe..46a94aec3 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java @@ -267,6 +267,65 @@ public class AliforexcelServiceImpl implements AliforexcelService { return result; } + @Override + public JSONObject registerInsertAlipayOnlineMerchant(String partners) { + String[] partner = partners.split(","); + JSONObject result = new JSONObject(); + List needRegisterMerchant = new ArrayList<>(); + List registerSuccessMerchant = new ArrayList<>(); + List registerFailMerchant = new ArrayList<>(); + List lessInfoMerchant = new ArrayList<>(); + for (String clientMoniker : partner) { + JSONObject client = clientMapper.findClientByMoniker(clientMoniker); + if (client == null) { + continue; + } + try { + needRegisterMerchant.add(client.getString("client_moniker")); + if (StringUtils.isBlank(client.getString("alipayindustry"))) { + client.put("alipayindustry", "5311"); + } + if (StringUtils.isBlank(client.getString("business_structure"))) { + client.put("business_structure", "da"); + } + if (StringUtils.isBlank(client.getString("company_website"))) { + client.put("company_website", client.getString("ali_sub_merchant_id")+".royalpay.com.au"); + } + checkPartnerInfo(client,"online"); + } catch (InvalidParameterException e) { + JSONObject exception = new JSONObject(); + exception.put("client_moniker", client.getString("client_moniker")); + exception.put("return_msg", e.getMessage()); + exception.put("bd_name", client.getString("bd_user_name")); + lessInfoMerchant.add(exception); + continue; + } + AlipayConfig.AlipayMerchant mch = AlipayEnvironment.getEnv().getAlipayOnlineMerchant(); + Element resultElement = alipayClient.registerOnlineGmsPortal(mch.getPid(), client); + if (!StringUtils.equalsIgnoreCase("T", resultElement.elementText("is_success"))) { + JSONObject exception = new JSONObject(); + exception.put("client_moniker", client.getString("client_moniker")); + exception.put("return_msg", resultElement.elementText("error")); + registerFailMerchant.add(exception); + continue; + } + Element responseElement = resultElement.element("response").element("alipay"); + if (!StringUtils.equalsIgnoreCase("SUCCESS", responseElement.elementText("result_code"))) { + JSONObject exception = new JSONObject(); + exception.put("client_moniker", client.getString("client_moniker")); + exception.put("return_msg", resultElement.elementText("error")); + registerFailMerchant.add(exception); + continue; + } + registerSuccessMerchant.add(client.getString("client_moniker")); + } + result.put("need_register_merchant", needRegisterMerchant); + result.put("success_register_merchant", registerSuccessMerchant); + result.put("fail_register_merchant", registerFailMerchant); + result.put("less_info_merchant", lessInfoMerchant); + return result; + } + @Override public JSONObject getLessPartnerInfo() { JSONObject result = new JSONObject(); diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java index 13418cd84..8e5906843 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java @@ -469,6 +469,11 @@ public class TestController implements ApplicationEventPublisherAware { return aliforexcelService.registerInsertAlipayMerchant(partners.getString("partners")); } + @ManagerMapping(value = "/register/alipayOnlineGms/insert_partner", role = ManagerRole.DEVELOPER, method = RequestMethod.POST) + public JSONObject registerInsertAlipayOnlineMerchant(@RequestBody JSONObject partners) { + return aliforexcelService.registerInsertAlipayOnlineMerchant(partners.getString("partners")); + } + @ManagerMapping(value = "/register/getLessPartnerInfo", role = ManagerRole.DEVELOPER, method = RequestMethod.GET) public JSONObject getLessPartnerInfo() { return aliforexcelService.getLessPartnerInfo(); diff --git a/src/main/ui/static/config/devtools/devtools.js b/src/main/ui/static/config/devtools/devtools.js index a97576c01..5d29749f3 100644 --- a/src/main/ui/static/config/devtools/devtools.js +++ b/src/main/ui/static/config/devtools/devtools.js @@ -456,6 +456,24 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) { }) }; + $scope.registerInsertOnlineGMS = function (text) { + $scope.totalhide = true; + $scope.selecttotal = false; + var params = {}; + params.partners = text; + $http.post('/dev/register/alipayOnlineGms/insert_partner',params).then(function (resp) { + $scope.totalhide = false; + $scope.selecttotal = true; + $scope.need_register_merchant = resp.data.need_register_merchant.toString(); + $scope.success_register_merchant = resp.data.success_register_merchant.toString(); + $scope.fail_register_merchant = resp.data.fail_register_merchant; + $scope.less_info_merchant = resp.data.less_info_merchant(); + }, function (resp) { + alert(resp.data.message); + }) + }; + + $scope.getLessPartnerInfo = function () { $scope.totalhide = true; $scope.selecttotal = false; diff --git a/src/main/ui/static/config/devtools/templates/registerAlipayOnlineMerchant.html b/src/main/ui/static/config/devtools/templates/registerAlipayOnlineMerchant.html index 12a73e0d6..915099d33 100644 --- a/src/main/ui/static/config/devtools/templates/registerAlipayOnlineMerchant.html +++ b/src/main/ui/static/config/devtools/templates/registerAlipayOnlineMerchant.html @@ -22,6 +22,10 @@
    +
    + + +
    需要报备的商户编码

    From b53b11a1a1145ba75be4e449f9f339888cb0731b Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 24 Jul 2019 13:55:02 +0800 Subject: [PATCH 19/43] =?UTF-8?q?add=20=E6=94=AF=E4=BB=98=E5=AE=9Donline?= =?UTF-8?q?=20insert=20partner=E6=89=B9=E9=87=8F=E6=8A=A5=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/dev/core/AliforexcelService.java | 2 + .../dev/core/impl/AliforexcelServiceImpl.java | 59 +++++++++++++++++++ .../manage/dev/web/TestController.java | 5 ++ .../ui/static/config/devtools/devtools.js | 18 ++++++ .../registerAlipayOnlineMerchant.html | 4 ++ 6 files changed, 89 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a1e8c8032..55932b945 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.0.25 + 1.0.26 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/AliforexcelService.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/AliforexcelService.java index ea77df4ec..e854e4423 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/core/AliforexcelService.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/AliforexcelService.java @@ -17,6 +17,8 @@ public interface AliforexcelService { JSONObject registerInsertAlipayMerchant(String partners); + JSONObject registerInsertAlipayOnlineMerchant(String partners); + JSONObject getLessPartnerInfo(); void initClientPayType(int begin,int end); diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java index 5c50f54fe..46a94aec3 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java @@ -267,6 +267,65 @@ public class AliforexcelServiceImpl implements AliforexcelService { return result; } + @Override + public JSONObject registerInsertAlipayOnlineMerchant(String partners) { + String[] partner = partners.split(","); + JSONObject result = new JSONObject(); + List needRegisterMerchant = new ArrayList<>(); + List registerSuccessMerchant = new ArrayList<>(); + List registerFailMerchant = new ArrayList<>(); + List lessInfoMerchant = new ArrayList<>(); + for (String clientMoniker : partner) { + JSONObject client = clientMapper.findClientByMoniker(clientMoniker); + if (client == null) { + continue; + } + try { + needRegisterMerchant.add(client.getString("client_moniker")); + if (StringUtils.isBlank(client.getString("alipayindustry"))) { + client.put("alipayindustry", "5311"); + } + if (StringUtils.isBlank(client.getString("business_structure"))) { + client.put("business_structure", "da"); + } + if (StringUtils.isBlank(client.getString("company_website"))) { + client.put("company_website", client.getString("ali_sub_merchant_id")+".royalpay.com.au"); + } + checkPartnerInfo(client,"online"); + } catch (InvalidParameterException e) { + JSONObject exception = new JSONObject(); + exception.put("client_moniker", client.getString("client_moniker")); + exception.put("return_msg", e.getMessage()); + exception.put("bd_name", client.getString("bd_user_name")); + lessInfoMerchant.add(exception); + continue; + } + AlipayConfig.AlipayMerchant mch = AlipayEnvironment.getEnv().getAlipayOnlineMerchant(); + Element resultElement = alipayClient.registerOnlineGmsPortal(mch.getPid(), client); + if (!StringUtils.equalsIgnoreCase("T", resultElement.elementText("is_success"))) { + JSONObject exception = new JSONObject(); + exception.put("client_moniker", client.getString("client_moniker")); + exception.put("return_msg", resultElement.elementText("error")); + registerFailMerchant.add(exception); + continue; + } + Element responseElement = resultElement.element("response").element("alipay"); + if (!StringUtils.equalsIgnoreCase("SUCCESS", responseElement.elementText("result_code"))) { + JSONObject exception = new JSONObject(); + exception.put("client_moniker", client.getString("client_moniker")); + exception.put("return_msg", resultElement.elementText("error")); + registerFailMerchant.add(exception); + continue; + } + registerSuccessMerchant.add(client.getString("client_moniker")); + } + result.put("need_register_merchant", needRegisterMerchant); + result.put("success_register_merchant", registerSuccessMerchant); + result.put("fail_register_merchant", registerFailMerchant); + result.put("less_info_merchant", lessInfoMerchant); + return result; + } + @Override public JSONObject getLessPartnerInfo() { JSONObject result = new JSONObject(); diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java index 13418cd84..8e5906843 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java @@ -469,6 +469,11 @@ public class TestController implements ApplicationEventPublisherAware { return aliforexcelService.registerInsertAlipayMerchant(partners.getString("partners")); } + @ManagerMapping(value = "/register/alipayOnlineGms/insert_partner", role = ManagerRole.DEVELOPER, method = RequestMethod.POST) + public JSONObject registerInsertAlipayOnlineMerchant(@RequestBody JSONObject partners) { + return aliforexcelService.registerInsertAlipayOnlineMerchant(partners.getString("partners")); + } + @ManagerMapping(value = "/register/getLessPartnerInfo", role = ManagerRole.DEVELOPER, method = RequestMethod.GET) public JSONObject getLessPartnerInfo() { return aliforexcelService.getLessPartnerInfo(); diff --git a/src/main/ui/static/config/devtools/devtools.js b/src/main/ui/static/config/devtools/devtools.js index a97576c01..5d29749f3 100644 --- a/src/main/ui/static/config/devtools/devtools.js +++ b/src/main/ui/static/config/devtools/devtools.js @@ -456,6 +456,24 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) { }) }; + $scope.registerInsertOnlineGMS = function (text) { + $scope.totalhide = true; + $scope.selecttotal = false; + var params = {}; + params.partners = text; + $http.post('/dev/register/alipayOnlineGms/insert_partner',params).then(function (resp) { + $scope.totalhide = false; + $scope.selecttotal = true; + $scope.need_register_merchant = resp.data.need_register_merchant.toString(); + $scope.success_register_merchant = resp.data.success_register_merchant.toString(); + $scope.fail_register_merchant = resp.data.fail_register_merchant; + $scope.less_info_merchant = resp.data.less_info_merchant(); + }, function (resp) { + alert(resp.data.message); + }) + }; + + $scope.getLessPartnerInfo = function () { $scope.totalhide = true; $scope.selecttotal = false; diff --git a/src/main/ui/static/config/devtools/templates/registerAlipayOnlineMerchant.html b/src/main/ui/static/config/devtools/templates/registerAlipayOnlineMerchant.html index 12a73e0d6..915099d33 100644 --- a/src/main/ui/static/config/devtools/templates/registerAlipayOnlineMerchant.html +++ b/src/main/ui/static/config/devtools/templates/registerAlipayOnlineMerchant.html @@ -22,6 +22,10 @@
    +
    + + +
    需要报备的商户编码

    From 02f4cb1675543affef500b1d97a6ef839d2ff7da Mon Sep 17 00:00:00 2001 From: liuxinxin Date: Wed, 24 Jul 2019 17:48:57 +0800 Subject: [PATCH 20/43] =?UTF-8?q?[RoyalPay]=E5=95=86=E6=88=B7=E9=9B=B7?= =?UTF-8?q?=E5=90=8C=E4=BF=A1=E6=81=AF=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/mappers/system/ClientMapper.java | 6 ++++ .../core/impls/ClientManagerImpl.java | 20 +++++++++++ .../manage/mappers/system/ClientMapper.xml | 36 +++++++++++++++++++ .../partner/templates/partner_detail.html | 3 ++ 4 files changed, 65 insertions(+) diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java index d5d58734c..a142120c2 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java @@ -30,6 +30,12 @@ public interface ClientMapper { List listGreenChannel(JSONObject params); + JSONObject findSamePhone(@Param("contact_phone") String contactPhone); + + JSONObject findSameEmail(@Param("contact_email") String contactEmail); + + JSONObject findSameAddress(@Param("address") String address); + @AutoSql(type = SqlType.SELECT) JSONObject findClientIgnoreInvalid(int clientId); 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 29012451f..e4dc816c0 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 @@ -344,6 +344,26 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid if (manager != null) { checkClientOrg(manager, client); } + + String same_phone = clientMapper.findSamePhone(client.getString("contact_phone")).getString("a"); + if(same_phone!=null&& client.getString("contact_phone")!= null&&same_phone.contains(" ") ) { + same_phone = same_phone.replace(client.getString("client_moniker"),""); + client.put("same_phone","（雷同商户："+same_phone+")" ); + } + + String same_email = clientMapper.findSameEmail(client.getString("contact_email")).getString("a"); + if(same_email!=null&& client.getString("contact_email")!= null&&same_email.contains(" ") ) { + same_email = same_email.replace(client.getString("client_moniker"),""); + client.put("same_email","（雷同商户："+same_email+")" ); + } + + String same_address = clientMapper.findSameAddress(client.getString("address")).getString("a"); + if(same_address!=null&& client.getString("address")!= null&&same_address.contains(" ") ) { + same_address = same_address.replace(client.getString("client_moniker"),""); + client.put("same_address","（雷同商户："+same_address+")" ); + } + + client.putAll(clientConfigService.find(client.getIntValue("client_id"))); client.put("unsubscribe", mailUnsubMapper.findOneByClientMoniker(clientMoniker) == null ? false : true); client.put("show_all_permission", true); 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 cd0e4c957..663dfd9f2 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 @@ -701,4 +701,40 @@ AND is_valid = 1 ) b + + + + + + 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 6c00a08dc..985d6f6ec 100644 --- a/src/main/ui/static/payment/partner/templates/partner_detail.html +++ b/src/main/ui/static/payment/partner/templates/partner_detail.html @@ -703,6 +703,7 @@

    +

    @@ -723,6 +724,7 @@ ng-if="partner.unsubscribe" class="fa fa-star-o text-yellow">

    +

    @@ -739,6 +741,7 @@

    +

    From daa1635b2a175b5ee9abf2175af5455febdf8e94 Mon Sep 17 00:00:00 2001 From: todking Date: Wed, 24 Jul 2019 19:28:54 +0800 Subject: [PATCH 21/43] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E6=96=87=E5=AD=97=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/static/cms/templates/article_editor.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/ui/static/cms/templates/article_editor.html b/src/main/ui/static/cms/templates/article_editor.html index 57061f8ee..8cac23c8d 100644 --- a/src/main/ui/static/cms/templates/article_editor.html +++ b/src/main/ui/static/cms/templates/article_editor.html @@ -68,6 +68,13 @@

    (跳转H5页面链接)

    +
    + +
    + +

    (广告页面内添加的文字)

    +
    +
    From e832e49c8977de2230fb67acd8d47938b4cc2478 Mon Sep 17 00:00:00 2001 From: "taylor.dang" Date: Thu, 25 Jul 2019 10:17:18 +0800 Subject: [PATCH 22/43] =?UTF-8?q?[Y]=20=E6=94=AF=E4=BB=98=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=96=87=E5=AD=97=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/static/cms/templates/article_editor.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/ui/static/cms/templates/article_editor.html b/src/main/ui/static/cms/templates/article_editor.html index 57061f8ee..8cac23c8d 100644 --- a/src/main/ui/static/cms/templates/article_editor.html +++ b/src/main/ui/static/cms/templates/article_editor.html @@ -68,6 +68,13 @@

    (跳转H5页面链接)

    +
    + +
    + +

    (广告页面内添加的文字)

    +
    +
    From c9c477c64ee1389cb24f25a4537b3c53d17ad09d Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 25 Jul 2019 16:14:52 +0800 Subject: [PATCH 23/43] =?UTF-8?q?add=20alipay=20online=20=E5=85=A8?= =?UTF-8?q?=E9=87=8F=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/dev/core/impl/AliforexcelServiceImpl.java | 10 +++++++++- .../payment/manage/mappers/system/ClientMapper.java | 3 +++ .../payment/manage/mappers/system/ClientMapper.xml | 4 ++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 55932b945..5f190c5ca 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.0.26 + 1.0.27 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java index 46a94aec3..9e8a5a143 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java @@ -21,6 +21,8 @@ import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.dom4j.Element; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -44,6 +46,8 @@ public class AliforexcelServiceImpl implements AliforexcelService { private AlipayClient alipayClient; @Resource private OrderMapper orderMapper; + private Logger logger = LoggerFactory.getLogger(getClass()); + @Override public JSONObject listClients(HttpServletResponse httpResponse,JSONObject manager, AliExcel query) { @@ -105,7 +109,7 @@ public class AliforexcelServiceImpl implements AliforexcelService { List registerSuccessMerchant = new ArrayList<>(); List registerFailMerchant = new ArrayList<>(); List lessInfoMerchant = new ArrayList<>(); - List useAlipayOnlineMerchant = transactionMapper.useAlipayOnlineClients(); + List useAlipayOnlineMerchant = clientMapper.listUseAlipayMerchant(); for (int clientId : useAlipayOnlineMerchant) { JSONObject client = clientMapper.findClient(clientId); if (client == null) { @@ -113,6 +117,9 @@ public class AliforexcelServiceImpl implements AliforexcelService { } try { needRegisterMerchant.add(client.getString("client_moniker")); + if (StringUtils.isBlank(client.getString("company_website"))) { + client.put("company_website", client.getString("ali_sub_merchant_id")+".royalpay.com.au"); + } checkPartnerInfo(client,"online"); } catch (InvalidParameterException e) { JSONObject exception = new JSONObject(); @@ -145,6 +152,7 @@ public class AliforexcelServiceImpl implements AliforexcelService { result.put("success_register_merchant", registerSuccessMerchant); result.put("fail_register_merchant", registerFailMerchant); result.put("less_info_merchant", lessInfoMerchant); + logger.info("-------AlipayOnline Gms end----fail_register_merchant"+registerFailMerchant.toString()); return result; } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java index d5d58734c..41497c5f6 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java @@ -130,4 +130,7 @@ public interface ClientMapper { int getPartnercode(@Param("codes") String codes); JSONObject findCountByBd(@Param("bd_group") String bd_group, @Param("today") Date today, @Param("yesterday") Date yesterday, @Param("month") Date month); + + List listUseAlipayMerchant(); + } 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 cd0e4c957..fc464e886 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 @@ -701,4 +701,8 @@ AND is_valid = 1 ) b + + From 8c32b331adc38f255772a732f3b86c0d856aa864 Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 25 Jul 2019 16:16:57 +0800 Subject: [PATCH 24/43] =?UTF-8?q?add=20alipay=20online=20=E5=85=A8?= =?UTF-8?q?=E9=87=8F=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/dev/core/impl/AliforexcelServiceImpl.java | 10 +++++++++- .../payment/manage/mappers/system/ClientMapper.java | 3 +++ .../payment/manage/mappers/system/ClientMapper.xml | 3 +++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 55932b945..5f190c5ca 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.0.26 + 1.0.27 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java index 46a94aec3..9e8a5a143 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java @@ -21,6 +21,8 @@ import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.dom4j.Element; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -44,6 +46,8 @@ public class AliforexcelServiceImpl implements AliforexcelService { private AlipayClient alipayClient; @Resource private OrderMapper orderMapper; + private Logger logger = LoggerFactory.getLogger(getClass()); + @Override public JSONObject listClients(HttpServletResponse httpResponse,JSONObject manager, AliExcel query) { @@ -105,7 +109,7 @@ public class AliforexcelServiceImpl implements AliforexcelService { List registerSuccessMerchant = new ArrayList<>(); List registerFailMerchant = new ArrayList<>(); List lessInfoMerchant = new ArrayList<>(); - List useAlipayOnlineMerchant = transactionMapper.useAlipayOnlineClients(); + List useAlipayOnlineMerchant = clientMapper.listUseAlipayMerchant(); for (int clientId : useAlipayOnlineMerchant) { JSONObject client = clientMapper.findClient(clientId); if (client == null) { @@ -113,6 +117,9 @@ public class AliforexcelServiceImpl implements AliforexcelService { } try { needRegisterMerchant.add(client.getString("client_moniker")); + if (StringUtils.isBlank(client.getString("company_website"))) { + client.put("company_website", client.getString("ali_sub_merchant_id")+".royalpay.com.au"); + } checkPartnerInfo(client,"online"); } catch (InvalidParameterException e) { JSONObject exception = new JSONObject(); @@ -145,6 +152,7 @@ public class AliforexcelServiceImpl implements AliforexcelService { result.put("success_register_merchant", registerSuccessMerchant); result.put("fail_register_merchant", registerFailMerchant); result.put("less_info_merchant", lessInfoMerchant); + logger.info("-------AlipayOnline Gms end----fail_register_merchant"+registerFailMerchant.toString()); return result; } diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java index a142120c2..062933a06 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java @@ -136,4 +136,7 @@ public interface ClientMapper { int getPartnercode(@Param("codes") String codes); JSONObject findCountByBd(@Param("bd_group") String bd_group, @Param("today") Date today, @Param("yesterday") Date yesterday, @Param("month") Date month); + + List listUseAlipayMerchant(); + } 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 663dfd9f2..e38fbae78 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 @@ -735,6 +735,9 @@ WHERE address= #{address} GROUP BY address + + From b7f174dd984b5e85bb2ff1eaffcb13180c211df4 Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 25 Jul 2019 16:45:52 +0800 Subject: [PATCH 25/43] =?UTF-8?q?fix=20=E5=85=A8=E9=87=8F=E5=A4=87?= =?UTF-8?q?=E4=BB=BD=E8=B6=85=E6=97=B6=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../dev/core/impl/AliforexcelServiceImpl.java | 35 +++++++++++-------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 5f190c5ca..afcf33741 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.0.27 + 1.0.28 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java index 9e8a5a143..04e8acdfe 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java @@ -129,24 +129,31 @@ public class AliforexcelServiceImpl implements AliforexcelService { lessInfoMerchant.add(exception); continue; } - AlipayConfig.AlipayMerchant mch = AlipayEnvironment.getEnv().getAlipayOnlineMerchant(); - Element resultElement = alipayClient.registerOnlineGmsPortal(mch.getPid(), client); - if (!StringUtils.equalsIgnoreCase("T", resultElement.elementText("is_success"))) { - JSONObject exception = new JSONObject(); - exception.put("client_moniker", client.getString("client_moniker")); - exception.put("return_msg", resultElement.elementText("error")); - registerFailMerchant.add(exception); - continue; - } - Element responseElement = resultElement.element("response").element("alipay"); - if (!StringUtils.equalsIgnoreCase("SUCCESS", responseElement.elementText("result_code"))) { + try { + AlipayConfig.AlipayMerchant mch = AlipayEnvironment.getEnv().getAlipayOnlineMerchant(); + Element resultElement = alipayClient.registerOnlineGmsPortal(mch.getPid(), client); + if (!StringUtils.equalsIgnoreCase("T", resultElement.elementText("is_success"))) { + JSONObject exception = new JSONObject(); + exception.put("client_moniker", client.getString("client_moniker")); + exception.put("return_msg", resultElement.elementText("error")); + registerFailMerchant.add(exception); + continue; + } + Element responseElement = resultElement.element("response").element("alipay"); + if (!StringUtils.equalsIgnoreCase("SUCCESS", responseElement.elementText("result_code"))) { + JSONObject exception = new JSONObject(); + exception.put("client_moniker", client.getString("client_moniker")); + exception.put("return_msg", resultElement.elementText("error")); + registerFailMerchant.add(exception); + continue; + } + registerSuccessMerchant.add(client.getString("client_moniker")); + } catch (Exception e) { JSONObject exception = new JSONObject(); exception.put("client_moniker", client.getString("client_moniker")); - exception.put("return_msg", resultElement.elementText("error")); + exception.put("return_msg", e.getMessage()); registerFailMerchant.add(exception); - continue; } - registerSuccessMerchant.add(client.getString("client_moniker")); } result.put("need_register_merchant", needRegisterMerchant); result.put("success_register_merchant", registerSuccessMerchant); From 52fda84527896259bbb6532a9a24ae93b0168471 Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 25 Jul 2019 16:48:59 +0800 Subject: [PATCH 26/43] =?UTF-8?q?fix=20=E5=85=A8=E9=87=8F=E5=A4=87?= =?UTF-8?q?=E4=BB=BD=E8=B6=85=E6=97=B6=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../dev/core/impl/AliforexcelServiceImpl.java | 35 +++++++++++-------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 5f190c5ca..afcf33741 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.0.27 + 1.0.28 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java index 9e8a5a143..04e8acdfe 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java @@ -129,24 +129,31 @@ public class AliforexcelServiceImpl implements AliforexcelService { lessInfoMerchant.add(exception); continue; } - AlipayConfig.AlipayMerchant mch = AlipayEnvironment.getEnv().getAlipayOnlineMerchant(); - Element resultElement = alipayClient.registerOnlineGmsPortal(mch.getPid(), client); - if (!StringUtils.equalsIgnoreCase("T", resultElement.elementText("is_success"))) { - JSONObject exception = new JSONObject(); - exception.put("client_moniker", client.getString("client_moniker")); - exception.put("return_msg", resultElement.elementText("error")); - registerFailMerchant.add(exception); - continue; - } - Element responseElement = resultElement.element("response").element("alipay"); - if (!StringUtils.equalsIgnoreCase("SUCCESS", responseElement.elementText("result_code"))) { + try { + AlipayConfig.AlipayMerchant mch = AlipayEnvironment.getEnv().getAlipayOnlineMerchant(); + Element resultElement = alipayClient.registerOnlineGmsPortal(mch.getPid(), client); + if (!StringUtils.equalsIgnoreCase("T", resultElement.elementText("is_success"))) { + JSONObject exception = new JSONObject(); + exception.put("client_moniker", client.getString("client_moniker")); + exception.put("return_msg", resultElement.elementText("error")); + registerFailMerchant.add(exception); + continue; + } + Element responseElement = resultElement.element("response").element("alipay"); + if (!StringUtils.equalsIgnoreCase("SUCCESS", responseElement.elementText("result_code"))) { + JSONObject exception = new JSONObject(); + exception.put("client_moniker", client.getString("client_moniker")); + exception.put("return_msg", resultElement.elementText("error")); + registerFailMerchant.add(exception); + continue; + } + registerSuccessMerchant.add(client.getString("client_moniker")); + } catch (Exception e) { JSONObject exception = new JSONObject(); exception.put("client_moniker", client.getString("client_moniker")); - exception.put("return_msg", resultElement.elementText("error")); + exception.put("return_msg", e.getMessage()); registerFailMerchant.add(exception); - continue; } - registerSuccessMerchant.add(client.getString("client_moniker")); } result.put("need_register_merchant", needRegisterMerchant); result.put("success_register_merchant", registerSuccessMerchant); From 326e16838c80ba7bdcb872585d70803e65c21f44 Mon Sep 17 00:00:00 2001 From: yixian Date: Thu, 25 Jul 2019 17:14:44 +0800 Subject: [PATCH 27/43] update parent version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index afcf33741..107be3249 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ au.com.royalpay.payment payment-parent - 1.0.1 + 1.0.4 4.0.0 From 0aa6146da65435898a0d85ae91a4dcc519fa6eee Mon Sep 17 00:00:00 2001 From: liuxinxin Date: Thu, 25 Jul 2019 20:40:29 +0800 Subject: [PATCH 28/43] =?UTF-8?q?[RoyalPay]=E5=95=86=E6=88=B7=E6=9D=A5?= =?UTF-8?q?=E6=BA=90=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payment/partner/templates/simple_applications.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/ui/static/payment/partner/templates/simple_applications.html b/src/main/ui/static/payment/partner/templates/simple_applications.html index 0f33a608d..695533af2 100644 --- a/src/main/ui/static/payment/partner/templates/simple_applications.html +++ b/src/main/ui/static/payment/partner/templates/simple_applications.html @@ -43,7 +43,7 @@ Phone Email - Company Name + Channel Status Handle Status Create Time @@ -56,7 +56,7 @@ - + 已申请 ({{apply.client_moniker}}) 申请失败 @@ -114,4 +114,4 @@
    -
    \ No newline at end of file +
    From b5104958906699faf8a759893ecec0c830b4d699 Mon Sep 17 00:00:00 2001 From: liuxinxin Date: Fri, 26 Jul 2019 09:41:49 +0800 Subject: [PATCH 29/43] =?UTF-8?q?[RoyalPay]=E5=95=86=E6=88=B7=E6=9D=A5?= =?UTF-8?q?=E6=BA=90=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.properties | 4 ++-- src/main/resources/application.properties | 6 ++++++ .../partner/templates/simple_applications.html | 16 ++++++++++++++-- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index d212f340d..cf8501c5a 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,6 +1,6 @@ spring.datasource.driver-class-name=com.mysql.jdbc.Driver -spring.datasource.schema-name=royalpay_production -spring.datasource.host=192.168.0.18:3306 +spring.datasource.schema-name=royalpay_local +spring.datasource.host=192.168.0.50:3306 spring.datasource.url=jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false spring.datasource.username=root spring.datasource.password=root diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 19969b1c7..24ce162b8 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -143,3 +143,9 @@ app.hanyin-secure.sftp-host=180.168.61.93 app.hanyin-secure.sftp-port=28480 app.hanyin-secure.sftp-username=royalpay app.hanyin-secure.sftp-pwd=royalpay + +apple.message.apns.password= +android.message.appkey= +apple.message.apns.file=/opt +android.message.secret= +app.tax.type=GST diff --git a/src/main/ui/static/payment/partner/templates/simple_applications.html b/src/main/ui/static/payment/partner/templates/simple_applications.html index 695533af2..62a1e4632 100644 --- a/src/main/ui/static/payment/partner/templates/simple_applications.html +++ b/src/main/ui/static/payment/partner/templates/simple_applications.html @@ -43,7 +43,7 @@ Phone Email - Channel + Channel Status Handle Status Create Time @@ -56,7 +56,19 @@ - + + 谷歌|Google + 领英|LinkedIn + 微信|Wechat + 传单手册|Flyer Manual + 其他媒体|Other Media + 线下使用体验|Offline Experience + 朋友介绍|Friend Introduction + 商户推荐|Merchant Recommendation + 销售推荐|Sales Recommendation + + + 已申请 ({{apply.client_moniker}}) 申请失败 From ef29e82e9682186efcaf8644cea104b873c4775f Mon Sep 17 00:00:00 2001 From: liuxinxin Date: Fri, 26 Jul 2019 09:59:17 +0800 Subject: [PATCH 30/43] =?UTF-8?q?[RoyalPay]=E5=95=86=E6=88=B7=E6=9D=A5?= =?UTF-8?q?=E6=BA=90=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/static/payment/partner/templates/simple_applications.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/ui/static/payment/partner/templates/simple_applications.html b/src/main/ui/static/payment/partner/templates/simple_applications.html index 62a1e4632..3a2cfb0fb 100644 --- a/src/main/ui/static/payment/partner/templates/simple_applications.html +++ b/src/main/ui/static/payment/partner/templates/simple_applications.html @@ -57,6 +57,7 @@ + 谷歌|Google 领英|LinkedIn 微信|Wechat From 864d433618d7e27b25895374e37d7ce0a5d30850 Mon Sep 17 00:00:00 2001 From: liuxinxin Date: Fri, 26 Jul 2019 10:00:34 +0800 Subject: [PATCH 31/43] =?UTF-8?q?[RoyalPay]=E5=95=86=E6=88=B7=E6=9D=A5?= =?UTF-8?q?=E6=BA=90=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.properties | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 24ce162b8..c8844ef37 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -144,8 +144,3 @@ app.hanyin-secure.sftp-port=28480 app.hanyin-secure.sftp-username=royalpay app.hanyin-secure.sftp-pwd=royalpay -apple.message.apns.password= -android.message.appkey= -apple.message.apns.file=/opt -android.message.secret= -app.tax.type=GST From c3198044ca87a63814a8fc69d303bc99d3d77cb7 Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 26 Jul 2019 10:15:13 +0800 Subject: [PATCH 32/43] =?UTF-8?q?add=20=E7=AE=A1=E7=90=86mock=E5=95=86?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=E5=A2=9E=E5=8A=A0=E5=90=88=E8=A7=84=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/static/payment/partner/templates/partner_detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 985d6f6ec..83ecf2830 100644 --- a/src/main/ui/static/payment/partner/templates/partner_detail.html +++ b/src/main/ui/static/payment/partner/templates/partner_detail.html @@ -45,7 +45,7 @@

    - (已禁用) From bd09d7ebb9a68a64c9119cc7c2d1d783e40cce01 Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 26 Jul 2019 10:15:55 +0800 Subject: [PATCH 33/43] =?UTF-8?q?add=20=E7=AE=A1=E7=90=86mock=E5=95=86?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=E5=A2=9E=E5=8A=A0=E5=90=88=E8=A7=84=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/static/payment/partner/templates/partner_detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6c00a08dc..e6779e2ab 100644 --- a/src/main/ui/static/payment/partner/templates/partner_detail.html +++ b/src/main/ui/static/payment/partner/templates/partner_detail.html @@ -45,7 +45,7 @@

    - (已禁用) From 1365bd6424b0abbcf850f6c3d562f039a28846da Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 26 Jul 2019 10:49:35 +0800 Subject: [PATCH 34/43] =?UTF-8?q?fix=20=E9=80=80=E6=AC=BE=E5=8D=A0?= =?UTF-8?q?=E6=AF=94=E9=A2=84=E8=AD=A6=E5=A2=9E=E5=8A=A0=E9=A3=8E=E6=8E=A7?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=BE=AE=E4=BF=A1=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/dev/listeners/CloseOrderWarningSender.java | 8 ++++++-- .../listeners/recognizers/PaymentAmountCheatMonitor.java | 8 ++++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index afcf33741..b185b8e7f 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.0.28 + 1.0.29 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/listeners/CloseOrderWarningSender.java b/src/main/java/au/com/royalpay/payment/manage/dev/listeners/CloseOrderWarningSender.java index d8f059410..f85c0f044 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/listeners/CloseOrderWarningSender.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/listeners/CloseOrderWarningSender.java @@ -93,7 +93,7 @@ public class CloseOrderWarningSender implements ApplicationListener developers = managerMapper.listDetailsByRole(null, ManagerRole.DEVELOPER.getMask()); + List developers = managerMapper.listDetailsByRole(null, ManagerRole.DEVELOPER.getMask() | ManagerRole.RISK_MANAGER.getMask()); if (!StringUtils.isEmpty(client.getString("bd_user"))) { String[] bds = client.getString("bd_user").split(","); if (bds.length > 0) { @@ -133,6 +133,9 @@ public class CloseOrderWarningSender implements ApplicationListener developers = managerMapper.listDetailsByRole(null, ManagerRole.DEVELOPER.getMask()); + List developers = managerMapper.listDetailsByRole(null, ManagerRole.DEVELOPER.getMask() | ManagerRole.RISK_MANAGER.getMask()); MpWechatApi api = mpWechatApiProvider.getNewPaymentApi(); for (JSONObject developer : developers) { if(developer.getString("manager_id").equals("141")){ continue; } + if (StringUtils.isBlank(developer.getString("wx_openid"))) { + continue; + } try { String wxOpenid = developer.getString("wx_openid"); if (wxOpenid != null) { @@ -124,7 +127,8 @@ public class PaymentAmountCheatMonitor implements CheatMonitor { TemplateMessage msg = WarningSenderHelper.buildWarningMessage(wxOpenid, templateId, title, content, client.getString("bd_user_name")); api.sendTemplateMessage(msg); } - } catch (Exception ignore) { + } catch (Exception e) { + logger.info("sendTemplateMessage--发送告警模板消息发生错误" + developer.getString("wx_openid") + "--" + e); } } } From ca27ab3cf70ab9d2bfd3d8f85fc5342347805032 Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 26 Jul 2019 10:51:14 +0800 Subject: [PATCH 35/43] =?UTF-8?q?fix=20=E9=80=80=E6=AC=BE=E5=8D=A0?= =?UTF-8?q?=E6=AF=94=E9=A2=84=E8=AD=A6=E5=A2=9E=E5=8A=A0=E9=A3=8E=E6=8E=A7?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=BE=AE=E4=BF=A1=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/dev/listeners/CloseOrderWarningSender.java | 8 ++++++-- .../listeners/recognizers/PaymentAmountCheatMonitor.java | 8 ++++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 107be3249..309394dd5 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.0.28 + 1.0.29 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/listeners/CloseOrderWarningSender.java b/src/main/java/au/com/royalpay/payment/manage/dev/listeners/CloseOrderWarningSender.java index d8f059410..f85c0f044 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/listeners/CloseOrderWarningSender.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/listeners/CloseOrderWarningSender.java @@ -93,7 +93,7 @@ public class CloseOrderWarningSender implements ApplicationListener developers = managerMapper.listDetailsByRole(null, ManagerRole.DEVELOPER.getMask()); + List developers = managerMapper.listDetailsByRole(null, ManagerRole.DEVELOPER.getMask() | ManagerRole.RISK_MANAGER.getMask()); if (!StringUtils.isEmpty(client.getString("bd_user"))) { String[] bds = client.getString("bd_user").split(","); if (bds.length > 0) { @@ -133,6 +133,9 @@ public class CloseOrderWarningSender implements ApplicationListener developers = managerMapper.listDetailsByRole(null, ManagerRole.DEVELOPER.getMask()); + List developers = managerMapper.listDetailsByRole(null, ManagerRole.DEVELOPER.getMask() | ManagerRole.RISK_MANAGER.getMask()); MpWechatApi api = mpWechatApiProvider.getNewPaymentApi(); for (JSONObject developer : developers) { if(developer.getString("manager_id").equals("141")){ continue; } + if (StringUtils.isBlank(developer.getString("wx_openid"))) { + continue; + } try { String wxOpenid = developer.getString("wx_openid"); if (wxOpenid != null) { @@ -124,7 +127,8 @@ public class PaymentAmountCheatMonitor implements CheatMonitor { TemplateMessage msg = WarningSenderHelper.buildWarningMessage(wxOpenid, templateId, title, content, client.getString("bd_user_name")); api.sendTemplateMessage(msg); } - } catch (Exception ignore) { + } catch (Exception e) { + logger.info("sendTemplateMessage--发送告警模板消息发生错误" + developer.getString("wx_openid") + "--" + e); } } } From 174f99d998d46ccc48eb8bcaed43893884c3264c Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 26 Jul 2019 15:51:37 +0800 Subject: [PATCH 36/43] =?UTF-8?q?add=20=E6=94=AF=E4=BB=98=E5=AE=9D?= =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E6=89=B9=E9=87=8F=E6=8A=A5=E5=A4=87range?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/dev/core/AliforexcelService.java | 2 + .../dev/core/impl/AliforexcelServiceImpl.java | 63 ++++++++++++++++++- .../manage/dev/web/TestController.java | 5 ++ .../manage/mappers/system/ClientMapper.java | 2 +- .../manage/mappers/system/ClientMapper.xml | 1 + 6 files changed, 72 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index b185b8e7f..924ec5959 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.0.29 + 1.0.30 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/AliforexcelService.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/AliforexcelService.java index e854e4423..7581c3d9d 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/core/AliforexcelService.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/AliforexcelService.java @@ -13,6 +13,8 @@ public interface AliforexcelService { JSONObject registerAlipayOnlineMerchant(); + JSONObject registerRangeAlipayOnlineMerchant(int start,int end); + JSONObject registerAlipayMerchant(); JSONObject registerInsertAlipayMerchant(String partners); diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java index 04e8acdfe..9b1cc391b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java @@ -109,7 +109,68 @@ public class AliforexcelServiceImpl implements AliforexcelService { List registerSuccessMerchant = new ArrayList<>(); List registerFailMerchant = new ArrayList<>(); List lessInfoMerchant = new ArrayList<>(); - List useAlipayOnlineMerchant = clientMapper.listUseAlipayMerchant(); + List useAlipayOnlineMerchant = clientMapper.listUseAlipayMerchant(0,10000); + for (int clientId : useAlipayOnlineMerchant) { + JSONObject client = clientMapper.findClient(clientId); + if (client == null) { + continue; + } + try { + needRegisterMerchant.add(client.getString("client_moniker")); + if (StringUtils.isBlank(client.getString("company_website"))) { + client.put("company_website", client.getString("ali_sub_merchant_id")+".royalpay.com.au"); + } + checkPartnerInfo(client,"online"); + } catch (InvalidParameterException e) { + JSONObject exception = new JSONObject(); + exception.put("client_moniker", client.getString("client_moniker")); + exception.put("return_msg", e.getMessage()); + exception.put("bd_name", client.getString("bd_user_name")); + lessInfoMerchant.add(exception); + continue; + } + try { + AlipayConfig.AlipayMerchant mch = AlipayEnvironment.getEnv().getAlipayOnlineMerchant(); + Element resultElement = alipayClient.registerOnlineGmsPortal(mch.getPid(), client); + if (!StringUtils.equalsIgnoreCase("T", resultElement.elementText("is_success"))) { + JSONObject exception = new JSONObject(); + exception.put("client_moniker", client.getString("client_moniker")); + exception.put("return_msg", resultElement.elementText("error")); + registerFailMerchant.add(exception); + continue; + } + Element responseElement = resultElement.element("response").element("alipay"); + if (!StringUtils.equalsIgnoreCase("SUCCESS", responseElement.elementText("result_code"))) { + JSONObject exception = new JSONObject(); + exception.put("client_moniker", client.getString("client_moniker")); + exception.put("return_msg", resultElement.elementText("error")); + registerFailMerchant.add(exception); + continue; + } + registerSuccessMerchant.add(client.getString("client_moniker")); + } catch (Exception e) { + JSONObject exception = new JSONObject(); + exception.put("client_moniker", client.getString("client_moniker")); + exception.put("return_msg", e.getMessage()); + registerFailMerchant.add(exception); + } + } + result.put("need_register_merchant", needRegisterMerchant); + result.put("success_register_merchant", registerSuccessMerchant); + result.put("fail_register_merchant", registerFailMerchant); + result.put("less_info_merchant", lessInfoMerchant); + logger.info("-------AlipayOnline Gms end----fail_register_merchant"+registerFailMerchant.toString()); + return result; + } + + @Override + public JSONObject registerRangeAlipayOnlineMerchant(int start, int end) { + JSONObject result = new JSONObject(); + List needRegisterMerchant = new ArrayList<>(); + List registerSuccessMerchant = new ArrayList<>(); + List registerFailMerchant = new ArrayList<>(); + List lessInfoMerchant = new ArrayList<>(); + List useAlipayOnlineMerchant = clientMapper.listUseAlipayMerchant(start,end); for (int clientId : useAlipayOnlineMerchant) { JSONObject client = clientMapper.findClient(clientId); if (client == null) { diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java index 8e5906843..772075c1c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java @@ -459,6 +459,11 @@ public class TestController implements ApplicationEventPublisherAware { return aliforexcelService.registerAlipayOnlineMerchant(); } + @ManagerMapping(value = "/register/alipayOnlineGms", role = ManagerRole.DEVELOPER, method = RequestMethod.GET) + public JSONObject registerRangeAlipayOnlineMerchant(@RequestParam int start,@RequestParam int end) { + return aliforexcelService.registerRangeAlipayOnlineMerchant(start,end); + } + @ManagerMapping(value = "/register/alipayGms", role = ManagerRole.DEVELOPER, method = RequestMethod.POST) public JSONObject registerAlipayMerchant() { return aliforexcelService.registerAlipayMerchant(); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java index 41497c5f6..6caa61cea 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java @@ -131,6 +131,6 @@ public interface ClientMapper { JSONObject findCountByBd(@Param("bd_group") String bd_group, @Param("today") Date today, @Param("yesterday") Date yesterday, @Param("month") Date month); - List listUseAlipayMerchant(); + List listUseAlipayMerchant(@Param("start") int start, @Param("end") int end); } 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 fc464e886..34e56dbd9 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 @@ -704,5 +704,6 @@ From 45286ac2d37b864239d11901bb0d5eecfbd7213d Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 26 Jul 2019 15:53:40 +0800 Subject: [PATCH 37/43] =?UTF-8?q?add=20=E6=94=AF=E4=BB=98=E5=AE=9D?= =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E6=89=B9=E9=87=8F=E6=8A=A5=E5=A4=87range?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/dev/core/AliforexcelService.java | 2 + .../dev/core/impl/AliforexcelServiceImpl.java | 63 ++++++++++++++++++- .../manage/dev/web/TestController.java | 5 ++ .../manage/mappers/system/ClientMapper.java | 2 +- .../manage/mappers/system/ClientMapper.xml | 1 + 6 files changed, 72 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 309394dd5..3fa7174b3 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.0.29 + 1.0.30 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/AliforexcelService.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/AliforexcelService.java index e854e4423..7581c3d9d 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/core/AliforexcelService.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/AliforexcelService.java @@ -13,6 +13,8 @@ public interface AliforexcelService { JSONObject registerAlipayOnlineMerchant(); + JSONObject registerRangeAlipayOnlineMerchant(int start,int end); + JSONObject registerAlipayMerchant(); JSONObject registerInsertAlipayMerchant(String partners); diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java index 04e8acdfe..9b1cc391b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java @@ -109,7 +109,68 @@ public class AliforexcelServiceImpl implements AliforexcelService { List registerSuccessMerchant = new ArrayList<>(); List registerFailMerchant = new ArrayList<>(); List lessInfoMerchant = new ArrayList<>(); - List useAlipayOnlineMerchant = clientMapper.listUseAlipayMerchant(); + List useAlipayOnlineMerchant = clientMapper.listUseAlipayMerchant(0,10000); + for (int clientId : useAlipayOnlineMerchant) { + JSONObject client = clientMapper.findClient(clientId); + if (client == null) { + continue; + } + try { + needRegisterMerchant.add(client.getString("client_moniker")); + if (StringUtils.isBlank(client.getString("company_website"))) { + client.put("company_website", client.getString("ali_sub_merchant_id")+".royalpay.com.au"); + } + checkPartnerInfo(client,"online"); + } catch (InvalidParameterException e) { + JSONObject exception = new JSONObject(); + exception.put("client_moniker", client.getString("client_moniker")); + exception.put("return_msg", e.getMessage()); + exception.put("bd_name", client.getString("bd_user_name")); + lessInfoMerchant.add(exception); + continue; + } + try { + AlipayConfig.AlipayMerchant mch = AlipayEnvironment.getEnv().getAlipayOnlineMerchant(); + Element resultElement = alipayClient.registerOnlineGmsPortal(mch.getPid(), client); + if (!StringUtils.equalsIgnoreCase("T", resultElement.elementText("is_success"))) { + JSONObject exception = new JSONObject(); + exception.put("client_moniker", client.getString("client_moniker")); + exception.put("return_msg", resultElement.elementText("error")); + registerFailMerchant.add(exception); + continue; + } + Element responseElement = resultElement.element("response").element("alipay"); + if (!StringUtils.equalsIgnoreCase("SUCCESS", responseElement.elementText("result_code"))) { + JSONObject exception = new JSONObject(); + exception.put("client_moniker", client.getString("client_moniker")); + exception.put("return_msg", resultElement.elementText("error")); + registerFailMerchant.add(exception); + continue; + } + registerSuccessMerchant.add(client.getString("client_moniker")); + } catch (Exception e) { + JSONObject exception = new JSONObject(); + exception.put("client_moniker", client.getString("client_moniker")); + exception.put("return_msg", e.getMessage()); + registerFailMerchant.add(exception); + } + } + result.put("need_register_merchant", needRegisterMerchant); + result.put("success_register_merchant", registerSuccessMerchant); + result.put("fail_register_merchant", registerFailMerchant); + result.put("less_info_merchant", lessInfoMerchant); + logger.info("-------AlipayOnline Gms end----fail_register_merchant"+registerFailMerchant.toString()); + return result; + } + + @Override + public JSONObject registerRangeAlipayOnlineMerchant(int start, int end) { + JSONObject result = new JSONObject(); + List needRegisterMerchant = new ArrayList<>(); + List registerSuccessMerchant = new ArrayList<>(); + List registerFailMerchant = new ArrayList<>(); + List lessInfoMerchant = new ArrayList<>(); + List useAlipayOnlineMerchant = clientMapper.listUseAlipayMerchant(start,end); for (int clientId : useAlipayOnlineMerchant) { JSONObject client = clientMapper.findClient(clientId); if (client == null) { diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java index 8e5906843..772075c1c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java @@ -459,6 +459,11 @@ public class TestController implements ApplicationEventPublisherAware { return aliforexcelService.registerAlipayOnlineMerchant(); } + @ManagerMapping(value = "/register/alipayOnlineGms", role = ManagerRole.DEVELOPER, method = RequestMethod.GET) + public JSONObject registerRangeAlipayOnlineMerchant(@RequestParam int start,@RequestParam int end) { + return aliforexcelService.registerRangeAlipayOnlineMerchant(start,end); + } + @ManagerMapping(value = "/register/alipayGms", role = ManagerRole.DEVELOPER, method = RequestMethod.POST) public JSONObject registerAlipayMerchant() { return aliforexcelService.registerAlipayMerchant(); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java index 062933a06..38465c092 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java @@ -137,6 +137,6 @@ public interface ClientMapper { JSONObject findCountByBd(@Param("bd_group") String bd_group, @Param("today") Date today, @Param("yesterday") Date yesterday, @Param("month") Date month); - List listUseAlipayMerchant(); + List listUseAlipayMerchant(@Param("start") int start, @Param("end") int end); } 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 e38fbae78..efabf9951 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 @@ -739,5 +739,6 @@ From c612bee3bae3b45033dc249d883d713d46dc46a3 Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 26 Jul 2019 16:02:19 +0800 Subject: [PATCH 38/43] =?UTF-8?q?add=20=E6=94=AF=E4=BB=98=E5=AE=9D?= =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E6=89=B9=E9=87=8F=E6=8A=A5=E5=A4=87range?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/dev/core/impl/AliforexcelServiceImpl.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3fa7174b3..c2c1555f5 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.0.30 + 1.0.31 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java index 9b1cc391b..81959d481 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java @@ -181,6 +181,12 @@ public class AliforexcelServiceImpl implements AliforexcelService { if (StringUtils.isBlank(client.getString("company_website"))) { client.put("company_website", client.getString("ali_sub_merchant_id")+".royalpay.com.au"); } + if (StringUtils.isBlank(client.getString("alipayindustry"))) { + client.put("alipayindustry", "5311"); + } + if (StringUtils.isBlank(client.getString("business_structure"))) { + client.put("business_structure", "da"); + } checkPartnerInfo(client,"online"); } catch (InvalidParameterException e) { JSONObject exception = new JSONObject(); From bf8531d00cc064020e38277b21e11bc55366171b Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 26 Jul 2019 16:02:47 +0800 Subject: [PATCH 39/43] =?UTF-8?q?add=20=E6=94=AF=E4=BB=98=E5=AE=9D?= =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E6=89=B9=E9=87=8F=E6=8A=A5=E5=A4=87range?= 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 924ec5959..90202a62f 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.0.30 + 1.0.31 UTF-8 From 5875534cb43808a4bfbf713dbee2c51bd0e2bc57 Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 26 Jul 2019 16:12:43 +0800 Subject: [PATCH 40/43] =?UTF-8?q?fix=20=E6=94=AF=E4=BB=98=E5=AE=9D?= =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E6=89=B9=E9=87=8F=E6=8A=A5=E5=A4=87range?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../dev/core/impl/AliforexcelServiceImpl.java | 13 ++++++++++++- .../payment/manage/dev/web/TestController.java | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 90202a62f..1574953c1 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.0.31 + 1.0.32 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java index 9b1cc391b..d03e19576 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java @@ -120,6 +120,12 @@ public class AliforexcelServiceImpl implements AliforexcelService { if (StringUtils.isBlank(client.getString("company_website"))) { client.put("company_website", client.getString("ali_sub_merchant_id")+".royalpay.com.au"); } + if (StringUtils.isBlank(client.getString("alipayindustry"))) { + client.put("alipayindustry", "5311"); + } + if (StringUtils.isBlank(client.getString("business_structure"))) { + client.put("business_structure", "da"); + } checkPartnerInfo(client,"online"); } catch (InvalidParameterException e) { JSONObject exception = new JSONObject(); @@ -181,7 +187,12 @@ public class AliforexcelServiceImpl implements AliforexcelService { if (StringUtils.isBlank(client.getString("company_website"))) { client.put("company_website", client.getString("ali_sub_merchant_id")+".royalpay.com.au"); } - checkPartnerInfo(client,"online"); + if (StringUtils.isBlank(client.getString("alipayindustry"))) { + client.put("alipayindustry", "5311"); + } + if (StringUtils.isBlank(client.getString("business_structure"))) { + client.put("business_structure", "da"); + } } catch (InvalidParameterException e) { JSONObject exception = new JSONObject(); exception.put("client_moniker", client.getString("client_moniker")); diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java index 772075c1c..0f8ff74f7 100644 --- a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java +++ b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java @@ -459,7 +459,7 @@ public class TestController implements ApplicationEventPublisherAware { return aliforexcelService.registerAlipayOnlineMerchant(); } - @ManagerMapping(value = "/register/alipayOnlineGms", role = ManagerRole.DEVELOPER, method = RequestMethod.GET) + @ManagerMapping(value = "/register/alipayOnlineGms/range", role = ManagerRole.DEVELOPER, method = RequestMethod.GET) public JSONObject registerRangeAlipayOnlineMerchant(@RequestParam int start,@RequestParam int end) { return aliforexcelService.registerRangeAlipayOnlineMerchant(start,end); } From f9b8eccfbf9880ae0d63db625bdb768c12eb4fdd Mon Sep 17 00:00:00 2001 From: "taylor.dang" Date: Fri, 26 Jul 2019 17:37:53 +0800 Subject: [PATCH 41/43] [Y] pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c2c1555f5..d7e61a127 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.0.31 + 1.0.33 UTF-8 From 1f28dacb59621e1f58752d58074644857fa645e6 Mon Sep 17 00:00:00 2001 From: luoyang Date: Mon, 29 Jul 2019 16:02:45 +0800 Subject: [PATCH 42/43] fix add partner --- src/main/ui/static/payment/partner/partner-manage.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index 67764f20a..047ac71dc 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -632,6 +632,11 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter alert('请选择商户支付方式') return; } + if (typeof ($scope.partner.client_pay_type) == 'string' || typeof ($scope.partner.client_pay_desc) == 'string') { + $scope.partner.client_pay_type = $scope.partner.client_pay_type.split(","); + $scope.partner.client_pay_desc = $scope.partner.client_pay_desc.split(","); + + } if ($scope.partner.client_pay_type.indexOf('1') >= 0) { if ($scope.partner.client_pay_desc.join(',').indexOf('10') < 0) { alert("请检查线上支付场景是否已选择支付方式"); From e0dd7882077d484cc1c9e510a8f7c6e73e8f7f02 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 30 Jul 2019 16:00:28 +0800 Subject: [PATCH 43/43] =?UTF-8?q?fix=20remark=20=E5=8F=AA=E6=9C=89?= =?UTF-8?q?=E5=90=88=E8=A7=84=E5=92=8C=E9=A3=8E=E6=8E=A7=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/static/payment/partner/templates/partner_edit.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 31e1558b2..af6482fb8 100644 --- a/src/main/ui/static/payment/partner/templates/partner_edit.html +++ b/src/main/ui/static/payment/partner/templates/partner_edit.html @@ -286,7 +286,7 @@

    -
    +