|
|
|
@ -3131,6 +3131,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
|
|
|
|
|
}
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
if (!(PartnerRole.getRole(account.getIntValue("role")) == PartnerRole.CASHIER)) {
|
|
|
|
|
result.put("is_ordinary", false);
|
|
|
|
|
if (!expire && waring) {
|
|
|
|
|
String[] key = {result.getString("expire_days")};
|
|
|
|
@ -3139,6 +3140,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
|
|
|
|
|
if (expire) {
|
|
|
|
|
result.put("contract_info", config.getString("sys_contract_info"));
|
|
|
|
|
}
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
JSONObject file = clientContractService.getOrGenerateSourceAgreement(account.getIntValue("client_id"));
|
|
|
|
|
result.put("file_url", file.getString("file_value"));
|
|
|
|
|
result.put("contract_info", config.getString("sys_contract_info"));
|
|
|
|
|