|
|
@ -3123,7 +3123,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public JSONObject getCheckClientInfo(int client_id,String account_id) {
|
|
|
|
public JSONObject getCheckClientInfo(int client_id,String account_id) {
|
|
|
|
JSONObject result = clientContractService.getClientContractExpire(client_id);
|
|
|
|
JSONObject result = clientContractService.getClientContractExpire(client_id);
|
|
|
|
JSONObject config = sysConfigManager.getSysConfig();
|
|
|
|
|
|
|
|
JSONObject account = clientAccountMapper.findById(account_id);
|
|
|
|
JSONObject account = clientAccountMapper.findById(account_id);
|
|
|
|
boolean expire = result.getBoolean("rate_expire");
|
|
|
|
boolean expire = result.getBoolean("rate_expire");
|
|
|
|
boolean waring = result.getBoolean("rate_waring");
|
|
|
|
boolean waring = result.getBoolean("rate_waring");
|
|
|
@ -3141,7 +3140,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
|
|
|
|
result.put("is_ordinary", false);
|
|
|
|
result.put("is_ordinary", false);
|
|
|
|
if (!expire && waring) {
|
|
|
|
if (!expire && waring) {
|
|
|
|
String[] key = { result.getString("expire_days") };
|
|
|
|
String[] key = { result.getString("expire_days") };
|
|
|
|
result.put("contract_info", messageSource.getMessage("sys.contract.waring", null, RequestEnvironment.getLocale()));
|
|
|
|
result.put("contract_info", editContractOrdinaryWaring(key,messageSource.getMessage("sys.contract.waring", null, RequestEnvironment.getLocale())));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (expire) {
|
|
|
|
if (expire) {
|
|
|
|
result.put("contract_info", messageSource.getMessage("sys.contract.info", null, RequestEnvironment.getLocale()));
|
|
|
|
result.put("contract_info", messageSource.getMessage("sys.contract.info", null, RequestEnvironment.getLocale()));
|
|
|
|