add 自助进件调整

master
luoyang 5 years ago
parent bec879cf56
commit b533845741

@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId> <artifactId>manage</artifactId>
<version>1.2.61</version> <version>1.2.62</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

@ -522,6 +522,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
@Override @Override
public void exportClients(JSONObject manager, PartnerQuery query, HttpServletResponse resp) { public void exportClients(JSONObject manager, PartnerQuery query, HttpServletResponse resp) {
JSONObject params = prepareListClientsParameter(manager, query); JSONObject params = prepareListClientsParameter(manager, query);
logger.info("exporting_clients:--->{}", params);
JSONObject retResp = serverlessFunctionTrigger.triggerFunction("export_merchants", params); JSONObject retResp = serverlessFunctionTrigger.triggerFunction("export_merchants", params);
String contentB64 = retResp.getString("content"); String contentB64 = retResp.getString("content");
resp.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); resp.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
@ -4976,11 +4977,11 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
String[] payType = clientConfig.getString("client_pay_type").split(","); String[] payType = clientConfig.getString("client_pay_type").split(",");
if (Arrays.asList(payType).contains("1")) { if (Arrays.asList(payType).contains("1")) {
registerAlipayOnlineGms(clientMoniker, null); registerAlipayOnlineGms(clientMoniker, null);
switchChannelPermission(account, clientMoniker, "Alipay", true); enableGatewayAlipayOnline(account, clientMoniker, true);
} }
if (Arrays.asList(payType).contains("2")) { if (Arrays.asList(payType).contains("2")) {
registerAlipayGms(clientMoniker, null); registerAlipayGms(clientMoniker, null);
enableGatewayAlipayOnline(account, clientMoniker, true); switchChannelPermission(account, clientMoniker, "Alipay", true);
} }
} }
} }

Loading…
Cancel
Save