|
|
@ -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);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|