Commit 3f1d0666 by lzxry

海外和国内adi查询host

parent 162759ed
......@@ -22,11 +22,14 @@ public interface ADIAccountService {
List<ReminderLevel> findReminderlevel();
@Deprecated
void updateAccount(Contract contract);
//催款提醒关闭
@Deprecated
PressMoney forbidenPress(User user, PressMoney resource);
//催款提醒开启
@Deprecated
PressMoney enablePress(User user, PressMoney resource);
//回访
......
......@@ -128,6 +128,7 @@ public class ADIAccountServiceImpl implements ADIAccountService {
return null;
}
@Override
public void updateAccount(Contract contract) {
......@@ -136,7 +137,7 @@ public class ADIAccountServiceImpl implements ADIAccountService {
ADIUser adiUser = findOne(contract.getEmail());
if(null != adiUser){
String url = Constant.adiUrl + "adi/api/user/web/update";
String url = Constant.adiUrl.split(",")[0] + "adi/api/user/web/update";
Map<String,String> conditions = new HashMap<>();
conditions.put("expriedTime", contract.getEndDate() + " 00:00:00");
conditions.put("constractStartTime",contract.getStartDate() + " 00:00:00");
......@@ -153,9 +154,10 @@ public class ADIAccountServiceImpl implements ADIAccountService {
@Deprecated
private List<ADIUser> getAllAccount() throws JSONException {
List<ADIUser> list = new ArrayList<>();
String url = Constant.adiUrl + "adi/api/user/web/list";
String url = Constant.adiUrl.split(",")[0] + "adi/api/user/web/list";
Map<String,String> conditions = new HashMap<>();
conditions.put("type","");
conditions.put("status","");
......@@ -320,22 +322,29 @@ public class ADIAccountServiceImpl implements ADIAccountService {
}
@Override
public ADIUser findOne(String email) {
String url = Constant.adiUrl + "/adi/api/user/web/one?email="+email;
String url = Constant.adiUrl.split(",")[0] + "/adi/api/user/web/one?email="+email;
String request = HttpClientUtil.doHttpGetRequest(url, "");
ADIUser adiUser =null;
try {
JSONObject rs = new JSONObject(request);
String content = rs.get("content").toString();
if(StringUtils.isEmpty(content)){
url = Constant.adiUrl.split(",")[1] + "/adi/api/user/web/one?email="+email;
request = HttpClientUtil.doHttpGetRequest(url, "");
rs = new JSONObject(request);
content = rs.get("content").toString();
}
if(!StringUtils.isEmpty(content)){
JSONArray jsonArray = new JSONArray(content);
JSONObject jsonObject = jsonArray.getJSONObject(0);
adiUser = new ADIUser();
adiUser.setCompany(jsonObject.getString("company"));
adiUser.setAccountStatus(jsonObject.getString("accountStatus"));
adiUser.setSendStatus(jsonObject.getString("sendStatus"));
adiUser.setEmail(jsonObject.getString("email"));
adiUser.setSendTime(jsonObject.getString("sendTime"));
//adiUser = new ObjectMapper().readValue(content, ADIUser.class);
adiUser = new ADIUser();
adiUser.setCompany(jsonObject.getString("company"));
adiUser.setAccountStatus(jsonObject.getString("accountStatus"));
adiUser.setSendStatus(jsonObject.getString("sendStatus"));
adiUser.setEmail(jsonObject.getString("email"));
adiUser.setSendTime(jsonObject.getString("sendTime"));
//adiUser = new ObjectMapper().readValue(content, ADIUser.class);
}
} catch (JSONException e) {
e.printStackTrace();
......@@ -370,7 +379,7 @@ public class ADIAccountServiceImpl implements ADIAccountService {
contract.setStatus("executing");
contractRepository.save(contract);
}
String url = Constant.adiUrl + "adi/api/user/web/update";
String url = Constant.adiUrl.split(",")[0] + "adi/api/user/web/update";
Map<String,String> conditions = new HashMap<>();
conditions.put("expriedTime", null);
conditions.put("constractStartTime",null);
......@@ -408,7 +417,7 @@ public class ADIAccountServiceImpl implements ADIAccountService {
contractRepository.save(contract);
}
String url = Constant.adiUrl + "adi/api/user/web/update";
String url = Constant.adiUrl.split(",")[0] + "adi/api/user/web/update";
Map<String,String> conditions = new HashMap<>();
conditions.put("expriedTime", null);
conditions.put("constractStartTime",null);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment