Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
haoban3.0
haoban-manage3.0
Commits
a32f964b
Commit
a32f964b
authored
Apr 20, 2022
by
墨竹
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:员工列表返回导购code
parent
2c665eda
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
7 deletions
+8
-7
StaffDTO.java
...src/main/java/com/gic/haoban/manage/api/dto/StaffDTO.java
+3
-3
ClerkController.java
...com/gic/haoban/manage/web/controller/ClerkController.java
+2
-1
StaffVO.java
...x/src/main/java/com/gic/haoban/manage/web/vo/StaffVO.java
+3
-3
No files found.
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffDTO.java
View file @
a32f964b
...
@@ -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
;
}
}
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
View file @
a32f964b
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
));
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/StaffVO.java
View file @
a32f964b
...
@@ -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
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment