Commit deebc5a9 by zhiwj

门店

parent a9c42c68
......@@ -23,10 +23,8 @@ import com.gic.store.constant.ClerkGenderEnum;
import com.gic.store.constant.CreateTypeEnum;
import com.gic.store.constant.StoreLogReasonEnum;
import com.gic.store.dto.*;
import com.gic.store.dto.open.BusinessTimeOpenDTO;
import com.gic.store.dto.open.ClerkDTO;
import com.gic.store.dto.open.ClerkDetailDTO;
import com.gic.store.dto.open.StoreOpenDTO;
import com.gic.store.dto.open.*;
import com.gic.store.entity.*;
import com.gic.store.service.*;
import org.apache.commons.collections.CollectionUtils;
......@@ -635,7 +633,7 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
}
List<StoreRegionDTO> regionList = storeRegionService.listStoreRegion(enterpriseId, null, null);
if (CollectionUtils.isNotEmpty(regionList)) {
return ServiceResponse.success(JSON.toJSONString(regionList));
return ServiceResponse.success(JSON.toJSONString(EntityUtil.changeEntityListByJSON(StoreRegionOpenDTO.class, regionList)));
} else {
return ServiceResponse.success();
}
......@@ -651,7 +649,7 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
}
List<TabStoreBrand> storeBrandList = storeBrandService.listAllStoreBrand(enterpriseId, null);
if (CollectionUtils.isNotEmpty(storeBrandList)) {
return ServiceResponse.success(JSON.toJSONString(storeBrandList));
return ServiceResponse.success(JSON.toJSONString(EntityUtil.changeEntityListByJSON(StoreBrandOpenDTO.class, storeBrandList)));
} else {
return ServiceResponse.success();
}
......@@ -672,7 +670,7 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
List<StoreFieldDTO> fieldList = storeFieldService.listStoreFieldByRegionId(regionId);
if (CollectionUtils.isNotEmpty(fieldList)) {
return ServiceResponse.success(JSON.toJSONString(fieldList));
return ServiceResponse.success(JSON.toJSONString(EntityUtil.changeEntityListByJSON(StoreFieldOpenDTO.class, fieldList)));
} else {
return ServiceResponse.success();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment