修复地区

wuxw

2019-12-20 470cbd3fa0bfce7554b98370ee4f74d4ba65b6f2

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

@@ -2,12 +2,12 @@

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.common.constant.AttrCdConstant;
import com.java110.common.constant.CredentialsConstant;
import com.java110.common.constant.ServiceConstant;
import com.java110.common.util.Assert;
import com.java110.utils.constant.AttrCdConstant;
import com.java110.utils.constant.CredentialsConstant;
import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.util.Assert;
import com.java110.core.context.IPageData;
import com.java110.web.core.BaseComponentSMO;
import com.java110.core.component.BaseComponentSMO;
import com.java110.web.smo.ICompanyServiceSMO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
@@ -15,7 +15,6 @@
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
import springfox.documentation.spring.web.json.Json;

/**
 * 初始化公司实现类
@@ -112,17 +111,42 @@

        reqJson.put("businessStoreCerdentials",businessStoreCerdentials);



        responseEntity = this.callCenterService(restTemplate,pd,reqJson.toJSONString(), ServiceConstant.SERVICE_API_URL+"/api/save.store.info", HttpMethod.POST);

        if(responseEntity.getStatusCode() != HttpStatus.OK){
       /* if(responseEntity.getStatusCode() != HttpStatus.OK){
            return responseEntity;
        }

        JSONObject resStoreInfo = JSONObject.parseObject(responseEntity.getBody().toString());
        //将现用户添加为商户管理员
        JSONObject staffInfo = new JSONObject();
        staffInfo.put("userId",pd.getUserId());
        staffInfo.put("storeId",pd.getUserId());
        staffInfo.put("storeId",resStoreInfo.getString("storeId"));
        responseEntity = this.callCenterService(restTemplate,pd,staffInfo.toJSONString(), ServiceConstant.SERVICE_API_URL+"/api/user.staff.add", HttpMethod.POST);
*/

        return responseEntity;
    }

    /**
     * 查询 所有省市
     * @param pd
     * @return
     */
    @Override
    public ResponseEntity<String> getAreas(IPageData pd) {
        ResponseEntity<String> responseEntity = null;
        Assert.hasLength(pd.getUserId(),"用户还未登录请先登录");

        responseEntity = this.callCenterService(restTemplate,pd,"", ServiceConstant.SERVICE_API_URL+"/api/area.listAreas", HttpMethod.GET);

        if(responseEntity.getStatusCode() == HttpStatus.OK){
            Assert.jsonObjectHaveKey(responseEntity.getBody(),"areas","查询中心服务异常，不是有效json或未包含areas节点");
            //将areas 返回出去
            responseEntity = new ResponseEntity<String>(JSONObject.parseObject(responseEntity.getBody()).getJSONArray("areas").toJSONString(),HttpStatus.OK);
        }
        return responseEntity;
    }