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
dadbac6a
Commit
dadbac6a
authored
Apr 14, 2025
by
王祖波
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/developer' into developer
parents
ee7ec136
1415f67d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
4 deletions
+30
-4
HmLinkWxaDTO.java
...n/java/com/gic/haoban/manage/api/dto/hm/HmLinkWxaDTO.java
+14
-1
QwMomentPlanAttendServiceImpl.java
...ce/service/moment/impl/QwMomentPlanAttendServiceImpl.java
+4
-1
HmLinkApiServiceImpl.java
...age/service/service/out/impl/hm/HmLinkApiServiceImpl.java
+6
-1
WxStaffController.java
...m/gic/haoban/manage/web/controller/WxStaffController.java
+6
-1
No files found.
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmLinkWxaDTO.java
View file @
dadbac6a
...
...
@@ -34,7 +34,20 @@ public class HmLinkWxaDTO implements Serializable {
private
List
<
HmLinkStoreDTO
>
storeList
;
// 说明
private
Map
<
String
,
String
>
remarkMap
;
/**
* 是否企微好友
*/
private
Integer
qwFriendFlag
;
public
Integer
getQwFriendFlag
()
{
return
qwFriendFlag
;
}
public
void
setQwFriendFlag
(
Integer
qwFriendFlag
)
{
this
.
qwFriendFlag
=
qwFriendFlag
;
}
public
String
getWxEnterpriseId
()
{
return
wxEnterpriseId
;
}
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/moment/impl/QwMomentPlanAttendServiceImpl.java
View file @
dadbac6a
...
...
@@ -162,7 +162,7 @@ public class QwMomentPlanAttendServiceImpl implements QwMomentPlanAttendService
if
(
CollectionUtils
.
isEmpty
(
list
))
{
this
.
qwMomentPlanAttendMapper
.
updateFail
(
plan
.
getPlanId
(),
clerkIdList
,
"任务下发时未绑定企微号"
);
}
else
{
List
<
String
>
noStaffClerkIdList
=
allList
.
stream
().
filter
(
o
->
map
.
keySet
().
contains
(
o
.
getClerkId
())).
map
(
o
->
o
.
getClerkId
()).
collect
(
Collectors
.
toList
());
List
<
String
>
noStaffClerkIdList
=
allList
.
stream
().
filter
(
o
->
!
map
.
keySet
().
contains
(
o
.
getClerkId
())).
map
(
o
->
o
.
getClerkId
()).
collect
(
Collectors
.
toList
());
if
(
CollectionUtils
.
isNotEmpty
(
noStaffClerkIdList
))
{
this
.
qwMomentPlanAttendMapper
.
updateFail
(
plan
.
getPlanId
(),
noStaffClerkIdList
,
"任务下发时未绑定企微号"
);
}
...
...
@@ -170,6 +170,9 @@ public class QwMomentPlanAttendServiceImpl implements QwMomentPlanAttendService
for
(
QwMomentPlanAttendDTO
dto
:
allList
)
{
String
cid
=
dto
.
getClerkId
()
;
String
sid
=
dto
.
getStaffId
()
;
if
(
noStaffClerkIdList
.
contains
(
cid
))
{
continue
;
}
if
(
map
.
get
(
cid
)
!=
null
&&
map
.
get
(
cid
).
equals
(
sid
))
{
}
else
{
this
.
qwMomentPlanAttendMapper
.
updateSuccessStaff
(
plan
.
getPlanId
(),
cid
,
map
.
get
(
cid
));
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmLinkApiServiceImpl.java
View file @
dadbac6a
...
...
@@ -709,7 +709,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
List
<
String
>
friendList
=
this
.
tabHaobanExternalClerkRelatedMapper
.
listMemberAndClerk
(
Arrays
.
asList
(
memberId
),
clerkIdList
,
enterpriseId
)
;
if
(
CollectionUtils
.
isNotEmpty
(
friendList
))
{
log
.
info
(
"已存在好友"
);
return
ServiceResponse
.
failure
(
"1000"
,
"已存在好友"
)
;
// return ServiceResponse.failure("1000", "已存在好友") ;
}
String
mainClerkId
=
member
.
getMainClerkId
();
String
mainStoreId
=
member
.
getMainStoreId
();
...
...
@@ -762,6 +762,11 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
retDTO
.
setHmQrcode
(
addResp
.
getResult
());
}
}
String
staffId
=
hm
.
getStaffId
()
;
TabHaobanExternalClerkRelated
related
=
tabHaobanExternalClerkRelatedMapper
.
getByMemberId
(
staffId
,
memberId
)
;
if
(
null
!=
related
)
{
retDTO
.
setQwFriendFlag
(
1
);
}
}
// 生成动态活码
log
.
info
(
"活码数据返回={}"
,
JSON
.
toJSONString
(
retDTO
));
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java
View file @
dadbac6a
...
...
@@ -1577,7 +1577,12 @@ public class WxStaffController extends WebBaseController {
List
<
String
>
list
=
staffApiService
.
getNotEmptyHaobanStoreIdsRolesByClerkIdAndStoreStatus
(
clerkId
,
wxEnterpriseId
,
StoreStatusFilterUtils
.
getStoreStatusList
(
storeStatusFilter
),
null
);
storeRoleVO
.
setStoreCount
(
list
.
contains
(
"no_store"
)
?
0
:
list
.
size
());
storeRoleVO
.
setStoreDTO
(
list
.
contains
(
"no_store"
)
?
null
:
storeService
.
getStore
(
list
.
get
(
0
)));
StoreDTO
dto
=
list
.
contains
(
"no_store"
)
?
null
:
storeService
.
getStore
(
list
.
get
(
0
))
;
if
(
null
!=
dto
)
{
EnterpriseDTO
en
=
this
.
enterpriseService
.
getEnterpriseById
(
dto
.
getEnterpriseId
())
;
dto
.
setBrandName
(
en
.
getBrandName
());
}
storeRoleVO
.
setStoreDTO
(
dto
);
return
RestResponse
.
successResult
(
storeRoleVO
);
}
...
...
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