Merge branch 'bugfix-0216' into 'master'

返回前端memberCount字段换值

See merge request !170

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

@@ -105,21 +105,18 @@ public class ClerkController extends WebBaseController {
         List<String> staffIds = list.stream().map(s -> s.getStaffId()).collect(Collectors.toList());
         List<StaffDTO> resultlist = staffApiService.listByIds(staffIds);
         Map<String, StaffDTO> map = com.gic.commons.util.CollectionUtil.toMap(resultlist, "staffId");
-        int size = 0;
-        if (resultlist != null) {
-            size = resultlist.size();
-        }
 
-        List<StaffDTO> resultList = new ArrayList<>();
+        List<StaffVO> resultList = new ArrayList<>();
         for (StaffClerkRelationDTO staffClerkRelationDTO : list) {
             StaffDTO dto = map.get(staffClerkRelationDTO.getStaffId());
+            StaffVO staffVO = EntityUtil.changeEntityByJSON(StaffVO.class, dto);
             ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), staffClerkRelationDTO.getClerkCode());
             if (clerk != null) {
                 long memberCount = distributeApiService.getClerkMemberCount(staffClerkRelationDTO.getEnterpriseId(), clerk.getClerkId(), storeId);
                 logger.info("【获取会员数】enterpriseId={},clerkId={},storeId={},count={}", staffClerkRelationDTO.getEnterpriseId(), clerk.getClerkId(), storeId, memberCount);
-                dto.setMemberCount(memberCount);
-                dto.setClerkId(clerk.getClerkId());
-                resultList.add(dto);
+                staffVO.setMemberCount(new Long(memberCount).intValue());
+                staffVO.setClerkId(clerk.getClerkId());
+                resultList.add(staffVO);
             }
         }
         return resultResponse(HaoBanErrCode.ERR_1, resultList);
@@ -188,6 +185,7 @@ public class ClerkController extends WebBaseController {
 
     /**
      * 会员小程序-获取后台认证配置
+     *
      * @param wxEnterpriseId
      * @return
      */
@@ -206,6 +204,7 @@ public class ClerkController extends WebBaseController {
 
     /**
      * 会员小程序-获取后台认证配置
+     *
      * @param wxEnterpriseId
      * @param staffId
      * @return
@@ -664,7 +663,7 @@ public class ClerkController extends WebBaseController {
     //精确查，根据手机号或者code，查找
     @RequestMapping("query-clerk-list-by-code")
     public HaobanResponse queryClerkListByCode(String keyword, String wxEnterpriseId, String staffId) {
-        if (StringUtils.isAnyBlank(staffId, wxEnterpriseId,keyword)) {
+        if (StringUtils.isAnyBlank(staffId, wxEnterpriseId, keyword)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
         List<EnterpriseDetailDTO> list = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId);
@@ -768,7 +767,7 @@ public class ClerkController extends WebBaseController {
         if (staffDTO != null) {
             String phoneNumber = staffDTO.getPhoneNumber();
             if (StringUtils.isBlank(phoneNumber)) {
-                logger.error("手机号为空，staffId：{}",staffId);
+                logger.error("手机号为空，staffId：{}", staffId);
                 return ret;
             }
             List<ClerkDTO> clerkList = clerkNewService.listClerkByEnterpriseIdAndSearch(enterpriseIdList, storeIdList, phoneNumber);
@@ -797,7 +796,7 @@ public class ClerkController extends WebBaseController {
             return ret;
         }
         return ret.stream().filter(mid -> (!clerkIds.contains(mid.getClerkId()))).collect(
-                Collectors.collectingAndThen(Collectors.toCollection(()->new TreeSet<>(Comparator.comparing(n->n.getClerkId()))),ArrayList::new));
+                Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(n -> n.getClerkId()))), ArrayList::new));
     }
 
     //绑定
@@ -1191,7 +1190,7 @@ public class ClerkController extends WebBaseController {
         CustomerFriendMemberVO ret = new CustomerFriendMemberVO();
         StaffDTO staffDTO = staffApiService.selectById(qo.getStaffId());
         if (staffDTO == null) {
-            return RestResponse.failure(HaoBanErrCode.ERR_6.getCode()+"",HaoBanErrCode.ERR_6.getMsg());
+            return RestResponse.failure(HaoBanErrCode.ERR_6.getCode() + "", HaoBanErrCode.ERR_6.getMsg());
         }
         int friendCount = externalClerkRelatedApiService.countFriendCountByClerkId(qo.getWxEnterpriseId(), qo.getEnterpriseId(), staffDTO.getWxUserId(), qo.getClerkId());
         int memberCount = customerApiService.countMember(qo.getEnterpriseId(), qo.getStoreId(), qo.getClerkId());
@@ -1232,14 +1231,14 @@ public class ClerkController extends WebBaseController {
      * @author mozhu
      * @date 2021-12-29 10:42:24
      */
-    @RequestMapping(value = "getOpenIdByStaffId",method = {RequestMethod.POST,RequestMethod.GET})
+    @RequestMapping(value = "getOpenIdByStaffId", method = {RequestMethod.POST, RequestMethod.GET})
     public RestResponse<String> getOpenIdByStaffId() {
         String staffId = this.getLoginUser().getStaffId();
         String wxEnterpriseId = this.getLoginUser().getWxEnterpriseId();
         StaffDTO staffDTO = staffApiService.selectById(staffId);
         if (staffDTO == null) {
             int code = HaoBanErrCode.ERR_6.getCode();
-            return RestResponse.failure(String.valueOf(code),HaoBanErrCode.ERR_6.getMsg());
+            return RestResponse.failure(String.valueOf(code), HaoBanErrCode.ERR_6.getMsg());
         }
         String wxOpenId = staffDTO.getWxOpenId();
         if (StringUtils.isNotBlank(wxOpenId)) {
@@ -1248,15 +1247,15 @@ public class ClerkController extends WebBaseController {
         WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseApiService.getOne(wxEnterpriseId);
         if (wxEnterpriseDTO == null) {
             int code = HaoBanErrCode.ERR_400002.getCode();
-            return RestResponse.failure(String.valueOf(code),HaoBanErrCode.ERR_400002.getMsg());
+            return RestResponse.failure(String.valueOf(code), HaoBanErrCode.ERR_400002.getMsg());
         }
         String wxUserId = staffDTO.getWxUserId();
         String openid = qywxUserApiService.getSelfOpenIdByUserId(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid(), wxUserId);
         if (StringUtils.isBlank(openid)) {
             int code = HaoBanErrCode.ERR_600003.getCode();
-            return RestResponse.failure(String.valueOf(code),HaoBanErrCode.ERR_600003.getMsg());
+            return RestResponse.failure(String.valueOf(code), HaoBanErrCode.ERR_600003.getMsg());
         }
-        staffApiService.updateOpenIdByStaffId(staffId,openid);
+        staffApiService.updateOpenIdByStaffId(staffId, openid);
         return RestResponse.successResult(openid);
     }
 }

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

+package com.gic.haoban.manage.web.vo;
+
+import com.gic.haoban.manage.api.dto.DepartmentDTO;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+public class StaffVO implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 员工id
+	 */
+	private String staffId;
+	/**
+	 * 企业微信id
+	 */
+	private String wxEnterpriseId;
+	/**
+	 * 微信用户id
+	 */
+	private String wxUserId;
+	/**
+	 * 手机号
+	 */
+	private String phoneNumber;
+	/**
+	 * 员工姓名
+	 */
+    private String staffName;
+	/**
+	 * 国家码
+	 */
+    private String nationCode;
+	/**
+	 * 昵称
+	 */
+    private String nickName;
+	/**
+	 * 性别
+	 */
+    private Integer sex;
+	/**
+	 * 职位
+	 */
+    private String postion;
+	/**
+	 * 激活状态
+	 */
+    private Integer activeFlag;
+	/**
+	 * 对外职务
+	 */
+    private String extendPostion;
+	/**
+	 * 状态
+	 */
+    private Integer statusFlag;
+
+    private Date createTime;
+
+    private Date updateTime;
+    
+    private String departmentIds;
+    
+    private String headImg;
+    
+    private Integer sort;
+    
+    private List<DepartmentDTO> departmentList;
+
+    private int bindFlag;
+    
+    private String clerkCode;
+
+	private String staffDepartmentRelatedId;
+
+	private int clerkType;
+
+	private Integer syncPostionFlag;
+
+	private Integer superManagerFlag;
+
+	private Boolean weixinPush;
+
+	private Integer memberCount;
+
+	private String clerkId;
+	/**
+	 * 关联状态 1 已关联 0 未关联
+	 * 关联状态为 员工是否关联某门店导购
+	 */
+	private Integer relationFlag;
+
+	private String wxOpenUseId;
+
+	private String wxOpenId;
+	private String qrCode;
+
+	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 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 int getBindFlag() {
+		return bindFlag;
+	}
+
+	public void setBindFlag(int bindFlag) {
+		this.bindFlag = bindFlag;
+	}
+
+	public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId == null ? null : staffId.trim();
+    }
+    
+    
+
+    public String getWxEnterpriseId() {
+		return wxEnterpriseId;
+	}
+
+	public void setWxEnterpriseId(String wxEnterpriseId) {
+		this.wxEnterpriseId = wxEnterpriseId;
+	}
+
+	public String getExtendPostion() {
+		return extendPostion;
+	}
+
+	public void setExtendPostion(String extendPostion) {
+		this.extendPostion = extendPostion;
+	}
+
+	public Integer getStatusFlag() {
+		return statusFlag;
+	}
+
+	public void setStatusFlag(Integer statusFlag) {
+		this.statusFlag = statusFlag;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public String getWxUserId() {
+        return wxUserId;
+    }
+
+    public void setWxUserId(String wxUserId) {
+        this.wxUserId = wxUserId == null ? null : wxUserId.trim();
+    }
+
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber == null ? null : phoneNumber.trim();
+    }
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName == null ? null : staffName.trim();
+    }
+
+    public String getNationCode() {
+        return nationCode;
+    }
+
+    public void setNationCode(String nationCode) {
+        this.nationCode = nationCode == null ? null : nationCode.trim();
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName == null ? null : nickName.trim();
+    }
+
+    public Integer getSex() {
+        return sex;
+    }
+
+    public void setSex(Integer sex) {
+        this.sex = sex;
+    }
+
+    public String getPostion() {
+        return postion;
+    }
+
+    public void setPostion(String postion) {
+        this.postion = postion == null ? null : postion.trim();
+    }
+
+    public Integer getActiveFlag() {
+        return activeFlag;
+    }
+
+    public void setActiveFlag(Integer activeFlag) {
+        this.activeFlag = activeFlag;
+    }
+
+	public String getDepartmentIds() {
+		return departmentIds;
+	}
+
+	public void setDepartmentIds(String departmentIds) {
+		this.departmentIds = departmentIds;
+	}
+
+	public String getHeadImg() {
+		return headImg;
+	}
+
+	public void setHeadImg(String headImg) {
+		this.headImg = headImg;
+	}
+
+	public List<DepartmentDTO> getDepartmentList() {
+		return departmentList;
+	}
+
+	public void setDepartmentList(List<DepartmentDTO> departmentList) {
+		this.departmentList = departmentList;
+	}
+
+	public Integer getSort() {
+		return sort;
+	}
+
+	public void setSort(Integer sort) {
+		this.sort = sort;
+	}
+
+	public Integer getSyncPostionFlag() {
+		return syncPostionFlag;
+	}
+
+	public void setSyncPostionFlag(Integer syncPostionFlag) {
+		this.syncPostionFlag = syncPostionFlag;
+	}
+
+	public Integer getSuperManagerFlag() {
+		return superManagerFlag;
+	}
+
+	public void setSuperManagerFlag(Integer superManagerFlag) {
+		this.superManagerFlag = superManagerFlag;
+	}
+
+	public Boolean getWeixinPush() {
+		return weixinPush;
+	}
+
+	public void setWeixinPush(Boolean weixinPush) {
+		this.weixinPush = weixinPush;
+	}
+
+	public Integer getMemberCount() {
+		return memberCount;
+	}
+
+	public void setMemberCount(Integer memberCount) {
+		this.memberCount = memberCount;
+	}
+
+	public Integer getRelationFlag() {
+		return relationFlag;
+	}
+
+	public void setRelationFlag(Integer relationFlag) {
+		this.relationFlag = relationFlag;
+	}
+
+	public String getWxOpenUseId() {
+		return wxOpenUseId;
+	}
+
+	public void setWxOpenUseId(String wxOpenUseId) {
+		this.wxOpenUseId = wxOpenUseId;
+	}
+
+	public String getWxOpenId() {
+		return wxOpenId;
+	}
+
+	public void setWxOpenId(String wxOpenId) {
+		this.wxOpenId = wxOpenId;
+	}
+
+	public String getQrCode() {
+		return qrCode;
+	}
+
+	public void setQrCode(String qrCode) {
+		this.qrCode = qrCode;
+	}
+}