|
|
@ -156,6 +156,14 @@ public class ClientContractServiceImpl implements ClientContractService {
|
|
|
|
if (client == null) {
|
|
|
|
if (client == null) {
|
|
|
|
throw new NotFoundException("merchant not found please check ID");
|
|
|
|
throw new NotFoundException("merchant not found please check ID");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
JSONObject sysconfig = sysConfigManager.getSysConfig();
|
|
|
|
|
|
|
|
JSONObject defaultResult = new JSONObject();
|
|
|
|
|
|
|
|
defaultResult.put("rate_expire", false);
|
|
|
|
|
|
|
|
defaultResult.put("rate_waring", false);
|
|
|
|
|
|
|
|
defaultResult.put("old_contract",false);
|
|
|
|
|
|
|
|
if (sysconfig!=null && !sysconfig.getBoolean("sys_new_contract_on")) {
|
|
|
|
|
|
|
|
return defaultResult;
|
|
|
|
|
|
|
|
}
|
|
|
|
List<JSONObject> rateInfo = clientRateMapper.minExpiryTime(client_id, null);
|
|
|
|
List<JSONObject> rateInfo = clientRateMapper.minExpiryTime(client_id, null);
|
|
|
|
JSONObject result = new JSONObject();
|
|
|
|
JSONObject result = new JSONObject();
|
|
|
|
if (CollectionUtils.isEmpty(rateInfo)) {
|
|
|
|
if (CollectionUtils.isEmpty(rateInfo)) {
|
|
|
|