11

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/DepartmentApiService.java

@@ -17,6 +17,12 @@ public interface DepartmentApiService {
 	 */
 	List<DepartmentDTO> listByDepartmentIds(List<String> departmentIds,int storeFlag);
 	/**
+	 * 查wxEnterprise下所有门店
+	 * @param wxEnterpriseId
+	 * @return
+	 */
+	List<DepartmentDTO> listStoreByWxEnterpriseId(String wxEnterpriseId);
+	/**
 	 * 根据部门id查询部门
 	 * @param departmentId
 	 * @return

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/DepartmentMapper.java

@@ -31,6 +31,8 @@ public interface DepartmentMapper {
 	
 	Page<TabHaobanDepartment> pageDepartmentByParams(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("keyword")String keyword, 
 			@Param("storeFlag")Integer storeFlag, @Param("recycleFlag")Integer recycleFlag);
-
+	
+	List<TabHaobanDepartment> listStoreByWxEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId);
+	
 	TabHaobanDepartment getRootByEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId);
 }
\ No newline at end of file

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

@@ -156,4 +156,10 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
 		return departmentService.getRootByEnterpriseId(wxEnterpriseId);
 	}
 
+	@Override
+	public List<DepartmentDTO> listStoreByWxEnterpriseId(String wxEnterpriseId) {
+		List<TabHaobanDepartment> list = departmentMapper.listStoreByWxEnterpriseId(wxEnterpriseId);
+		return EntityUtil.changeEntityListByJSON(DepartmentDTO.class, list);
+	}
+
 }

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

@@ -257,6 +257,17 @@
 	      #{id,jdbcType=VARCHAR}
 	    </foreach>
     </if>
+    order by create_time 
+  </select>
+  
+  <select id="listStoreByWxEnterpriseId" resultMap="BaseResultMap"  >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_department
+    where status_flag = 1
+    and   is_store = #{storeFlag,jdbcType=INTEGER}
+    and   wx_enterprise_id = #{wxEnterpriseId}
+    order by create_time 
   </select>
   
   <select id="getRootByEnterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String" >

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

@@ -3,6 +3,7 @@ package com.gic.haoban.manage.web.controller;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +30,7 @@ import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.vo.ClerkVo;
+import com.gic.haoban.manage.web.vo.StoreVO;
 
 @RestController
 public class StoreController extends WebBaseController{
@@ -48,14 +50,38 @@ public class StoreController extends WebBaseController{
 	private StoreService storeService;
 	//门店列表
 	@RequestMapping("/store-list")
-	public HaobanResponse storeList(String staffId) {
-		List<DepartmentDTO> storeList = new ArrayList<DepartmentDTO>();
-		List<StaffDepartmentRelatedDTO> list = staffDepartmentRelatedApiService.listByStaffId(staffId);
+	public HaobanResponse storeList(String staffId,String wxEnterpriseId) {
+		List<DepartmentDTO> list = departmentApiService.listStoreByWxEnterpriseId(wxEnterpriseId);
 		if(CollectionUtil.isEmpty(list)){
-			return resultResponse(HaoBanErrCode.ERR_1,storeList);
+			return resultResponse(HaoBanErrCode.ERR_1);
+		}
+		//1、初始化Department表数据
+		List<StoreVO> resultList = new ArrayList<StoreVO>();
+		for(DepartmentDTO dto : list){
+			StoreVO VO = new StoreVO();
+			VO.setDepartmentId(dto.getDepartmentId());
+			VO.setStoreId(dto.getRelatedId());//为空，则无该值
+			VO.setStoreName(dto.getDepartmentName());
+			VO.setWxEnterpriseId(dto.getWxEnterpriseId());
+			VO.setStoreImg("");//先置空
+			resultList.add(VO);
+		}
+		//2、获取关联表数据
+		List<StaffDepartmentRelatedDTO> relateList = staffDepartmentRelatedApiService.listByStaffId(staffId);
+		if(CollectionUtil.isNotEmpty(relateList)){
+			Map<String,StaffDepartmentRelatedDTO> map = com.gic.commons.util.CollectionUtil.toMap(relateList, "departmentId");
+			for(StoreVO VO : resultList){
+				StaffDepartmentRelatedDTO staffDepartmentRelatedDTO = map.get(VO.getDepartmentId());
+				if(staffDepartmentRelatedDTO != null){
+					VO.setBindFlag("1");
+					VO.setClerkCode(staffDepartmentRelatedDTO.getClerkCode());
+					VO.setStaffDepartmentRelatedId(staffDepartmentRelatedDTO.getStaffDepartmentRelatedId());
+					VO.setStaffId(staffId);
+				}else{
+					VO.setBindFlag("0");
+				}
+			}
 		}
-		List<String> departmentIds = list.stream().map(s->s.getDepartmentId()).collect(Collectors.toList());
-		List<DepartmentDTO> resultList = departmentApiService.listByDepartmentIds(departmentIds, 1);
 		return resultResponse(HaoBanErrCode.ERR_1,resultList);
 	}
 	//获取首页销售数据

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

+package com.gic.haoban.manage.web.vo;
+
+import java.io.Serializable;
+
+/**
+ * Created 2018/10/22.
+ *
+ * @author hua
+ */
+public class StoreVO implements Serializable {
+	private static final long serialVersionUID = 1L;
+	private String departmentId;
+	private String storeId;
+    private String staffId;
+    private String storeName;
+    private String wxEnterpriseId;
+    private String bindFlag;
+    private String staffDepartmentRelatedId;
+    private String clerkCode;
+    private String storeImg;
+    
+	public String getDepartmentId() {
+		return departmentId;
+	}
+	public void setDepartmentId(String departmentId) {
+		this.departmentId = departmentId;
+	}
+	public String getStoreId() {
+		return storeId;
+	}
+	public void setStoreId(String storeId) {
+		this.storeId = storeId;
+	}
+	public String getStaffId() {
+		return staffId;
+	}
+	public void setStaffId(String staffId) {
+		this.staffId = staffId;
+	}
+	public String getStoreName() {
+		return storeName;
+	}
+	public void setStoreName(String storeName) {
+		this.storeName = storeName;
+	}
+	public String getWxEnterpriseId() {
+		return wxEnterpriseId;
+	}
+	public void setWxEnterpriseId(String wxEnterpriseId) {
+		this.wxEnterpriseId = wxEnterpriseId;
+	}
+	public String getBindFlag() {
+		return bindFlag;
+	}
+	public void setBindFlag(String bindFlag) {
+		this.bindFlag = bindFlag;
+	}
+	public String getStaffDepartmentRelatedId() {
+		return staffDepartmentRelatedId;
+	}
+	public void setStaffDepartmentRelatedId(String staffDepartmentRelatedId) {
+		this.staffDepartmentRelatedId = staffDepartmentRelatedId;
+	}
+	public String getClerkCode() {
+		return clerkCode;
+	}
+	public void setClerkCode(String clerkCode) {
+		this.clerkCode = clerkCode;
+	}
+	public String getStoreImg() {
+		return storeImg;
+	}
+	public void setStoreImg(String storeImg) {
+		this.storeImg = storeImg;
+	}
+
+    
+}