111

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

@@ -65,6 +65,7 @@ import com.gic.haoban.manage.web.vo.BindClerkVO;
 import com.gic.haoban.manage.web.vo.ClerkStoreVO;
 import com.gic.haoban.manage.web.vo.ClerkVo;
 import com.gic.haoban.manage.web.vo.StaffStoreVO;
+import com.gic.haoban.manage.web.vo.StoreClerkVO;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
@@ -238,6 +239,42 @@ public class ClerkController extends WebBaseController{
 		return resultResponse(HaoBanErrCode.ERR_1,resultlist);
 		
 	}
+	
+	//选择成员列表
+	@RequestMapping("/store-clerks")
+	public HaobanResponse storeClerks(String storeId) {
+		if(StringUtils.isAnyBlank(storeId)){
+			return resultResponse(HaoBanErrCode.ERR_2);
+		}
+		StoreDTO storeDTO = storeService.getStore(storeId);
+		if(storeDTO == null){
+			return resultResponse(HaoBanErrCode.ERR_10009);
+		}
+		List<ClerkListDTO> list = clerkService.getClerkByStoreId(storeDTO.getEnterpriseId(), storeId);
+		Set<String> clerkCodeList = list.stream().map(ClerkListDTO::getClerkCode).collect(Collectors.toSet());
+		List<StaffClerkRelationDTO> bindRelationList = staffClerkRelationApiService.listBindCode(storeDTO.getEnterpriseId(),clerkCodeList);
+		Map<String,StaffClerkRelationDTO> bindCodeMap = bindRelationList.stream().collect(Collectors.toMap(StaffClerkRelationDTO::getClerkCode, s->s));
+		List<StoreClerkVO> resultList = new ArrayList<>();
+		for(ClerkListDTO dto :list){
+			String clerkCode = dto.getClerkCode();
+			StoreClerkVO vo = new StoreClerkVO();
+			vo.setClerkCode(clerkCode);
+			vo.setClerkId(dto.getClerkId());
+			vo.setClerkType(dto.getClerkType());
+			vo.setClerkImg(dto.getImageUrl());
+			StaffClerkRelationDTO related = bindCodeMap.get(clerkCode);
+			if(related != null){
+				vo.setStaffId(related.getStaffId());
+				vo.setBindFlag(1);
+			}else{
+				vo.setBindFlag(0);
+			}
+			resultList.add(vo);
+		}
+		return resultResponse(HaoBanErrCode.ERR_1,resultList);
+		
+	}
+	
 	//成员绑定
 	@HttpLimit
 	@RequestMapping("/staff-bind")
@@ -542,9 +579,6 @@ public class ClerkController extends WebBaseController{
 		if(auditDTO != null){
 			return resultResponse(HaoBanErrCode.ERR_10018);
 		}
-		
-		
-		
 		StoreDTO store = storeService.getStore(clerk.getStoreId());
 		String clerkCode = clerk.getClerkCode();
 		String wxEnterpriseId = staff.getWxEnterpriseId();

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

+package com.gic.haoban.manage.web.vo;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created 2018/10/22.
+ *
+ * @author hua
+ */
+public class StoreClerkVO implements Serializable {
+	private static final long serialVersionUID = 1L;
+    private String staffId;
+    private String clerkCode;
+    private String clerkId;
+    private int clerkType;
+    private int bindFlag;
+    private String clerkImg;
+
+	public String getClerkImg() {
+		return clerkImg;
+	}
+	public void setClerkImg(String clerkImg) {
+		this.clerkImg = clerkImg;
+	}
+	public String getStaffId() {
+		return staffId;
+	}
+	public void setStaffId(String staffId) {
+		this.staffId = staffId;
+	}
+	public String getClerkCode() {
+		return clerkCode;
+	}
+	public void setClerkCode(String clerkCode) {
+		this.clerkCode = clerkCode;
+	}
+	public String getClerkId() {
+		return clerkId;
+	}
+	public void setClerkId(String clerkId) {
+		this.clerkId = clerkId;
+	}
+	public int getClerkType() {
+		return clerkType;
+	}
+	public void setClerkType(int clerkType) {
+		this.clerkType = clerkType;
+	}
+	public int getBindFlag() {
+		return bindFlag;
+	}
+	public void setBindFlag(int bindFlag) {
+		this.bindFlag = bindFlag;
+	}
+    
+
+    
+}