|
|
@ -2684,6 +2684,10 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
|
|
|
|
checkOrgPermission(manager, client);
|
|
|
|
checkOrgPermission(manager, client);
|
|
|
|
JSONObject params = new JSONObject();
|
|
|
|
JSONObject params = new JSONObject();
|
|
|
|
params.put("client_id", client.getIntValue("client_id"));
|
|
|
|
params.put("client_id", client.getIntValue("client_id"));
|
|
|
|
|
|
|
|
JSONObject mchConfig = merchantInfoProvider.getMchExtParams(client.getIntValue("client_id"));
|
|
|
|
|
|
|
|
if (mchConfig.getBooleanValue("hide_mch_device")) {
|
|
|
|
|
|
|
|
return new JSONObject();
|
|
|
|
|
|
|
|
}
|
|
|
|
if (remark != null) {
|
|
|
|
if (remark != null) {
|
|
|
|
params.put("remark", remark);
|
|
|
|
params.put("remark", remark);
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -2707,6 +2711,10 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
|
|
|
|
throw new InvalidShortIdException();
|
|
|
|
throw new InvalidShortIdException();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
checkOrgPermission(null, client);
|
|
|
|
checkOrgPermission(null, client);
|
|
|
|
|
|
|
|
JSONObject mchConfig = merchantInfoProvider.getMchExtParams(client.getIntValue("client_id"));
|
|
|
|
|
|
|
|
if (mchConfig.getBooleanValue("hide_mch_device")) {
|
|
|
|
|
|
|
|
return new JSONObject();
|
|
|
|
|
|
|
|
}
|
|
|
|
JSONObject params = new JSONObject();
|
|
|
|
JSONObject params = new JSONObject();
|
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
|
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
|
|
|
|
sdf.setTimeZone(TimeZone.getTimeZone(client.getString("timezone") != null ? client.getString("timezone") : "Australia/Melbourne"));
|
|
|
|
sdf.setTimeZone(TimeZone.getTimeZone(client.getString("timezone") != null ? client.getString("timezone") : "Australia/Melbourne"));
|
|
|
|