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

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MessageApiServiceImpl.java

@@ -193,6 +193,10 @@ public class MessageApiServiceImpl implements MessageApiService {
             staff.setStaffName(qywxCallBackDTO.getUserName());
             staff.setWxUserId(qywxCallBackDTO.getUserid());
             staff.setPostion(qywxCallBackDTO.getPosition());
+            //激活状态
+            if(qywxCallBackDTO.getStatus() != null && qywxCallBackDTO.getStatus() == 1){
+            	staff.setActiveFlag(1);
+            }
             Integer status = qywxCallBackDTO.getStatus();
             if(status != null && status == 1){
             	staff.setActiveFlag(1);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -261,6 +261,11 @@ public class StaffApiServiceImpl implements StaffApiService {
 					tab.setActiveFlag(1);
 					tab.setPostion(user.getPosition());
 					tab.setExtendPostion(user.getExternal_position());
+					if(user.getStatus() != null && user.getStatus() == 1){
+						tab.setActiveFlag(1);
+		            } else {
+		            	tab.setActiveFlag(0);
+		            }
 					String staffId = staffService.add(tab);
 					
 					Integer[] departmentId = user.getDepartment();

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

+package com.gic.haoban.manage.web.controller;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.gic.api.base.commons.Page;
+import com.gic.clerk.api.service.ClerkService;
+import com.gic.enterprise.api.dto.StoreDTO;
+import com.gic.enterprise.api.dto.StoreSearchDTO;
+import com.gic.enterprise.api.service.StoreService;
+import com.gic.haoban.base.api.common.BasePageInfo;
+import com.gic.haoban.base.api.common.PageResult;
+import com.gic.haoban.common.utils.HaobanResponse;
+import com.gic.haoban.manage.api.dto.StaffDTO;
+import com.gic.haoban.manage.api.service.DepartmentApiService;
+import com.gic.haoban.manage.api.service.StaffApiService;
+import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
+import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
+import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+
+@RestController
+@RequestMapping("/store")
+public class StoreController extends WebBaseController{
+	@Autowired
+	private ClerkService clerkService;
+	@Autowired
+	private StaffApiService staffApiService;
+	@Autowired
+	private DepartmentApiService departmentApiService;
+	@Autowired
+	private StaffDepartmentRelatedApiService staffDepartmentRelatedApiService;
+	@Autowired
+	private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService;
+	@Autowired
+	private StoreService storeService;
+	//门店列表
+	@RequestMapping("/find-simple-page")
+	public HaobanResponse storeList(String enterpriseId,BasePageInfo basePageInfo) {
+        Page page = new Page<>();
+        page.setCurrentPage(basePageInfo.getPageNum());
+        page.setPageSize(basePageInfo.getPageSize());
+        StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
+        storeSearchDTO.setEnterpriseId(enterpriseId);
+        Page<StoreDTO> resultPage = storeService.storeListPage(page, storeSearchDTO);
+        List<StoreDTO> resultList = resultPage.getResult();
+		PageResult<StoreDTO> pageVo = new PageResult<>();
+        pageVo.setList(resultList);
+        pageVo.setPageNum(page.getCurrentPage());
+        pageVo.setPages(resultPage.getPages());
+        pageVo.setPageSize(page.getPageSize());
+        pageVo.setTotal(resultPage.getTotalCount());
+        return resultResponse(HaoBanErrCode.ERR_1,pageVo);
+	}
+	
+	
+	
+}