111

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java

@@ -17,6 +17,7 @@ import com.gic.api.base.commons.Page;
 import com.gic.enterprise.api.dto.EnterpriseAndUserDTO;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.dto.StoreDTO;
+import com.gic.enterprise.api.dto.StoreSearchDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.base.api.common.BasePageInfo;
@@ -105,18 +106,28 @@ public class WxEnterpriseController extends WebBaseController{
 	@IgnoreLogin
 	@RequestMapping("store-full-list")
 	public HaobanResponse storeFullList(BasePageInfo basePageInfo,String search) {
-//		LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
-//		String wxEnterpriseId = login.getWxEnterpriseId();
-		String wxEnterpriseId = "1";
+		LoginVO login = (LoginVO) AuthRequestUtil.getSessionUser();
+		String wxEnterpriseId = login.getWxEnterpriseId();
+//		String wxEnterpriseId = "1";
 		int maxVersionCount = 0;
-		List<String> storeIds = new ArrayList<String>();
 		List<EnterpriseDetailDTO>  enterpriseList = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId);
 		if(CollectionUtil.isEmpty(enterpriseList)){
 			return resultResponse(HaoBanErrCode.ERR_10010);
 		}
 		List<String> enterpriseIds = enterpriseList.stream().map(s->s.getEnterpriseId()).collect(Collectors.toList());
-		//TODO 调陶接口，获取store列表
-		
+		//获取门店列表
+		Page page1 = new Page<>();
+		page1.setCurrentPage(1);
+		page1.setPageSize(Integer.MAX_VALUE);
+		StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
+		storeSearchDTO.setEnterpriseIdList(enterpriseIds);
+		storeSearchDTO.setSearchName(search);
+		Page storePage = storeService.storeListPage(page1, storeSearchDTO);
+		if(storePage == null || storePage.getResult()==null){
+			return resultResponse(HaoBanErrCode.ERR_10009);
+		}
+		List<StoreDTO> t_list = storePage.getResult();
+		List<String> storeIds = t_list.stream().map(s->s.getStoreId()).collect(Collectors.toList());
 		Page<DepartmentDTO> page = departmentApiService.pageFullStoreByWxEnterpriseId(wxEnterpriseId, search,storeIds,maxVersionCount, basePageInfo);
 		List<DepartmentDTO> list = page.getResult();
 		List<StoreVo> resultList = EntityUtil.changeEntityListByJSON(StoreVo.class,list);