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
680abae3
Commit
680abae3
authored
Nov 02, 2022
by
徐高华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
群发协管只发送一个人
parent
d784bf89
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
3 deletions
+27
-3
ClerkStaffWxUserDTO.java
...va/com/gic/haoban/manage/api/dto/ClerkStaffWxUserDTO.java
+13
-1
MemberStaffRelExtDO.java
...haoban/manage/service/entity/ext/MemberStaffRelExtDO.java
+11
-0
ExternalClerkRelatedApiServiceImpl.java
.../service/out/impl/ExternalClerkRelatedApiServiceImpl.java
+1
-1
TabHaobanStaffClerkRelationMapper.xml
...in/resources/mapper/TabHaobanStaffClerkRelationMapper.xml
+2
-1
No files found.
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/ClerkStaffWxUserDTO.java
View file @
680abae3
package
com
.
gic
.
haoban
.
manage
.
api
.
dto
;
package
com
.
gic
.
haoban
.
manage
.
api
.
dto
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
/**
* desc:员工导购id与导购wxUserId实体
* desc:员工导购id与导购wxUserId实体
...
@@ -22,14 +23,25 @@ public class ClerkStaffWxUserDTO implements Serializable {
...
@@ -22,14 +23,25 @@ public class ClerkStaffWxUserDTO implements Serializable {
* 员工导购id
* 员工导购id
*/
*/
private
String
staffClerkId
;
private
String
staffClerkId
;
private
Date
addFriendTime
;
public
Date
getAddFriendTime
()
{
return
addFriendTime
;
}
public
void
setAddFriendTime
(
Date
addFriendTime
)
{
this
.
addFriendTime
=
addFriendTime
;
}
public
ClerkStaffWxUserDTO
()
{
public
ClerkStaffWxUserDTO
()
{
}
}
public
ClerkStaffWxUserDTO
(
String
staffId
,
String
staffClerkId
,
String
memberExternalUserId
)
{
public
ClerkStaffWxUserDTO
(
String
staffId
,
String
staffClerkId
,
String
memberExternalUserId
,
Date
addFriendTime
)
{
this
.
memberExternalUserId
=
memberExternalUserId
;
this
.
memberExternalUserId
=
memberExternalUserId
;
this
.
staffId
=
staffId
;
this
.
staffId
=
staffId
;
this
.
staffClerkId
=
staffClerkId
;
this
.
staffClerkId
=
staffClerkId
;
this
.
addFriendTime
=
addFriendTime
;
}
}
public
String
getMemberExternalUserId
()
{
public
String
getMemberExternalUserId
()
{
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/ext/MemberStaffRelExtDO.java
View file @
680abae3
package
com
.
gic
.
haoban
.
manage
.
service
.
entity
.
ext
;
package
com
.
gic
.
haoban
.
manage
.
service
.
entity
.
ext
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
/**
* desc:会员导购关系扩展实体类
* desc:会员导购关系扩展实体类
...
@@ -23,6 +24,16 @@ public class MemberStaffRelExtDO implements Serializable {
...
@@ -23,6 +24,16 @@ public class MemberStaffRelExtDO implements Serializable {
* 员工导购id
* 员工导购id
*/
*/
private
String
staffClerkId
;
private
String
staffClerkId
;
private
Date
addFriendTime
;
public
Date
getAddFriendTime
()
{
return
addFriendTime
;
}
public
void
setAddFriendTime
(
Date
addFriendTime
)
{
this
.
addFriendTime
=
addFriendTime
;
}
public
String
getMemberId
()
{
public
String
getMemberId
()
{
return
memberId
;
return
memberId
;
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ExternalClerkRelatedApiServiceImpl.java
View file @
680abae3
...
@@ -491,7 +491,7 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
...
@@ -491,7 +491,7 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
// key-memberId
// key-memberId
MemberStaffRelExtDO:
:
getMemberId
,
MemberStaffRelExtDO:
:
getMemberId
,
// value-list
// value-list
e
->
new
ArrayList
<>(
Collections
.
singletonList
(
new
ClerkStaffWxUserDTO
(
e
.
getStaffId
(),
e
.
getStaffClerkId
(),
e
.
getMemberExternalUserId
()))),
e
->
new
ArrayList
<>(
Collections
.
singletonList
(
new
ClerkStaffWxUserDTO
(
e
.
getStaffId
(),
e
.
getStaffClerkId
(),
e
.
getMemberExternalUserId
()
,
e
.
getAddFriendTime
()
))),
// 重复key的value添加到集合
// 重复key的value添加到集合
(
List
<
ClerkStaffWxUserDTO
>
oldList
,
List
<
ClerkStaffWxUserDTO
>
newList
)
->
{
(
List
<
ClerkStaffWxUserDTO
>
oldList
,
List
<
ClerkStaffWxUserDTO
>
newList
)
->
{
oldList
.
addAll
(
newList
);
oldList
.
addAll
(
newList
);
...
...
haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml
View file @
680abae3
...
@@ -352,6 +352,7 @@
...
@@ -352,6 +352,7 @@
select * from (
select * from (
select ecr.member_id as memberId,
select ecr.member_id as memberId,
ecr.external_user_id as memberExternalUserId,
ecr.external_user_id as memberExternalUserId,
ecr.create_time as addFriendTime ,
scr.staff_id as staffId,
scr.staff_id as staffId,
scr.clerk_id as staffClerkId
scr.clerk_id as staffClerkId
from tab_haoban_external_clerk_related as ecr
from tab_haoban_external_clerk_related as ecr
...
@@ -373,7 +374,7 @@
...
@@ -373,7 +374,7 @@
<foreach
collection=
"memberIdList"
item=
"item"
separator=
","
open=
"("
close=
")"
>
<foreach
collection=
"memberIdList"
item=
"item"
separator=
","
open=
"("
close=
")"
>
#{item}
#{item}
</foreach>
</foreach>
) t where t.staffId is not null
) t where t.staffId is not null
ORDER BY t.addFriendTime DESC
</select>
</select>
...
...
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