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
1
Merge Requests
1
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
ce6aa5e5
Commit
ce6aa5e5
authored
Aug 18, 2022
by
墨竹
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:修改为新方法
parent
6096af3f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
13 deletions
+10
-13
StaffClerkRelationServiceImpl.java
...e/service/service/impl/StaffClerkRelationServiceImpl.java
+10
-13
No files found.
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffClerkRelationServiceImpl.java
View file @
ce6aa5e5
...
...
@@ -8,7 +8,6 @@ import com.gic.haoban.base.api.common.BasePageInfo;
import
com.gic.haoban.common.utils.PageUtil
;
import
com.gic.haoban.common.utils.StringUtil
;
import
com.gic.haoban.manage.api.dto.StaffClerkRelationDTO
;
import
com.gic.haoban.manage.api.dto.WxEnterpriseDTO
;
import
com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO
;
import
com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeQDTO
;
import
com.gic.haoban.manage.api.enums.BindTypeEnum
;
...
...
@@ -89,7 +88,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
staffClerkBindLogService
.
pushToMq
(
clerkRelation
.
getStaffId
(),
optStaffId
,
BindTypeEnum
.
UNBIND
.
getVal
(),
channelCode
,
clerkRelation
.
getStaffClerkRelationId
());
//废弃活码
hmClerkRelationApiService
.
delByClerkId
(
clerkId
,
clerkRelation
.
getEnterpriseId
(),
clerkRelation
.
getWxEnterpriseId
(),
channelCode
);
hmClerkRelationApiService
.
delByClerkId
(
clerkId
,
clerkRelation
.
getEnterpriseId
(),
clerkRelation
.
getWxEnterpriseId
(),
channelCode
);
}
return
b
;
}
...
...
@@ -117,7 +116,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
for
(
TabHaobanStaffClerkRelation
clerkRelation
:
needUnbind
)
{
//废弃活码
hmClerkRelationApiService
.
delByClerkId
(
clerkRelation
.
getClerkId
(),
clerkRelation
.
getEnterpriseId
(),
wxEnterpriseId
,
chanelCode
);
hmClerkRelationApiService
.
delByClerkId
(
clerkRelation
.
getClerkId
(),
clerkRelation
.
getEnterpriseId
(),
wxEnterpriseId
,
chanelCode
);
}
return
true
;
}
...
...
@@ -261,12 +260,12 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
@Override
public
List
<
StaffClerkRelationDTO
>
listByStaffId
(
String
wxEnterpriseId
,
String
staffId
)
{
return
EntityUtil
.
changeEntityListByJSON
(
StaffClerkRelationDTO
.
class
,
mapper
.
lisByStaffId
(
wxEnterpriseId
,
staffId
,
null
));
return
EntityUtil
.
changeEntityListByJSON
(
StaffClerkRelationDTO
.
class
,
mapper
.
lisByStaffId
(
wxEnterpriseId
,
staffId
,
null
));
}
@Override
public
List
<
StaffClerkRelationDTO
>
listByStaffId
(
String
wxEnterpriseId
,
String
staffId
,
List
<
String
>
storeIdList
)
{
return
EntityUtil
.
changeEntityListByJSON
(
StaffClerkRelationDTO
.
class
,
mapper
.
lisByStaffId
(
wxEnterpriseId
,
staffId
,
storeIdList
));
return
EntityUtil
.
changeEntityListByJSON
(
StaffClerkRelationDTO
.
class
,
mapper
.
lisByStaffId
(
wxEnterpriseId
,
staffId
,
storeIdList
));
}
@Override
...
...
@@ -320,7 +319,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
if
(
CollectionUtils
.
isEmpty
(
clerkList
))
{
return
null
;
}
WxEnterpriseQwDTO
qwDTO
=
this
.
wxEnterpriseService
.
getQwInfo
(
wxEnterpriseId
)
;
WxEnterpriseQwDTO
qwDTO
=
this
.
wxEnterpriseService
.
getQwInfo
(
wxEnterpriseId
);
if
(
qwDTO
.
needOpenUserId3th
())
{
return
mapper
.
listWxOpenUserIdByClerkIds
(
clerkList
,
wxEnterpriseId
);
}
...
...
@@ -332,9 +331,8 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
if
(
CollectionUtils
.
isEmpty
(
wxUserIds
))
{
return
null
;
}
WxEnterpriseDTO
wxEnterpriseDTO
=
wxEnterpriseService
.
selectById
(
wxEnterpriseId
);
String
corpid
=
wxEnterpriseDTO
.
getCorpid
();
if
(
corpid
.
length
()
>
20
)
{
WxEnterpriseQwDTO
qwDTO
=
this
.
wxEnterpriseService
.
getQwInfo
(
wxEnterpriseId
);
if
(
qwDTO
.
needOpenUserId3th
())
{
return
mapper
.
listIdsByWxOpenUserIds
(
wxUserIds
,
wxEnterpriseId
,
enterpriseId
);
}
return
mapper
.
listIdsByWxUserIds
(
wxUserIds
,
wxEnterpriseId
,
enterpriseId
);
...
...
@@ -345,9 +343,8 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
if
(
CollectionUtils
.
isEmpty
(
wxUserIds
))
{
return
null
;
}
WxEnterpriseDTO
wxEnterpriseDTO
=
wxEnterpriseService
.
selectById
(
wxEnterpriseId
);
String
corpid
=
wxEnterpriseDTO
.
getCorpid
();
if
(
corpid
.
length
()
>
20
)
{
WxEnterpriseQwDTO
qwDTO
=
this
.
wxEnterpriseService
.
getQwInfo
(
wxEnterpriseId
);
if
(
qwDTO
.
needOpenUserId3th
())
{
return
mapper
.
listIdsByNotInWxOpenUserIds
(
wxUserIds
,
wxEnterpriseId
,
enterpriseId
);
}
return
mapper
.
listIdsByNotInWxUserIds
(
wxUserIds
,
wxEnterpriseId
,
enterpriseId
);
...
...
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