Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0 into developer

haoban-manage3-service/src/main/resources/mapper/DepartmentMapper.xml

@@ -207,6 +207,7 @@
     from tab_haoban_department
     where parent_department_id = #{parentId,jdbcType=VARCHAR}
     and status_flag = 1
+    and recycle_flag != null
     order by sort asc
   </select>
   

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

@@ -205,8 +205,8 @@ public class DepartmentContoller extends WebBaseController{
 				department.setDepartmentName(departmentAddQO.getDepartmentName());
 				department.setChainId(dto.getChainId() + Constant.ID_SEPARATOR + dto.getDepartmentId());
 				department.setChainName(dto.getChainName() + Constant.NAME_SEPARATOR + dto.getDepartmentName());
-				department.setIsStore(0);
 				department.setIsStore(departmentAddQO.getStoreFlag());
+				department.setSort(departmentAddQO.getSort());
 				department.setLevel(dto.getLevel() + 1);
 				department.setRelatedId(departmentAddQO.getRelatedId());
 				HaobanResponse hr = departmentApiService.add(department);
@@ -218,7 +218,6 @@ public class DepartmentContoller extends WebBaseController{
 				
 				String sonDepartment = departmentAddQO.getSonDepartment();
 				handler(sonDepartment,departmentId);
-				
 			}
 		}
 		logger.info("【部门修改】editDepartment={}",editDepartment);
@@ -361,8 +360,9 @@ public class DepartmentContoller extends WebBaseController{
 					continue;
 				}
 				String departmentId = departmentAddQO.getDepartmentId();
+				Boolean addFlag = departmentAddQO.getAddFlag();
 				//在部门下新增部门
-				if(StringUtils.isBlank(departmentId)) {
+				if(addFlag) {
 					DepartmentDTO department = new DepartmentDTO();
 					department.setParentDepartmentId(parentId);
 					department.setWxEnterpriseId(dto.getWxEnterpriseId());

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;
@@ -104,20 +105,30 @@ 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";
+	public HaobanResponse storeFullList(BasePageInfo basePageInfo,String keyWord) {
+		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<DepartmentDTO> page = departmentApiService.pageFullStoreByWxEnterpriseId(wxEnterpriseId, search,storeIds,maxVersionCount, basePageInfo);
+		//获取门店列表
+		Page page1 = new Page<>();
+		page1.setCurrentPage(1);
+		page1.setPageSize(Integer.MAX_VALUE);
+		StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
+		storeSearchDTO.setEnterpriseIdList(enterpriseIds);
+		storeSearchDTO.setSearchName(keyWord);
+		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, keyWord,storeIds,maxVersionCount, basePageInfo);
 		List<DepartmentDTO> list = page.getResult();
 		List<StoreVo> resultList = EntityUtil.changeEntityListByJSON(StoreVo.class,list);
 		
@@ -130,9 +141,9 @@ public class WxEnterpriseController extends WebBaseController{
 		
 		for(StoreVo vo:resultList){
 			if(map.get(vo.getRelatedId())!=null){
-				vo.setStoreCode(map.get(vo.getDepartmentId()).getStoreCode());
-				vo.setStoreId(map.get(vo.getDepartmentId()).getStoreId());
-				vo.setStoreName(map.get(vo.getDepartmentId()).getStoreName());
+				vo.setStoreCode(map.get(vo.getRelatedId()).getStoreCode());
+				vo.setStoreId(map.get(vo.getRelatedId()).getStoreId());
+				vo.setStoreName(map.get(vo.getRelatedId()).getStoreName());
 			}
 		}
 		

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/DepartmentAddQO.java

@@ -17,6 +17,10 @@ public class DepartmentAddQO implements Serializable {
 	private Integer storeFlag;
 	
 	private String relatedId;
+	
+	private Boolean addFlag;
+	
+	private Integer sort;
 
 	public String getDepartmentName() {
 		return departmentName;
@@ -49,6 +53,16 @@ public class DepartmentAddQO implements Serializable {
 	public void setDepartmentId(String departmentId) {
 		this.departmentId = departmentId;
 	}
+	
+	
+
+	public Integer getSort() {
+		return sort;
+	}
+
+	public void setSort(Integer sort) {
+		this.sort = sort;
+	}
 
 	public Integer getStoreFlag() {
 		return storeFlag;
@@ -73,6 +87,14 @@ public class DepartmentAddQO implements Serializable {
 	public void setParentDepartmentId(String parentDepartmentId) {
 		this.parentDepartmentId = parentDepartmentId;
 	}
+
+	public Boolean getAddFlag() {
+		return addFlag;
+	}
+
+	public void setAddFlag(Boolean addFlag) {
+		this.addFlag = addFlag;
+	}
 	
 	
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/StoreVo.java

@@ -17,7 +17,14 @@ public class StoreVo implements Serializable {
     private String storeId;
     private String storeCode;
     private String relatedId;
-    
+    private String wxDepartmentId;
+
+	public String getWxDepartmentId() {
+		return wxDepartmentId;
+	}
+	public void setWxDepartmentId(String wxDepartmentId) {
+		this.wxDepartmentId = wxDepartmentId;
+	}
 	public String getRelatedId() {
 		return relatedId;
 	}

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

@@ -4,14 +4,15 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.alibaba.fastjson.JSON;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
-import com.gic.haoban.manage.api.service.ApplicationApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.vo.InfoVo;
+import com.gic.wechat.api.dto.qywx.UserDTO;
 import com.gic.wechat.api.service.qywx.QywxCorpApiService;
 
 @RestController
@@ -19,17 +20,27 @@ public class InfoController extends WebBaseController{
 	public static final  String siteId = "ww7d6566614055cf27";
 
 	@Autowired
-	private ApplicationApiService applicationApiService;
-	@Autowired
 	private QywxCorpApiService qywxCorpApiService;
 	@Autowired
 	private StaffApiService staffApiService;
 	@Autowired
 	private WxEnterpriseApiService wxEnterpriseApiService;
+	
 	@RequestMapping("get-info-by-code")
 	public HaobanResponse getInfoByCode(String code) {
-		String userId = qywxCorpApiService.getUserInfoSimple(siteId,code);
+		String userDTOJson = qywxCorpApiService.getUserInfoSimple(siteId,code);
+		UserDTO user = JSON.parseObject(userDTOJson, UserDTO.class);
+		String userId = user.getUserid();
 		StaffDTO loginStaff = staffApiService.selectByUserId(userId);
+		if(loginStaff == null){
+			String corpId = user.getCorpid();
+			WxEnterpriseDTO enterprise = wxEnterpriseApiService.getEnterpriseBycorpId(corpId);
+			if(enterprise != null){
+				staffApiService.wxGetAdd(userId,enterprise.getWxEnterpriseId());
+				loginStaff = staffApiService.selectByUserId(userId);
+			}
+		}
+		
 		String wxEnterpriseId = loginStaff.getWxEnterpriseId();
 		WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseApiService.getOne(wxEnterpriseId);
 		String accesstoken = qywxCorpApiService.getCorpAccessToken(wxEnterpriseDTO.getCorpid(), siteId);