|
@@ -103,14 +103,8 @@ public class DomainService {
|
|
|
}
|
|
|
|
|
|
public R saAndVolte(SaAndVolteDTO dto) {
|
|
|
- R r = route(new RouteDTO(dto.getFromSystem(), dto.getPhoneNumber()));
|
|
|
- if (Boolean.FALSE.equals(r.getSuccess())) {
|
|
|
- return r;
|
|
|
- }
|
|
|
-
|
|
|
- RouteVO routeVO = (RouteVO) r.getData();
|
|
|
Foreignproduct foreignproduct = new Foreignproduct();
|
|
|
- COMPConnectionContext result = foreignproduct.query(dto.getPhoneNumber(), routeVO.getProvinceCode(), false);
|
|
|
+ COMPConnectionContext result = foreignproduct.query(dto.getPhoneNumber(), "18", false);
|
|
|
JsonObject jsonObject = JsonParser.parseString(result.getResponseContext()).getAsJsonObject();
|
|
|
JsonObject rsp = jsonObject.getAsJsonObject("UNI_BSS_BODY")
|
|
|
.getAsJsonObject("FOREIGN_PRODUCT_RSP")
|
|
@@ -138,14 +132,8 @@ public class DomainService {
|
|
|
}
|
|
|
|
|
|
public R userState(UserStateDTO dto) {
|
|
|
- R r = route(new RouteDTO(dto.getFromSystem(), dto.getPhoneNumber()));
|
|
|
- if (Boolean.FALSE.equals(r.getSuccess())) {
|
|
|
- return r;
|
|
|
- }
|
|
|
-
|
|
|
- RouteVO routeVO = (RouteVO) r.getData();
|
|
|
SpThreePartCheck spThreePartCheck = new SpThreePartCheck();
|
|
|
- COMPConnectionContext result = spThreePartCheck.query(dto.getPhoneNumber(), routeVO.getProvinceCode(), false);
|
|
|
+ COMPConnectionContext result = spThreePartCheck.query(dto.getPhoneNumber(), "18", false);
|
|
|
JsonObject jsonObject = JsonParser.parseString(result.getResponseContext()).getAsJsonObject();
|
|
|
JsonObject rsp = jsonObject.getAsJsonObject("UNI_BSS_BODY")
|
|
|
.getAsJsonObject("SP_THREEPART_CHECK_RSP")
|
|
@@ -157,7 +145,13 @@ public class DomainService {
|
|
|
}
|
|
|
|
|
|
JsonObject data = rsp.getAsJsonArray("DATA").get(0).getAsJsonObject();
|
|
|
- String userState = data.getAsJsonObject("userInfo").get("userState").getAsString();
|
|
|
+ JsonElement userStateElement = data.getAsJsonObject("userInfo").get("userState");
|
|
|
+ if (userStateElement == null) {
|
|
|
+ String detail = data.get("detail").getAsString();
|
|
|
+ return R.error().message(detail);
|
|
|
+ }
|
|
|
+
|
|
|
+ String userState = userStateElement.getAsString();
|
|
|
return R.ok().data(new UserStateVO(userState));
|
|
|
}
|
|
|
}
|