fix app修改商户信息可能会导致client_pay_type异常

master
luoyang 5 years ago
parent 074c380915
commit 48f2151bc2

@ -13,7 +13,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>1.1.2</jib-maven-plugin.version> <jib-maven-plugin.version>1.1.2</jib-maven-plugin.version>
<docker-image.version>1.1.14</docker-image.version> <docker-image.version>1.1.15</docker-image.version>
</properties> </properties>
<dependencies> <dependencies>

@ -138,6 +138,10 @@ public class ManageAppServiceImp implements ManageAppService {
String clientType = device.getString("client_type"); String clientType = device.getString("client_type");
manageDeviceSupport.findRegister(clientType); manageDeviceSupport.findRegister(clientType);
JSONObject manager = managerMapper.findById(device.getString("manager_id")); 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); clientManager.updateClientRegisterInfo(manager, clientMoniker, info);
} }

@ -767,8 +767,10 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
JSONObject clientConfig = new JSONObject(); JSONObject clientConfig = new JSONObject();
clientConfig.put("client_id", clientId); clientConfig.put("client_id", clientId);
clientConfig.put("client_moniker", client.getString("client_moniker")); clientConfig.put("client_moniker", client.getString("client_moniker"));
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_type", updateInfo.getString("client_pay_type"));
clientConfig.put("client_pay_desc", updateInfo.get("client_pay_desc")); clientConfig.put("client_pay_desc", updateInfo.getString("client_pay_desc"));
}
clientConfigMapper.update(clientConfig); clientConfigMapper.update(clientConfig);
clientInfoCacheSupport.clearClientCache(clientId); clientInfoCacheSupport.clearClientCache(clientId);
} }

Loading…
Cancel
Save