From 48f2151bc2caf27b4fc7c742271dc3c86b4cc085 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 16 Jul 2019 10:18:13 +0800 Subject: [PATCH] =?UTF-8?q?fix=20app=E4=BF=AE=E6=94=B9=E5=95=86=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8F=AF=E8=83=BD=E4=BC=9A=E5=AF=BC=E8=87=B4?= =?UTF-8?q?client=5Fpay=5Ftype=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../manage/appclient/core/impls/ManageAppServiceImp.java | 4 ++++ .../manage/merchants/core/impls/ClientManagerImpl.java | 6 ++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index de74e29ee..a8188ffd8 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ UTF-8 1.1.2 - 1.1.14 + 1.1.15 diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java index 2de0ebf03..140bcc3e0 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java @@ -138,6 +138,10 @@ public class ManageAppServiceImp implements ManageAppService { String clientType = device.getString("client_type"); manageDeviceSupport.findRegister(clientType); JSONObject manager = managerMapper.findById(device.getString("manager_id")); + if (StringUtils.isNotBlank(info.getClient_pay_type())&& StringUtils.isNotBlank(info.getClient_pay_desc())) { + info.setClient_pay_type(""); + info.setClient_pay_desc(""); + } clientManager.updateClientRegisterInfo(manager, clientMoniker, info); } 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 523f6837e..e96836e20 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 @@ -767,8 +767,10 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid JSONObject clientConfig = new JSONObject(); clientConfig.put("client_id", clientId); clientConfig.put("client_moniker", client.getString("client_moniker")); - clientConfig.put("client_pay_type", updateInfo.getString("client_pay_type")); - clientConfig.put("client_pay_desc", updateInfo.get("client_pay_desc")); + if (StringUtils.isNotBlank(updateInfo.getString("client_pay_type"))&& StringUtils.isNotBlank(updateInfo.getString("client_pay_desc"))) { + clientConfig.put("client_pay_type", updateInfo.getString("client_pay_type")); + clientConfig.put("client_pay_desc", updateInfo.getString("client_pay_desc")); + } clientConfigMapper.update(clientConfig); clientInfoCacheSupport.clearClientCache(clientId); }