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
f1869650
Commit
f1869650
authored
Aug 17, 2022
by
徐高华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
删除wx_user_id
parent
b2685140
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
12 additions
and
40 deletions
+12
-40
WxUserAddLogQDTO.java
...m/gic/haoban/manage/api/dto/qdto/hm/WxUserAddLogQDTO.java
+0
-9
WxUserAddLogMapper.java
...oban/manage/service/dao/mapper/hm/WxUserAddLogMapper.java
+1
-1
TabWxUserAddLog.java
.../gic/haoban/manage/service/entity/hm/TabWxUserAddLog.java
+0
-10
WxUserAddLogServiceImpl.java
...nage/service/service/hm/impl/WxUserAddLogServiceImpl.java
+9
-11
ExternalClerkRelatedServiceImpl.java
...service/service/impl/ExternalClerkRelatedServiceImpl.java
+0
-1
MemberUnionidRelatedApiServiceImpl.java
.../service/out/impl/MemberUnionidRelatedApiServiceImpl.java
+0
-1
WxUserAddLogMapper.xml
...rvice/src/main/resources/mapper/hm/WxUserAddLogMapper.xml
+2
-7
No files found.
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/hm/WxUserAddLogQDTO.java
View file @
f1869650
...
...
@@ -14,7 +14,6 @@ public class WxUserAddLogQDTO implements Serializable{
private
Long
hmId
;
private
boolean
delFlag
;
private
String
externalUserid
;
private
String
wxUserId
;
private
String
staffId
;
private
String
staffName
;
private
String
clerkId
;
...
...
@@ -51,10 +50,6 @@ public class WxUserAddLogQDTO implements Serializable{
return
externalUserid
;
}
public
String
getWxUserId
()
{
return
wxUserId
;
}
public
String
getStaffId
()
{
return
staffId
;
}
...
...
@@ -95,10 +90,6 @@ public class WxUserAddLogQDTO implements Serializable{
this
.
externalUserid
=
externalUserid
;
}
public
void
setWxUserId
(
String
wxUserId
)
{
this
.
wxUserId
=
wxUserId
;
}
public
void
setStaffId
(
String
staffId
)
{
this
.
staffId
=
staffId
;
}
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/hm/WxUserAddLogMapper.java
View file @
f1869650
...
...
@@ -50,7 +50,7 @@ public interface WxUserAddLogMapper {
* @throws
*/
public
TabWxUserAddLog
selectNewLog
(
@Param
(
"externalUserid"
)
String
externalUserid
,
@Param
(
"
wxUserId"
)
String
wxUser
Id
);
@Param
(
"
staffId"
)
String
staff
Id
);
/**
*
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/hm/TabWxUserAddLog.java
View file @
f1869650
...
...
@@ -23,8 +23,6 @@ public class TabWxUserAddLog implements Serializable {
/**成员信息*/
private
String
staffId
;
private
String
staffName
;
/**企微ID*/
private
String
wxUserId
;
/**1添加 2删除*/
private
Integer
statusFlag
;
/**0其他场景1引流链接2活码*/
...
...
@@ -109,14 +107,6 @@ public class TabWxUserAddLog implements Serializable {
return
staffName
;
}
public
void
setWxUserId
(
String
wxUserId
)
{
this
.
wxUserId
=
wxUserId
;
}
public
String
getWxUserId
()
{
return
wxUserId
;
}
public
void
setStatusFlag
(
Integer
statusFlag
)
{
this
.
statusFlag
=
statusFlag
;
}
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/WxUserAddLogServiceImpl.java
View file @
f1869650
...
...
@@ -55,7 +55,6 @@ public class WxUserAddLogServiceImpl implements WxUserAddLogService {
try
{
log
.
info
(
"保存用户信息-add={}"
,
JSON
.
toJSON
(
qdto
));
String
externalUserid
=
qdto
.
getExternalUserid
();
String
wxUserId
=
qdto
.
getWxUserId
();
TabWxUserAddLog
entity
=
new
TabWxUserAddLog
();
entity
.
setLogId
(
UniqueIdUtils
.
uniqueLong
());
entity
.
setWxEnterpriseId
(
qdto
.
getWxEnterpriseId
());
...
...
@@ -63,12 +62,11 @@ public class WxUserAddLogServiceImpl implements WxUserAddLogService {
entity
.
setExternalUserid
(
externalUserid
);
entity
.
setAddChannel
(
0
);
entity
.
setStatusFlag
(
1
);
entity
.
setWxUserId
(
qdto
.
getWxUserId
());
entity
.
setStaffId
(
qdto
.
getStaffId
());
entity
.
setStaffName
(
qdto
.
getStaffName
());
entity
.
setAllDelFlag
(
0
);
if
(
qdto
.
isDelFlag
())
{
TabWxUserAddLog
logUser
=
this
.
wxUserAddLogMapper
.
selectNewLog
(
externalUserid
,
wxUserId
);
TabWxUserAddLog
logUser
=
this
.
wxUserAddLogMapper
.
selectNewLog
(
externalUserid
,
qdto
.
getStaffId
()
);
if
(
null
==
logUser
)
{
log
.
info
(
"删除好友"
)
;
return
;
...
...
@@ -179,26 +177,26 @@ public class WxUserAddLogServiceImpl implements WxUserAddLogService {
private
int
isAllDel
(
String
externalUserid
)
{
List
<
TabWxUserAddLog
>
list
=
this
.
wxUserAddLogMapper
.
listAllForDel
(
externalUserid
);
Map
<
String
,
List
<
TabWxUserAddLog
>>
map
=
list
.
stream
()
.
collect
(
Collectors
.
groupingBy
(
TabWxUserAddLog:
:
get
WxUser
Id
));
.
collect
(
Collectors
.
groupingBy
(
TabWxUserAddLog:
:
get
Staff
Id
));
Set
<
String
>
set
=
map
.
keySet
();
Iterator
<
String
>
it
=
set
.
iterator
();
boolean
exist
=
false
;
while
(
it
.
hasNext
())
{
String
wxUser
Id
=
it
.
next
();
List
<
TabWxUserAddLog
>
itemList
=
map
.
get
(
wxUser
Id
);
String
staff
Id
=
it
.
next
();
List
<
TabWxUserAddLog
>
itemList
=
map
.
get
(
staff
Id
);
if
(
itemList
.
size
()
==
1
&&
itemList
.
get
(
0
).
getStatusFlag
()
==
2
)
{
log
.
info
(
"成员={}只有1条删除的记录"
,
wxUser
Id
);
log
.
info
(
"成员={}只有1条删除的记录"
,
staff
Id
);
}
else
{
TabWxUserAddLog
addLog
=
itemList
.
get
(
0
);
if
(
addLog
.
getStatusFlag
()
==
1
)
{
log
.
info
(
"成员={}最新是添加记录"
,
wxUser
Id
);
if
(
addLog
.
get
WxUserId
().
equals
(
wxUser
Id
))
{
log
.
info
(
"成员={}本次删除"
,
wxUser
Id
);
log
.
info
(
"成员={}最新是添加记录"
,
staff
Id
);
if
(
addLog
.
get
StaffId
().
equals
(
staff
Id
))
{
log
.
info
(
"成员={}本次删除"
,
staff
Id
);
}
else
{
exist
=
true
;
}
}
else
{
log
.
info
(
"成员={}最新是删除记录"
,
wxUser
Id
);
log
.
info
(
"成员={}最新是删除记录"
,
staff
Id
);
}
}
}
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/ExternalClerkRelatedServiceImpl.java
View file @
f1869650
...
...
@@ -126,7 +126,6 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
wxUserAddLogQDTO
.
setUnionid
(
related
.
getUnionid
());
wxUserAddLogQDTO
.
setDelFlag
(
true
);
wxUserAddLogQDTO
.
setExternalUserid
(
related
.
getExternalUserId
());
wxUserAddLogQDTO
.
setWxUserId
(
related
.
getWxUserId
());
wxUserAddLogQDTO
.
setStaffId
(
related
.
getStaffId
());
wxUserAddLogQDTO
.
setClerkId
(
related
.
getClerkId
());
wxUserAddLogService
.
save
(
wxUserAddLogQDTO
);
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java
View file @
f1869650
...
...
@@ -464,7 +464,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
wxUserAddLogQDTO
.
setUnionid
(
unionid
);
wxUserAddLogQDTO
.
setDelFlag
(
false
);
wxUserAddLogQDTO
.
setExternalUserid
(
externalUserId
);
wxUserAddLogQDTO
.
setWxUserId
(
wxUserId
);
wxUserAddLogQDTO
.
setStaffId
(
staffId
);
wxUserAddLogQDTO
.
setStaffName
(
staffName
);
wxUserAddLogQDTO
.
setClerkId
(
staffClerkRelationDTO
.
getClerkId
());
...
...
haoban-manage3-service/src/main/resources/mapper/hm/WxUserAddLogMapper.xml
View file @
f1869650
...
...
@@ -9,7 +9,6 @@
<result
column=
"external_userid"
property=
"externalUserid"
/>
<result
column=
"staff_id"
property=
"staffId"
/>
<result
column=
"staff_name"
property=
"staffName"
/>
<result
column=
"wx_user_id"
property=
"wxUserId"
/>
<result
column=
"status_flag"
property=
"statusFlag"
/>
<result
column=
"add_channel"
property=
"addChannel"
/>
<result
column=
"hm_id"
property=
"hmId"
/>
...
...
@@ -37,14 +36,12 @@
<result
column=
"all_del_flag"
property=
"allDelFlag"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
log_id
,
log_id ,
wx_enterprise_id,
enterprise_id,
external_userid,
staff_id,
staff_name,
wx_user_id,
status_flag,
add_channel,
hm_id,
...
...
@@ -81,7 +78,6 @@
external_userid,
staff_id,
staff_name,
wx_user_id,
status_flag,
add_channel,
hm_id,
...
...
@@ -114,7 +110,6 @@
#{externalUserid,jdbcType=VARCHAR},
#{staffId,jdbcType=VARCHAR},
#{staffName,jdbcType=VARCHAR},
#{wxUserId,jdbcType=VARCHAR},
#{statusFlag,jdbcType=INTEGER},
#{addChannel,jdbcType=INTEGER},
#{hmId,jdbcType=BIGINT},
...
...
@@ -177,7 +172,7 @@
select
<include
refid=
"Base_Column_List"
/>
from tab_haoban_wx_user_add_log where
external_userid=#{externalUserid} and
wx_user_id =#{wxUser
Id} and
external_userid=#{externalUserid} and
staff_id =#{staff
Id} and
status_flag != 0 order by create_time desc limit 1
</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