Commit a32f964b by 墨竹

fix:员工列表返回导购code

parent 2c665eda
...@@ -83,7 +83,7 @@ public class StaffDTO implements Serializable { ...@@ -83,7 +83,7 @@ public class StaffDTO implements Serializable {
private Boolean weixinPush; private Boolean weixinPush;
private long memberCount; private Integer memberCount;
private String clerkId; private String clerkId;
/** /**
...@@ -308,11 +308,11 @@ public class StaffDTO implements Serializable { ...@@ -308,11 +308,11 @@ public class StaffDTO implements Serializable {
this.weixinPush = weixinPush; this.weixinPush = weixinPush;
} }
public long getMemberCount() { public Integer getMemberCount() {
return memberCount; return memberCount;
} }
public void setMemberCount(long memberCount) { public void setMemberCount(Integer memberCount) {
this.memberCount = memberCount; this.memberCount = memberCount;
} }
......
package com.gic.haoban.manage.web.controller; package com.gic.haoban.manage.web.controller;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.convert.Convert;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.Page; import com.gic.api.base.commons.Page;
...@@ -114,7 +115,7 @@ public class ClerkController extends WebBaseController { ...@@ -114,7 +115,7 @@ public class ClerkController extends WebBaseController {
if (clerk != null) { if (clerk != null) {
long memberCount = distributeApiService.getClerkMemberCount(staffClerkRelationDTO.getEnterpriseId(), clerk.getClerkId(), storeId); long memberCount = distributeApiService.getClerkMemberCount(staffClerkRelationDTO.getEnterpriseId(), clerk.getClerkId(), storeId);
logger.info("【获取会员数】enterpriseId={},clerkId={},storeId={},memberCount={}", staffClerkRelationDTO.getEnterpriseId(), clerk.getClerkId(), storeId, memberCount); 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.setClerkId(clerk.getClerkId());
staffDTO.setClerkCode(clerk.getClerkCode()); staffDTO.setClerkCode(clerk.getClerkCode());
resultList.add(EntityUtil.changeEntityNew(StaffVO.class, staffDTO)); resultList.add(EntityUtil.changeEntityNew(StaffVO.class, staffDTO));
......
...@@ -85,7 +85,7 @@ public class StaffVO implements Serializable { ...@@ -85,7 +85,7 @@ public class StaffVO implements Serializable {
private Boolean weixinPush; private Boolean weixinPush;
private long memberCount; private Integer memberCount;
private String clerkId; private String clerkId;
/** /**
...@@ -310,11 +310,11 @@ public class StaffVO implements Serializable { ...@@ -310,11 +310,11 @@ public class StaffVO implements Serializable {
this.weixinPush = weixinPush; this.weixinPush = weixinPush;
} }
public long getMemberCount() { public Integer getMemberCount() {
return memberCount; return memberCount;
} }
public void setMemberCount(long memberCount) { public void setMemberCount(Integer memberCount) {
this.memberCount = memberCount; this.memberCount = memberCount;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment