From 0aa6146da65435898a0d85ae91a4dcc519fa6eee Mon Sep 17 00:00:00 2001 From: liuxinxin Date: Thu, 25 Jul 2019 20:40:29 +0800 Subject: [PATCH 1/8] =?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 2/8] =?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 3/8] =?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 4/8] =?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 5/8] =?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 ca27ab3cf70ab9d2bfd3d8f85fc5342347805032 Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 26 Jul 2019 10:51:14 +0800 Subject: [PATCH 6/8] =?UTF-8?q?fix=20=E9=80=80=E6=AC=BE=E5=8D=A0=E6=AF=94?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=A2=9E=E5=8A=A0=E9=A3=8E=E6=8E=A7=E4=BA=BA?= =?UTF-8?q?=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 45286ac2d37b864239d11901bb0d5eecfbd7213d Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 26 Jul 2019 15:53:40 +0800 Subject: [PATCH 7/8] =?UTF-8?q?add=20=E6=94=AF=E4=BB=98=E5=AE=9D=E7=BA=BF?= =?UTF-8?q?=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 8/8] =?UTF-8?q?add=20=E6=94=AF=E4=BB=98=E5=AE=9D=E7=BA=BF?= =?UTF-8?q?=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();