Merge remote-tracking branch 'origin/developer' into developer

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreOpenApiServiceImpl.java

@@ -207,22 +207,26 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
             ServiceResponse<List<CountyDTO>> countyResponse = provincesApiService.selectAllCounty();
             List<ProvinceDTO> provinceDTOList = provinceResponse.getResult();
             String finalProvince = storeOpenDTO.getProvince();
-            long provinceCount = provinceDTOList.stream().filter(e -> StringUtils.equals(e.getProvinceName(), finalProvince)).count();
+            ProvinceDTO provinceDTO = provinceDTOList.stream().filter(e -> StringUtils.equals(e.getProvinceName(), finalProvince)).findFirst().orElse(null);
             List<CityDTO> cityDTOList = cityResponse.getResult();
             String finalCity = storeOpenDTO.getCity();
-            long cityCount = cityDTOList.stream().filter(e -> StringUtils.equals(e.getCityName(), finalCity)).count();
+            CityDTO cityDTO = cityDTOList.stream().filter(e -> StringUtils.equals(e.getCityName(), finalCity)).findFirst().orElse(null);
             List<CountyDTO> countyDTOList = countyResponse.getResult();
             String finalCounty = storeOpenDTO.getCounty();
-            long countyCount = countyDTOList.stream().filter(e -> StringUtils.equals(e.getCountyName(), finalCounty)).count();
-            if (countyCount == 0) {
+            CountyDTO countyDTO = countyDTOList.stream().filter(e -> StringUtils.equals(e.getCountyName(), finalCounty)).findFirst().orElse(null);
+            if (countyDTO == null) {
                 return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "输入的区县信息有误");
             }
-            if (cityCount == 0) {
+            if (cityDTO == null) {
                 return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "输入的市信息有误");
             }
-            if (provinceCount == 0) {
+            if (provinceDTO == null) {
                 return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "输入的省信息有误");
             }
+            storeDTO.setProvinceId(provinceDTO.getProvinceId());
+            storeDTO.setCityId(cityDTO.getCityId());
+            storeDTO.setCountyId(countyDTO.getCountyId());
+            storeDTO.setProvinces(provinceDTO.getProvinceName() + "/" + cityDTO.getCityName() + "/" + countyDTO.getCountyName());
         }
         // 营业时间
         if (StringUtils.isNotBlank(storeOpenDTO.getBusinessTime())) {
@@ -301,12 +305,13 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
         storeDTO.setCreateType(CreateTypeEnum.API.getCode());
         // 保存门店
 //        this.storeService.save(storeDTO);
-        ServiceResponse<Integer> serviceResponse = storeApiService.saveOrUpdate(storeDTO);
-        if (!serviceResponse.isSuccess()) {
-            return EnterpriseServiceResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
-        } else {
-            return EnterpriseServiceResponse.success();
-        }
+        return null;
+//        ServiceResponse<Integer> serviceResponse = storeApiService.saveOrUpdate(storeDTO);
+//        if (!serviceResponse.isSuccess()) {
+//            return EnterpriseServiceResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+//        } else {
+//            return EnterpriseServiceResponse.success();
+//        }
     }
 
     @Override