加入小区审核撤回功能

wuxw

2020-02-19 ac50588df7c5d7800c43c181a16ff6cd9c29db1e

 WebService/src/main/java/com/java110/web/smo/impl/NavServiceSMOImpl.java

@@ -7,6 +7,7 @@
import com.java110.utils.util.CommonUtil;
import com.java110.core.context.IPageData;
import com.java110.core.component.BaseComponentSMO;
import com.java110.utils.util.StringUtil;
import com.java110.web.smo.ICommunityServiceSMO;
import com.java110.web.smo.INavServiceSMO;
import org.slf4j.Logger;
@@ -60,25 +61,18 @@
    @Override
    public ResponseEntity<String> getUserInfo(IPageData pd) {
        Assert.hasLength(pd.getUserId(), "用户未登录请先登录");
        /*ResponseEntity<String> responseEntity = null;
        responseEntity = this.callCenterService(restTemplate,pd,"",
        ServiceConstant.SERVICE_API_URL+"/api/query.user.userInfo?userId="+pd.getUserId(), HttpMethod.GET);
        // 过滤返回报文中的字段，只返回name字段
        //{"address":"","orderTypeCd":"Q","serviceCode":"","responseTime":"20190401194712","sex":"",
        "localtionCd":"","userId":"302019033054910001","levelCd":"00","transactionId":"-1","dataFlowId":"-1",
        "response":{"code":"0000","message":"成功"},"name":"996icu","tel":"18909780341","bId":"-1","businessType":"","email":""}

        if(responseEntity.getStatusCode() == HttpStatus.OK){
            JSONObject tmpUserInfo = JSONObject.parseObject(responseEntity.getBody().toString());
            JSONObject resultUserInfo = new JSONObject();
            resultUserInfo.put("name",tmpUserInfo.getString("name"));
            responseEntity = new ResponseEntity<String>(resultUserInfo.toJSONString(),HttpStatus.OK);
        }*/
        ResponseEntity<String> responseEntity = null;
        responseEntity = super.getUserInfo(pd, restTemplate);
        if (responseEntity.getStatusCode() == HttpStatus.OK) {
        if (responseEntity.getStatusCode() != HttpStatus.OK) {
            return responseEntity;
        }
            JSONObject tmpUserInfo = JSONObject.parseObject(responseEntity.getBody().toString());
            JSONObject resultUserInfo = new JSONObject();
        responseEntity = super.getStoreInfo(pd, restTemplate);
        if (responseEntity.getStatusCode() == HttpStatus.OK && StringUtil.jsonHasKayAndValue(responseEntity.getBody().toString(),"storeTypeCd")) {
            String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
            resultUserInfo.put("storeTypeCd", storeTypeCd);
        }
            resultUserInfo.put("name", tmpUserInfo.getString("name"));
            resultUserInfo.put("address", tmpUserInfo.getString("address"));
            resultUserInfo.put("sex", tmpUserInfo.getString("sex"));
@@ -87,7 +81,7 @@
            resultUserInfo.put("tel", CommonUtil.mobileEncrypt(tmpUserInfo.getString("tel")));
            resultUserInfo.put("email", tmpUserInfo.getString("email"));
            responseEntity = new ResponseEntity<String>(resultUserInfo.toJSONString(), HttpStatus.OK);
        }

        return responseEntity;
    }