From 6c389e58731f8bd50fa2d52454b459facb6e4178 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 22 十二月 2019 12:15:51 +0800
Subject: [PATCH] 优化查询地区bug
---
WebService/src/main/java/com/java110/web/smo/impl/CompanyServiceSMOImpl.java | 72 +++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 34 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/impl/CompanyServiceSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/impl/CompanyServiceSMOImpl.java
index b9e36d3..5a42526 100644
--- a/WebService/src/main/java/com/java110/web/smo/impl/CompanyServiceSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/impl/CompanyServiceSMOImpl.java
@@ -28,32 +28,34 @@
/**
* 鏌ヨ 鍟嗘埛绫诲埆
+ *
* @param pd
* @return
*/
@Override
public ResponseEntity<String> getStoreType(IPageData pd) {
ResponseEntity<String> responseEntity = null;
- Assert.hasLength(pd.getUserId(),"鐢ㄦ埛杩樻湭鐧诲綍璇峰厛鐧诲綍");
+ Assert.hasLength(pd.getUserId(), "鐢ㄦ埛杩樻湭鐧诲綍璇峰厛鐧诲綍");
- responseEntity = this.callCenterService(restTemplate,pd,"", ServiceConstant.SERVICE_API_URL+"/api/query.store.type?type=all", HttpMethod.GET);
+ responseEntity = this.callCenterService(restTemplate, pd, "", ServiceConstant.SERVICE_API_URL + "/api/query.store.type?type=all", HttpMethod.GET);
- if(responseEntity.getStatusCode() == HttpStatus.OK){
- Assert.jsonObjectHaveKey(responseEntity.getBody(),"storeType","鏌ヨ涓績鏈嶅姟寮傚父锛屼笉鏄湁鏁坖son鎴栨湭鍖呭惈storeType鑺傜偣");
+ if (responseEntity.getStatusCode() == HttpStatus.OK) {
+ Assert.jsonObjectHaveKey(responseEntity.getBody(), "storeType", "鏌ヨ涓績鏈嶅姟寮傚父锛屼笉鏄湁鏁坖son鎴栨湭鍖呭惈storeType鑺傜偣");
//灏唖toreType 杩斿洖鍑哄幓
- responseEntity = new ResponseEntity<String>(JSONObject.parseObject(responseEntity.getBody()).getJSONArray("storeType").toJSONString(),HttpStatus.OK);
+ responseEntity = new ResponseEntity<String>(JSONObject.parseObject(responseEntity.getBody()).getJSONArray("storeType").toJSONString(), HttpStatus.OK);
}
return responseEntity;
}
/**
* 淇濆瓨鍏徃淇℃伅
+ *
* @param pd
* @return
*/
- public ResponseEntity<String> saveCompanyInfo(IPageData pd){
+ public ResponseEntity<String> saveCompanyInfo(IPageData pd) {
ResponseEntity<String> responseEntity = null;
- Assert.hasLength(pd.getUserId(),"鐢ㄦ埛杩樻湭鐧诲綍璇峰厛鐧诲綍");
+ Assert.hasLength(pd.getUserId(), "鐢ㄦ埛杩樻湭鐧诲綍璇峰厛鐧诲綍");
validateCompanyInfo(pd.getReqData());
@@ -64,56 +66,55 @@
//鍩烘湰淇℃伅
JSONObject businessStore = reqJson.getJSONObject("businessStore");
- businessStore.put("userId",pd.getUserId());
- businessStore.put("name",paramJson.getString("name"));
- businessStore.put("address",paramJson.getString("address"));
- businessStore.put("tel",paramJson.getString("tel"));
- businessStore.put("storeTypeCd",paramJson.getString("storeTypeCd"));
- businessStore.put("nearbyLandmarks",paramJson.getString("nearbyLandmarks"));
+ businessStore.put("userId", pd.getUserId());
+ businessStore.put("name", paramJson.getString("name"));
+ businessStore.put("address", paramJson.getString("areaAddress") + paramJson.getString("address"));
+ businessStore.put("tel", paramJson.getString("tel"));
+ businessStore.put("storeTypeCd", paramJson.getString("storeTypeCd"));
+ businessStore.put("nearbyLandmarks", paramJson.getString("nearbyLandmarks"));
JSONArray businessStoreAttr = new JSONArray();
JSONObject attr = new JSONObject();
attr.put("specCd", AttrCdConstant.SPEC_CD_STORE_CORPORATION);
- attr.put("value",paramJson.getString("corporation"));
+ attr.put("value", paramJson.getString("corporation"));
businessStoreAttr.add(attr);
- attr = new JSONObject();
+ attr = new JSONObject();
attr.put("specCd", AttrCdConstant.SPEC_CD_STORE_REGISTEREDCAPITAL);
- attr.put("value",paramJson.getString("registeredCapital"));
+ attr.put("value", paramJson.getString("registeredCapital"));
businessStoreAttr.add(attr);
- attr = new JSONObject();
+ attr = new JSONObject();
attr.put("specCd", AttrCdConstant.SPEC_CD_STORE_FOUNDINGTIME);
- attr.put("value",paramJson.getString("foundingTime"));
+ attr.put("value", paramJson.getString("foundingTime"));
businessStoreAttr.add(attr);
attr = new JSONObject();
attr.put("specCd", AttrCdConstant.SPEC_CD_STORE_REGISTRATIONAUTHORITY);
- attr.put("value",paramJson.getString("registrationAuthority"));
+ attr.put("value", paramJson.getString("registrationAuthority"));
businessStoreAttr.add(attr);
attr = new JSONObject();
attr.put("specCd", AttrCdConstant.SPEC_CD_STORE_SCOPE);
- attr.put("value",paramJson.getString("scope"));
+ attr.put("value", paramJson.getString("scope"));
businessStoreAttr.add(attr);
- reqJson.put("businessStoreAttr",businessStoreAttr);
+ reqJson.put("businessStoreAttr", businessStoreAttr);
JSONArray businessStoreCerdentials = new JSONArray();
JSONObject cerdentials = new JSONObject();
cerdentials.put("credentialsCd", CredentialsConstant.LICENCE);
- cerdentials.put("value",paramJson.getString("value"));
- cerdentials.put("validityPeriod",paramJson.getString("validityPeriod"));
- cerdentials.put("positivePhoto","");
- cerdentials.put("negativePhoto","");
+ cerdentials.put("value", paramJson.getString("value"));
+ cerdentials.put("validityPeriod", paramJson.getString("validityPeriod"));
+ cerdentials.put("positivePhoto", "");
+ cerdentials.put("negativePhoto", "");
businessStoreCerdentials.add(cerdentials);
- reqJson.put("businessStoreCerdentials",businessStoreCerdentials);
+ reqJson.put("businessStoreCerdentials", businessStoreCerdentials);
-
- responseEntity = this.callCenterService(restTemplate,pd,reqJson.toJSONString(), ServiceConstant.SERVICE_API_URL+"/api/save.store.info", HttpMethod.POST);
+ responseEntity = this.callCenterService(restTemplate, pd, reqJson.toJSONString(), ServiceConstant.SERVICE_API_URL + "/api/save.store.info", HttpMethod.POST);
/* if(responseEntity.getStatusCode() != HttpStatus.OK){
return responseEntity;
@@ -132,20 +133,22 @@
/**
* 鏌ヨ 鎵�鏈夌渷甯�
+ *
* @param pd
* @return
*/
@Override
public ResponseEntity<String> getAreas(IPageData pd) {
ResponseEntity<String> responseEntity = null;
- Assert.hasLength(pd.getUserId(),"鐢ㄦ埛杩樻湭鐧诲綍璇峰厛鐧诲綍");
+ Assert.hasLength(pd.getUserId(), "鐢ㄦ埛杩樻湭鐧诲綍璇峰厛鐧诲綍");
+ JSONObject param = JSONObject.parseObject(pd.getReqData());
- responseEntity = this.callCenterService(restTemplate,pd,"", ServiceConstant.SERVICE_API_URL+"/api/api.queryAreas", HttpMethod.GET);
+ responseEntity = this.callCenterService(restTemplate, pd, mapToUrlParam(param), ServiceConstant.SERVICE_API_URL + "/api/area.listAreas", HttpMethod.GET);
- if(responseEntity.getStatusCode() == HttpStatus.OK){
- Assert.jsonObjectHaveKey(responseEntity.getBody(),"areas","鏌ヨ涓績鏈嶅姟寮傚父锛屼笉鏄湁鏁坖son鎴栨湭鍖呭惈areas鑺傜偣");
+ if (responseEntity.getStatusCode() == HttpStatus.OK) {
+ Assert.jsonObjectHaveKey(responseEntity.getBody(), "areas", "鏌ヨ涓績鏈嶅姟寮傚父锛屼笉鏄湁鏁坖son鎴栨湭鍖呭惈areas鑺傜偣");
//灏哸reas 杩斿洖鍑哄幓
- responseEntity = new ResponseEntity<String>(JSONObject.parseObject(responseEntity.getBody()).getJSONArray("areas").toJSONString(),HttpStatus.OK);
+ responseEntity = new ResponseEntity<String>(JSONObject.parseObject(responseEntity.getBody()).getJSONArray("areas").toJSONString(), HttpStatus.OK);
}
return responseEntity;
}
@@ -153,9 +156,10 @@
/**
* 鏍￠獙鍏徃淇℃伅
+ *
* @param param
*/
- private void validateCompanyInfo(String param){
+ private void validateCompanyInfo(String param) {
}
--
Gitblit v1.8.0