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
7391638a
Commit
7391638a
authored
Mar 22, 2021
by
fudahua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
刷新 好友
parent
d665d207
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
124 additions
and
32 deletions
+124
-32
SyncTaskTypeEnum.java
...ava/com/gic/haoban/manage/api/enums/SyncTaskTypeEnum.java
+43
-0
DealSyncOperationApiService.java
...aoban/manage/api/service/DealSyncOperationApiService.java
+10
-2
TabHaobanStaffClerkRelationMapper.java
...service/dao/mapper/TabHaobanStaffClerkRelationMapper.java
+3
-0
StaffClerkRelationService.java
...ban/manage/service/service/StaffClerkRelationService.java
+9
-0
StaffClerkRelationServiceImpl.java
...e/service/service/impl/StaffClerkRelationServiceImpl.java
+6
-0
DealSyncOperationApiServiceImpl.java
...ice/service/out/impl/DealSyncOperationApiServiceImpl.java
+26
-8
TabHaobanStaffClerkRelationMapper.xml
...in/resources/mapper/TabHaobanStaffClerkRelationMapper.xml
+9
-1
ClerkController.java
...com/gic/haoban/manage/web/controller/ClerkController.java
+18
-21
No files found.
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/SyncTaskTypeEnum.java
0 → 100644
View file @
7391638a
package
com
.
gic
.
haoban
.
manage
.
api
.
enums
;
/**
* Created by hua on 2021/3/22.
*/
public
enum
SyncTaskTypeEnum
{
QYWX_CONTACT
(
1
,
"后门同步企业微信架构"
),
FRIEND_SINGLE
(
4
,
"单个成员刷新好友"
),
FRIEND_STORE
(
5
,
"刷新门店好友"
),;
private
int
type
;
private
String
taskName
;
SyncTaskTypeEnum
(
int
type
,
String
taskName
)
{
this
.
type
=
type
;
this
.
taskName
=
taskName
;
}
public
int
getType
()
{
return
type
;
}
public
void
setType
(
int
type
)
{
this
.
type
=
type
;
}
public
String
getTaskName
()
{
return
taskName
;
}
public
void
setTaskName
(
String
taskName
)
{
this
.
taskName
=
taskName
;
}
public
static
String
getTaskName
(
int
taskType
)
{
SyncTaskTypeEnum
[]
values
=
SyncTaskTypeEnum
.
values
();
for
(
SyncTaskTypeEnum
value
:
values
)
{
if
(
value
.
getType
()
==
taskType
)
{
return
value
.
getTaskName
();
}
}
return
null
;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/DealSyncOperationApiService.java
View file @
7391638a
...
...
@@ -137,10 +137,9 @@ public interface DealSyncOperationApiService {
* @param wxEnterpriseId
* @param taskName
* @param staffId
* @param desc
* @return
*/
public
String
createWxFriendSingleTask
(
String
wxEnterpriseId
,
String
taskName
,
String
staffId
,
String
staffNam
e
);
public
String
createWxFriendTaskSingle
(
String
wxEnterpriseId
,
String
taskName
,
String
staffId
,
String
staffName
,
int
syncTaskTyp
e
);
/**
* 单个导购刷新
...
...
@@ -150,6 +149,15 @@ public interface DealSyncOperationApiService {
* @param wxEnterpriseId
*/
public
void
dealWxFriendClerkSingle
(
String
taskId
,
String
wxUserId
,
String
staffId
,
String
wxEnterpriseId
);
/**
* 单个导购刷新
*
* @param taskId
* @param wxEnterpriseId
*/
public
void
dealWxFriendStore
(
String
taskId
,
String
storeId
,
String
wxEnterpriseId
);
/**
* 定时
* @param res
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanStaffClerkRelationMapper.java
View file @
7391638a
...
...
@@ -87,4 +87,6 @@ public interface TabHaobanStaffClerkRelationMapper {
List
<
TabHaobanStaffClerkRelation
>
listByWxEnterpriseId
(
@Param
(
"wxEnterpriseId"
)
String
wxEnterpriseId
);
List
<
TabHaobanStaffClerkRelation
>
pageByWxEnterpriseId
(
@Param
(
"wxEnterpriseId"
)
String
wxEnterpriseId
);
List
<
TabHaobanStaffClerkRelation
>
listOneBindByStoreId
(
@Param
(
"wxEnterpriseId"
)
String
wxEnterpriseId
,
@Param
(
"storeId"
)
String
storeId
);
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/StaffClerkRelationService.java
View file @
7391638a
...
...
@@ -85,5 +85,14 @@ public interface StaffClerkRelationService {
Page
<
StaffClerkRelationDTO
>
pageByWxEnterpriseId
(
String
wxEnterpriseId
,
BasePageInfo
pageInfo
);
/**
* 根据门店获取门店的绑定列表
*
* @param wxEnterpriseId
* @param storeId
* @return
*/
List
<
StaffClerkRelationDTO
>
listBindByStoreId
(
String
wxEnterpriseId
,
String
storeId
);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffClerkRelationServiceImpl.java
View file @
7391638a
...
...
@@ -245,4 +245,10 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
Page
<
StaffClerkRelationDTO
>
retPage
=
PageUtil
.
changePageHelperToCurrentPage
(
new
PageInfo
<>(
clerkBindList
),
StaffClerkRelationDTO
.
class
);
return
retPage
;
}
@Override
public
List
<
StaffClerkRelationDTO
>
listBindByStoreId
(
String
wxEnterpriseId
,
String
storeId
)
{
List
<
TabHaobanStaffClerkRelation
>
ret
=
mapper
.
listByStoreId
(
storeId
);
return
EntityUtil
.
changeEntityListNew
(
StaffClerkRelationDTO
.
class
,
ret
);
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DealSyncOperationApiServiceImpl.java
View file @
7391638a
...
...
@@ -17,10 +17,7 @@ import com.gic.haoban.base.api.common.ServiceResponse;
import
com.gic.haoban.common.utils.EntityUtil
;
import
com.gic.haoban.common.utils.PageUtil
;
import
com.gic.haoban.manage.api.dto.*
;
import
com.gic.haoban.manage.api.enums.PreDealStatusEnum
;
import
com.gic.haoban.manage.api.enums.PreDealTypeEnum
;
import
com.gic.haoban.manage.api.enums.SecretTypeEnum
;
import
com.gic.haoban.manage.api.enums.SyncTaskStatusEnum
;
import
com.gic.haoban.manage.api.enums.*
;
import
com.gic.haoban.manage.api.service.ClerkMainStoreRelatedApiService
;
import
com.gic.haoban.manage.api.service.DealSyncOperationApiService
;
import
com.gic.haoban.manage.api.service.DepartmentApiService
;
...
...
@@ -263,7 +260,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
@Override
public
String
createQywxTask
(
String
wxEnterpriseId
,
String
taskName
,
String
userId
,
String
desc
)
{
return
createBaseTask
(
wxEnterpriseId
,
taskName
,
userId
,
desc
,
1
);
return
createBaseTask
(
wxEnterpriseId
,
taskName
,
userId
,
desc
,
SyncTaskTypeEnum
.
QYWX_CONTACT
.
getType
()
);
}
...
...
@@ -694,15 +691,15 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
}
@Override
public
String
createWxFriendSingleTask
(
String
wxEnterpriseId
,
String
taskName
,
String
staffId
,
String
staffNam
e
)
{
public
String
createWxFriendTaskSingle
(
String
wxEnterpriseId
,
String
taskName
,
String
staffId
,
String
staffName
,
int
syncTaskTyp
e
)
{
TabHaobanSyncTask
tabHaobanSyncTask
=
new
TabHaobanSyncTask
();
tabHaobanSyncTask
.
setAddUser
(
staffId
);
tabHaobanSyncTask
.
setTaskName
(
taskName
);
tabHaobanSyncTask
.
setTaskName
(
SyncTaskTypeEnum
.
getTaskName
(
syncTaskType
)
);
tabHaobanSyncTask
.
setTaskDesc
(
staffName
);
tabHaobanSyncTask
.
setWxEnterpriseId
(
wxEnterpriseId
);
tabHaobanSyncTask
.
setStatusFlag
(
SyncTaskStatusEnum
.
init
.
getVal
());
tabHaobanSyncTask
.
setTaskId
(
ToolUtil
.
randomUUID
());
tabHaobanSyncTask
.
setTaskType
(
4
);
tabHaobanSyncTask
.
setTaskType
(
syncTaskType
);
syncTaskService
.
createTask
(
tabHaobanSyncTask
);
return
tabHaobanSyncTask
.
getTaskId
();
...
...
@@ -726,6 +723,27 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
dealDepartmentToMq
(
taskId
,
hashSet
,
SyncTaskStatusEnum
.
friend_clerk_sync
);
}
@Override
public
void
dealWxFriendStore
(
String
taskId
,
String
storeId
,
String
wxEnterpriseId
)
{
List
<
StaffClerkRelationDTO
>
clerkRelationDTOS
=
staffClerkRelationService
.
listBindByStoreId
(
wxEnterpriseId
,
storeId
);
if
(
CollectionUtils
.
isEmpty
(
clerkRelationDTOS
))
{
logger
.
info
(
"没有要刷新的:{},{}"
,
wxEnterpriseId
,
storeId
);
return
;
}
List
<
TabHaobanPreDealLog
>
dealLogList
=
clerkRelationDTOS
.
stream
().
map
(
dto
->
{
TabHaobanPreDealLog
dealLog
=
new
TabHaobanPreDealLog
();
dealLog
.
setDataId
(
dto
.
getWxUserId
());
dealLog
.
setpDataId
(
dto
.
getStaffId
());
dealLog
.
setDataType
(
PreDealTypeEnum
.
friend_clerk
.
getVal
());
dealLog
.
setStatusFlag
(
0
);
dealLog
.
setTaskId
(
taskId
);
dealLog
.
setWxEnterpriseId
(
wxEnterpriseId
);
return
dealLog
;
}).
collect
(
Collectors
.
toList
());
preDealService
.
insert
(
dealLogList
);
Set
<
String
>
hashSet
=
dealLogList
.
stream
().
map
(
TabHaobanPreDealLog:
:
getDataId
).
collect
(
Collectors
.
toSet
());
dealDepartmentToMq
(
taskId
,
hashSet
,
SyncTaskStatusEnum
.
friend_clerk_sync
);
}
@Override
public
void
quartWxFriendClerk
(
String
res
)
{
...
...
haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml
View file @
7391638a
...
...
@@ -375,5 +375,12 @@
where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
and status_flag =1
</select>
<select
id=
"listOneBindByStoreId"
resultMap=
"BaseResultMap"
>
select
<include
refid=
"Base_Column_List"
/>
from tab_haoban_staff_clerk_relation
where wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
and store_id=#{storeId}
and status_flag =1
</select>
</mapper>
\ No newline at end of file
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
View file @
7391638a
...
...
@@ -9,7 +9,6 @@ import com.gic.clerk.api.service.ClerkNewService;
import
com.gic.clerk.api.service.ClerkService
;
import
com.gic.commons.util.DateUtil
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.commons.util.GICMQClientUtil
;
import
com.gic.enterprise.api.dto.EnterpriseDTO
;
import
com.gic.enterprise.api.dto.StoreDTO
;
import
com.gic.enterprise.api.service.EnterpriseService
;
...
...
@@ -23,11 +22,9 @@ import com.gic.haoban.manage.api.enums.*;
import
com.gic.haoban.manage.api.service.*
;
import
com.gic.haoban.manage.web.anno.HttpLimit
;
import
com.gic.haoban.manage.web.errCode.HaoBanErrCode
;
import
com.gic.haoban.manage.web.utils.RouterConstant
;
import
com.gic.haoban.manage.web.vo.*
;
import
com.gic.redis.data.util.RedisUtil
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.ibatis.annotations.Param
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -393,31 +390,31 @@ public class ClerkController extends WebBaseController{
}
String
key
=
"haoban_fresh_wx_friend"
+
yyyyMM
+
staffId
;
Integer
count
=
RedisUtil
.
getCache
(
key
)
==
null
?
0
:
(
Integer
)
RedisUtil
.
getCache
(
key
);
if
(
count
==
null
||
count
<
4
)
{
RedisUtil
.
setCache
(
key
,
count
+
1
,
31
*
24
*
60
*
60
l
);
JSONObject
json
=
new
JSONObject
(
);
json
.
put
(
"wxUserId"
,
staff
.
getWxUserId
());
json
.
put
(
"wxEnterpriseId"
,
wxEnterpriseId
);
json
.
put
(
"storeId"
,
storeId
);
// logger.info("【刷下微信好友】{},{},{}",RouterConstant.FRESH_WX_FRIEND_SERVICENAME,RouterConstant.INIT_FRESH_WX_FRIEND_METHODNAME,json.toJSONString());
if
(
count
!=
null
&&
count
>=
4
)
{
logger
.
info
(
"次数超出限制:{}"
,
staffId
);
return
resultResponse
(
HaoBanErrCode
.
ERR_10011
);
}
RedisUtil
.
setCache
(
key
,
count
+
1
,
31
*
24
*
60
*
60L
);
if
(
flushType
==
0
)
{
String
taskName
=
"刷新企业微信好友("
+
staff
.
getStaffName
()+
")"
;
String
taskId
=
dealSyncOperationApiService
.
createWxFriend
SingleTask
(
wxEnterpriseId
,
taskName
,
staffId
,
staff
.
getStaffNam
e
());
String
taskId
=
dealSyncOperationApiService
.
createWxFriend
TaskSingle
(
wxEnterpriseId
,
taskName
,
staffId
,
staff
.
getStaffName
(),
SyncTaskTypeEnum
.
FRIEND_SINGLE
.
getTyp
e
());
if
(
StringUtils
.
isNotBlank
(
taskId
)){
dealSyncOperationApiService
.
dealWxFriendClerkSingle
(
taskId
,
wxUserId
,
staffId
,
wxEnterpriseId
);
}
else
{
return
resultResponse
(
HaoBanErrCode
.
ERR_999
);
}
// try {
// GICMQClientUtil.getClientInstance().sendCommonMessage(RouterConstant.ROUTERTYPE, json.toJSONString(),
// RouterConstant.FRESH_WX_FRIEND_SERVICENAME, RouterConstant.INIT_FRESH_WX_FRIEND_METHODNAME);
// } catch (Exception e) {
// logger.info(e.getMessage(),e);
// }
// memberUnionidRelatedApiService.freshWxFrend(wxEnterpriseId, staff.getWxUserId(),storeId);
}
else
{
return
resultResponse
(
HaoBanErrCode
.
ERR_10011
);
}
else
{
String
taskName
=
"刷新门店好友"
;
String
taskId
=
dealSyncOperationApiService
.
createWxFriendTaskSingle
(
wxEnterpriseId
,
taskName
,
staffId
,
staff
.
getStaffName
(),
SyncTaskTypeEnum
.
FRIEND_STORE
.
getType
());
if
(
StringUtils
.
isNotBlank
(
taskId
))
{
dealSyncOperationApiService
.
dealWxFriendStore
(
taskId
,
storeId
,
wxEnterpriseId
);
}
else
{
return
resultResponse
(
HaoBanErrCode
.
ERR_999
);
}
}
return
resultResponse
(
HaoBanErrCode
.
ERR_1
);
}
...
...
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