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
85e96745
Commit
85e96745
authored
Nov 23, 2020
by
qwmqiuwenmin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
d1b2afc2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
64 additions
and
1 deletions
+64
-1
MemberUnionidRelatedApiService.java
...an/manage/api/service/MemberUnionidRelatedApiService.java
+2
-0
ExternalUserPojo.java
.../com/gic/haoban/manage/service/pojo/ExternalUserPojo.java
+10
-0
MemberUnionidRelatedApiServiceImpl.java
.../service/out/impl/MemberUnionidRelatedApiServiceImpl.java
+51
-0
FriendSyncOperation.java
...m/gic/haoban/manage/service/task/FriendSyncOperation.java
+1
-1
No files found.
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MemberUnionidRelatedApiService.java
View file @
85e96745
...
...
@@ -56,4 +56,6 @@ public interface MemberUnionidRelatedApiService {
String
addExternal
(
ExternalUserDTO
dto
);
ExternalUserDTO
getExternalUseridInfo
(
String
wxEnterpriseId
,
String
wxUserId
,
String
externalUserId
);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/ExternalUserPojo.java
View file @
85e96745
...
...
@@ -13,6 +13,8 @@ public class ExternalUserPojo implements Serializable{
private
String
avatar
;
private
String
addCreateTime
;
private
String
externalUserId
;
public
String
getWxEnterpriseId
()
{
return
wxEnterpriseId
;
...
...
@@ -53,6 +55,14 @@ public class ExternalUserPojo implements Serializable{
public
void
setAddCreateTime
(
String
addCreateTime
)
{
this
.
addCreateTime
=
addCreateTime
;
}
public
String
getExternalUserId
()
{
return
externalUserId
;
}
public
void
setExternalUserId
(
String
externalUserId
)
{
this
.
externalUserId
=
externalUserId
;
}
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java
View file @
85e96745
...
...
@@ -833,6 +833,57 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
ExternalUserPojo
pojo
=
getExternalUserPojo
(
unionIdJson
,
wxUserId
,
wxEnterpriseId
);
return
EntityUtil
.
changeEntityByJSON
(
ExternalUserDTO
.
class
,
pojo
);
}
@Override
public
ExternalUserDTO
getExternalUseridInfo
(
String
wxEnterpriseId
,
String
wxUserId
,
String
externalUserId
)
{
WxEnterpriseDTO
wxEnterprise
=
wxEnterpriseService
.
selectById
(
wxEnterpriseId
);
if
(
wxEnterprise
==
null
){
log
.
info
(
"企业不存在"
);
return
null
;
}
String
uJ
=
qywxUserApiService
.
getExternalUseridInfo
(
wxEnterprise
.
getCorpid
(),
config
.
getWxSuiteid
(),
externalUserId
);
if
(
StringUtils
.
isBlank
(
uJ
)){
log
.
info
(
"好友不存在"
);
return
null
;
}
String
name
=
""
;
String
createTime
=
""
;
String
avatar
=
""
;
if
(
StringUtils
.
isNotBlank
(
uJ
)){
JSONObject
jo
=
JSON
.
parseObject
(
uJ
);
String
external_contact
=
jo
.
getString
(
"external_contact"
);
String
uj_follow_user
=
jo
.
getString
(
"follow_user"
);
JSONObject
jt
=
null
;
if
(
StringUtils
.
isNotBlank
(
external_contact
)){
jt
=
JSON
.
parseObject
(
external_contact
);
name
=
EmojiFilterUtil
.
filterEmojiLast
(
jt
.
getString
(
"name"
),
true
);
avatar
=
jt
.
getString
(
"avatar"
);
}
if
(
StringUtils
.
isNotBlank
(
uj_follow_user
)){
JSONArray
j
=
JSON
.
parseArray
(
uj_follow_user
);
String
uj_userId
=
""
;
for
(
Object
object
:
j
)
{
String
followJson
=
JSON
.
toJSONString
(
object
);
JSONObject
follow
=
JSON
.
parseObject
(
followJson
);
uj_userId
=
follow
.
getString
(
"userid"
);
if
(
uj_userId
.
equals
(
wxUserId
)){
if
(
jt
!=
null
){
externalUserId
=
jt
.
getString
(
"external_userid"
);
createTime
=
jt
.
getString
(
"createtime"
);
break
;
}
}
}
}
}
ExternalUserPojo
pojo
=
new
ExternalUserPojo
();
pojo
.
setExternalUserId
(
externalUserId
);
pojo
.
setName
(
name
);
pojo
.
setAddCreateTime
(
createTime
);
pojo
.
setWxEnterpriseId
(
wxEnterpriseId
);
pojo
.
setAvatar
(
avatar
);
return
EntityUtil
.
changeEntityByJSON
(
ExternalUserDTO
.
class
,
pojo
);
}
@Override
public
String
addExternal
(
ExternalUserDTO
dto
)
{
String
wxUserId
=
dto
.
getWxUserId
();
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/FriendSyncOperation.java
View file @
85e96745
...
...
@@ -77,7 +77,7 @@ public class FriendSyncOperation implements BaseSyncOperation {
checkStaffTask
(
taskId
,
wxUserId
);
return
;
}
ExternalUserDTO
pojo
=
memberUnionidRelatedApiService
.
get
CorpSelfExternalUseridInfo
(
wxEnterpriseId
,
wxUserId
,
externalUserId
);
ExternalUserDTO
pojo
=
memberUnionidRelatedApiService
.
get
ExternalUseridInfo
(
wxEnterpriseId
,
wxUserId
,
externalUserId
);
if
(
pojo
==
null
){
preDealService
.
updateStatusByDataId
(
taskId
,
externalUserId
,
PreDealStatusEnum
.
exception
.
getVal
(),
"好友不存在"
);
checkStaffTask
(
taskId
,
wxUserId
);
...
...
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