From 3c0cd51c9890ef2bf2126f7bea67d732ddf662b7 Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 23 May 2019 16:17:27 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=88=A0=E9=99=A4=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/dev/core/AliforexcelService.java | 2 - .../dev/core/impl/AliforexcelServiceImpl.java | 50 ------------------- .../manage/dev/web/TestController.java | 5 -- .../mappers/payment/TransactionMapper.java | 2 - .../mappers/payment/TransactionMapper.xml | 5 -- .../ui/static/config/devtools/devtools.js | 14 ------ .../registerAlipayOnlineMerchant.html | 22 -------- 7 files changed, 100 deletions(-) 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 651b879ca..63ac55f5f 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,7 +13,5 @@ public interface AliforexcelService { JSONObject registerAlipayOnlineMerchant(); - JSONObject registerAlipayOnlineMerchantTmp(); - JSONObject getLessPartnerInfo(); } 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 2f91ecc83..59acf4ed6 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 @@ -140,56 +140,6 @@ public class AliforexcelServiceImpl implements AliforexcelService { return result; } - @Override - public JSONObject registerAlipayOnlineMerchantTmp() { - JSONObject result = new JSONObject(); - List needRegisterMerchant = new ArrayList<>(); - List registerSuccessMerchant = new ArrayList<>(); - List registerFailMerchant = new ArrayList<>(); - List lessInfoMerchant = new ArrayList<>(); - List useAlipayOnlineMerchant = transactionMapper.useAlipayOnlineClientsTmp(); - for (int clientId : useAlipayOnlineMerchant) { - JSONObject client = clientMapper.findClient(clientId); - if (client == null) { - continue; - } - try { - needRegisterMerchant.add(client.getString("client_moniker")); - checkPartnerInfo(client); - } 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 81692b649..ceb3a28cd 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 @@ -455,11 +455,6 @@ public class TestController implements ApplicationEventPublisherAware { return aliforexcelService.registerAlipayOnlineMerchant(); } - @ManagerMapping(value = "/register/alipayOnlineGms/tmp", role = ManagerRole.DEVELOPER, method = RequestMethod.POST) - public JSONObject registerAlipayOnlineMerchantTmp() { - return aliforexcelService.registerAlipayOnlineMerchantTmp(); - } - @ManagerMapping(value = "/register/getLessPartnerInfo", role = ManagerRole.DEVELOPER, method = RequestMethod.GET) public JSONObject getLessPartnerInfo() { return aliforexcelService.getLessPartnerInfo(); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java index 4879c4dd7..997831791 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java @@ -159,6 +159,4 @@ public interface TransactionMapper { List getLastDaytransAmount(JSONObject params); List useAlipayOnlineClients(); - - List useAlipayOnlineClientsTmp(); } diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml index f11770b51..24cf01ff6 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml @@ -1213,9 +1213,4 @@ SELECT DISTINCT client_id FROM pmt_transactions WHERE order_channel='AlipayOnline' - - diff --git a/src/main/ui/static/config/devtools/devtools.js b/src/main/ui/static/config/devtools/devtools.js index c238328c2..101374d74 100644 --- a/src/main/ui/static/config/devtools/devtools.js +++ b/src/main/ui/static/config/devtools/devtools.js @@ -425,20 +425,6 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) { alert(resp.data.message); }) }; - $scope.registerOnlineGMSTmp = function () { - $scope.totalhide = true; - $scope.selecttotal = false; - $http.post('/dev/register/alipayOnlineGms/tmp').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 d793d5d7b..cfe468bad 100644 --- a/src/main/ui/static/config/devtools/templates/registerAlipayOnlineMerchant.html +++ b/src/main/ui/static/config/devtools/templates/registerAlipayOnlineMerchant.html @@ -15,9 +15,6 @@
-
- -
需要报备的商户编码

@@ -43,23 +40,4 @@ -
- 缺少信息的商户编码 - - - - - - - - - - - - - -
client_moniker缺少信息
- {{client.client_moniker}} -
-
\ No newline at end of file