Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/bean/worker/WebsitWorkerBean.java

@@ -8,9 +8,12 @@ import lombok.Data;
 @Data
 public class WebsitWorkerBean {
 
-    @ApiModelProperty(value = "师傅编号")
+    @ApiModelProperty(value = "师傅id")
     private String workerId;
 
+    @ApiModelProperty(value = "师傅编号")
+    private String workerNumber;
+
     @ApiModelProperty(value = "师傅名称")
     private String workerName;
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/worker/WorkerTeamLogic.java

@@ -168,13 +168,15 @@ public class WorkerTeamLogic {
                 .in(User::getUserId, websitUsers.stream().map(WebsitUser::getUserId).collect(Collectors.toList()))
                 .list();
 
-        final Map<String, String> userMap = userList.stream().collect(Collectors.toMap(User::getUserId, User::getNickName));
+        final Map<String, User> userMap = userList.stream().collect(Collectors.toMap(User::getUserId, Function.identity()));
         List<WebsitWorkerBean> beanList = new ArrayList<>();
         for (WebsitUser websitUser : websitUsers) {
             if (userMap.containsKey(websitUser.getUserId())) {
+                final User user = userMap.get(websitUser.getUserId());
                 WebsitWorkerBean bean = new WebsitWorkerBean();
                 bean.setWorkerId(websitUser.getUserId());
-                bean.setWorkerName(userMap.get(websitUser.getUserId()));
+                bean.setWorkerId(user.getWorkerNumber());
+                bean.setWorkerName(user.getNickName());
                 beanList.add(bean);
             }
         }