Merge branch 'master' into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffDTO.java

@@ -83,7 +83,7 @@ public class StaffDTO implements Serializable {
 
 	private Boolean weixinPush;
 
-	private long memberCount;
+	private Integer memberCount;
 
 	private String clerkId;
 	/**
@@ -308,11 +308,11 @@ public class StaffDTO implements Serializable {
 		this.weixinPush = weixinPush;
 	}
 
-	public long getMemberCount() {
+	public Integer getMemberCount() {
 		return memberCount;
 	}
 
-	public void setMemberCount(long memberCount) {
+	public void setMemberCount(Integer memberCount) {
 		this.memberCount = memberCount;
 	}
 

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

 package com.gic.haoban.manage.web.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
@@ -114,7 +115,7 @@ public class ClerkController extends WebBaseController {
                 if (clerk != null) {
                     long memberCount = distributeApiService.getClerkMemberCount(staffClerkRelationDTO.getEnterpriseId(), clerk.getClerkId(), storeId);
                     logger.info("【获取会员数】enterpriseId={},clerkId={},storeId={},memberCount={}", staffClerkRelationDTO.getEnterpriseId(), clerk.getClerkId(), storeId, memberCount);
-                    staffDTO.setMemberCount(memberCount);
+                    staffDTO.setMemberCount(Convert.toInt(memberCount,0));
                     staffDTO.setClerkId(clerk.getClerkId());
                     staffDTO.setClerkCode(clerk.getClerkCode());
                     resultList.add(EntityUtil.changeEntityNew(StaffVO.class, staffDTO));

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

@@ -85,7 +85,7 @@ public class StaffVO implements Serializable {
 
 	private Boolean weixinPush;
 
-	private long memberCount;
+	private Integer memberCount;
 
 	private String clerkId;
 	/**
@@ -310,11 +310,11 @@ public class StaffVO implements Serializable {
 		this.weixinPush = weixinPush;
 	}
 
-	public long getMemberCount() {
+	public Integer getMemberCount() {
 		return memberCount;
 	}
 
-	public void setMemberCount(long memberCount) {
+	public void setMemberCount(Integer memberCount) {
 		this.memberCount = memberCount;
 	}