From 838cd5c49a873e41c4fc7ec82dc1f2a0a082f5d7 Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 18 Jul 2019 16:10:31 +0800 Subject: [PATCH 01/53] =?UTF-8?q?add=20=E5=A2=9E=E5=8A=A0=E6=8A=A5?= =?UTF-8?q?=E5=A4=87=E6=B5=8B=E8=AF=95=E6=8E=A5=E5=8F=A3=EF=BC=8C=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E7=BC=96=E7=A0=81=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 | 68 +++++++++++++++++++ .../manage/dev/web/TestController.java | 5 ++ .../ui/static/config/devtools/devtools.js | 17 +++++ .../registerAlipayOnlineMerchant.html | 4 ++ 6 files changed, 97 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8b9c8d116..8644ecb65 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.0.20 + 1.0.21 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 e19587901..ea77df4ec 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 @@ -15,6 +15,8 @@ public interface AliforexcelService { JSONObject registerAlipayMerchant(); + JSONObject registerInsertAlipayMerchant(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 ffcd27830..5c50f54fe 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 @@ -199,6 +199,74 @@ public class AliforexcelServiceImpl implements AliforexcelService { return result; } + @Override + public JSONObject registerInsertAlipayMerchant(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("store_photo")) || StringUtils.isBlank(client.getString("company_photo"))) { + if (StringUtils.isBlank(client.getString("store_photo")) && !StringUtils.isBlank(client.getString("company_photo"))) { + client.put("store_photo", client.getString("company_photo")); + } + if (!StringUtils.isBlank(client.getString("store_photo")) && StringUtils.isBlank(client.getString("company_photo"))) { + client.put("company_photo", client.getString("store_photo")); + } + if (StringUtils.isBlank(client.getString("store_photo")) && StringUtils.isBlank(client.getString("company_photo"))) { + client.put("store_photo", client.getString("logo_url")); + client.put("company_photo", client.getString("logo_url")); + } + } + checkPartnerInfo(client,"offline"); + } 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().getAlipayRetailMerchant(); + Element resultElement = alipayClient.registerGmsPortal(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 dad9bb3be..13418cd84 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 @@ -464,6 +464,11 @@ public class TestController implements ApplicationEventPublisherAware { return aliforexcelService.registerAlipayMerchant(); } + @ManagerMapping(value = "/register/alipayGms/insert_partner", role = ManagerRole.DEVELOPER, method = RequestMethod.POST) + public JSONObject registerInsertAlipayMerchant(@RequestBody JSONObject partners) { + return aliforexcelService.registerInsertAlipayMerchant(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 2cc56f2bb..a97576c01 100644 --- a/src/main/ui/static/config/devtools/devtools.js +++ b/src/main/ui/static/config/devtools/devtools.js @@ -439,6 +439,23 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) { alert(resp.data.message); }) }; + $scope.registerInsertGMS = function (text) { + $scope.totalhide = true; + $scope.selecttotal = false; + var params = {}; + params.partners = text; + $http.post('/dev/register/alipayGms/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 eef722aa4..12a73e0d6 100644 --- a/src/main/ui/static/config/devtools/templates/registerAlipayOnlineMerchant.html +++ b/src/main/ui/static/config/devtools/templates/registerAlipayOnlineMerchant.html @@ -18,6 +18,10 @@
+
+ + +
需要报备的商户编码

From 831658f3228698c9a81b9cdcc0c121eadca7e1f8 Mon Sep 17 00:00:00 2001 From: luoyang Date: Sat, 20 Jul 2019 19:58:03 +0800 Subject: [PATCH 02/53] =?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 @@ -