From 1549c64c08f4eec1cc07d3c5f007c1be2c50b8be Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 29 May 2019 09:31:02 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=90=88=E8=A7=84=E5=95=86=E5=93=81?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/impls/ClientManagerImpl.java | 19 ------------------- 1 file changed, 19 deletions(-) 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 a6fc718a9..f9ae1193a 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 @@ -3061,12 +3061,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid throw new InvalidShortIdException(); } client.putAll(clientConfigService.find(client.getIntValue("client_id"))); - if (client.getInteger("open_status") == null) { - int countProduct = commoditiesMapper.checkProduct(client.getInteger("client_id")); - if (countProduct <= 0) { - throw new BadRequestException("The Merchant's Product is empty!"); - } - } if (manager != null && ManagerRole.BD_USER.hasRole(manager.getIntValue("role"))) { int bdOperatClientRole = clientBDMapper.checkBDPermission(client.getIntValue("client_id"), manager.getString("manager_id")); if (bdOperatClientRole <= 0) { @@ -3140,13 +3134,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid } } - if (client.getInteger("open_status") == null) { - int countProduct = commoditiesMapper.checkProduct(client.getInteger("client_id")); - if (countProduct <= 0) { - throw new BadRequestException("The Merchant's Product is empty!"); - } - } - JSONObject surCharge = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), new Date(), "Wechat"); if (surCharge == null || surCharge.size() <= 0) { throw new BadRequestException("The Partner's Rate is not config!"); @@ -3174,12 +3161,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid throw new InvalidShortIdException(); } client.putAll(clientConfigService.find(client.getIntValue("client_id"))); - if (client.getInteger("open_status") == null) { - int countProduct = commoditiesMapper.checkProduct(client.getInteger("client_id")); - if (countProduct <= 0) { - throw new BadRequestException("The Merchant's Product is empty!"); - } - } if (manager != null && ManagerRole.BD_USER.hasRole(manager.getIntValue("role"))) { int bdOperatClientRole = clientBDMapper.checkBDPermission(client.getIntValue("client_id"), manager.getString("manager_id"));