111

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

 package com.gic.haoban.manage.web.controller;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import cn.hutool.core.collection.CollectionUtil;
+
+import com.gic.clerk.api.dto.ClerkDTO;
+import com.gic.clerk.api.service.ClerkService;
+import com.gic.commons.util.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
-import com.gic.haoban.manage.api.dto.ApplicationDTO;
 import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
-import com.gic.haoban.manage.api.service.ApplicationApiService;
 import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+import com.gic.haoban.manage.web.vo.ClerkVo;
 
 @RestController
 public class ClerkController extends WebBaseController{
-	
+	@Autowired
+	private ClerkService clerkService;
 	@Autowired
 	private StaffDepartmentRelatedApiService staffDepartmentRelatedApiService;
 	
 	@RequestMapping("/clerk-list")
 	public HaobanResponse clerkList(String storeId,String bindFlag,String departmentId) {
-		
-		
 		List<StaffDepartmentRelatedDTO> list = staffDepartmentRelatedApiService.listByDepartmentId(departmentId);
-		
-		return resultResponse(HaoBanErrCode.ERR_1,list);
+		List<ClerkVo> result  = new ArrayList<ClerkVo>();
+		//绑定的clerk
+		if("1".equals(bindFlag)){
+			// 调陶接口获取详情数据
+			if(CollectionUtil.isNotEmpty(list)){
+				List<String> clerkCodes = list.stream().map(s->s.getClerkCode()).collect(Collectors.toList());
+				List<ClerkDTO> clerkList = clerkService.listClerk(storeId, clerkCodes, true);
+				result = EntityUtil.changeEntityListByJSON(ClerkVo.class, clerkList);
+			}
+		}else{
+			//未绑定的clerk
+			// 调陶接口获取详情数据
+			if(CollectionUtil.isNotEmpty(list)){
+				List<String> clerkCodes = list.stream().map(s->s.getClerkCode()).collect(Collectors.toList());
+				List<ClerkDTO> clerkList = clerkService.listClerk(storeId, clerkCodes, false);
+				result = EntityUtil.changeEntityListByJSON(ClerkVo.class, clerkList);
+			}
+		}
+		return resultResponse(HaoBanErrCode.ERR_1,result);
 		
 	}
 

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

+package com.gic.haoban.manage.web.vo;
+
+import java.io.Serializable;
+
+/**
+ * Created 2018/10/22.
+ *
+ * @author hua
+ */
+public class ClerkVo implements Serializable {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private String clerkId;
+    private String clerkCode;
+    private String nationCode;
+    private String phoneNumber;
+    private String bindFlag;
+    private String clerkName;
+	public String getClerkId() {
+		return clerkId;
+	}
+	public void setClerkId(String clerkId) {
+		this.clerkId = clerkId;
+	}
+	public String getClerkCode() {
+		return clerkCode;
+	}
+	public void setClerkCode(String clerkCode) {
+		this.clerkCode = clerkCode;
+	}
+	public String getNationCode() {
+		return nationCode;
+	}
+	public void setNationCode(String nationCode) {
+		this.nationCode = nationCode;
+	}
+	public String getPhoneNumber() {
+		return phoneNumber;
+	}
+	public void setPhoneNumber(String phoneNumber) {
+		this.phoneNumber = phoneNumber;
+	}
+	public String getBindFlag() {
+		return bindFlag;
+	}
+	public void setBindFlag(String bindFlag) {
+		this.bindFlag = bindFlag;
+	}
+	public String getClerkName() {
+		return clerkName;
+	}
+	public void setClerkName(String clerkName) {
+		this.clerkName = clerkName;
+	}
+
+}

haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml

@@ -19,6 +19,7 @@
     <!--<dubbo:registry address="zookeeper://115.159.182.172:2199" protocol="dubbo" id="remoteAdd"/>-->
     <!--<dubbo:registry address="zookeeper://localhost:2181|zookeeper://115.159.182.172:2199" protocol="dubbo"/>-->
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService" id="staffDepartmentRelatedApiService"/>
+	<dubbo:reference interface="com.gic.clerk.api.service.ClerkService" id="clerkService"/>
 
 
 </beans>