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
cc6f74aa
Commit
cc6f74aa
authored
May 27, 2020
by
qwmqiuwenmin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
090f93e9
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
489 additions
and
0 deletions
+489
-0
StaffClerkRelationDTO.java
.../com/gic/haoban/manage/api/dto/StaffClerkRelationDTO.java
+121
-0
AuditApiService.java
...va/com/gic/haoban/manage/api/service/AuditApiService.java
+2
-0
StaffClerkRelationApiService.java
...oban/manage/api/service/StaffClerkRelationApiService.java
+12
-0
TabHaobanStaffClerkRelationMapper.java
...service/dao/mapper/TabHaobanStaffClerkRelationMapper.java
+8
-0
StaffClerkRelationService.java
...ban/manage/service/service/StaffClerkRelationService.java
+12
-0
StaffClerkRelationServiceImpl.java
...e/service/service/impl/StaffClerkRelationServiceImpl.java
+24
-0
AuditApiServiceImpl.java
.../manage/service/service/out/impl/AuditApiServiceImpl.java
+8
-0
StaffClerkRelationApiServiceImpl.java
...ce/service/out/impl/StaffClerkRelationApiServiceImpl.java
+23
-0
dubbo-haoban-manage-service.xml
...ervice/src/main/resources/dubbo-haoban-manage-service.xml
+1
-0
TabHaobanStaffClerkRelationMapper.xml
...in/resources/mapper/TabHaobanStaffClerkRelationMapper.xml
+12
-0
ClerkController.java
...com/gic/haoban/manage/web/controller/ClerkController.java
+202
-0
HaoBanErrCode.java
...java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java
+2
-0
BindClerkVO.java
...c/main/java/com/gic/haoban/manage/web/vo/BindClerkVO.java
+60
-0
dubbo-haoban-manage-wx.xml
...ge3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml
+2
-0
No files found.
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffClerkRelationDTO.java
0 → 100644
View file @
cc6f74aa
package
com
.
gic
.
haoban
.
manage
.
api
.
dto
;
import
java.io.Serializable
;
import
java.util.Date
;
public
class
StaffClerkRelationDTO
implements
Serializable
{
private
String
staffClerkRelationId
;
private
String
staffId
;
private
String
wxEnterpriseId
;
private
String
wxUserId
;
private
String
enterpriseId
;
private
String
storeId
;
private
String
clerkId
;
private
String
clerkCode
;
private
Integer
statusFlag
;
private
Date
createTime
;
private
Date
updateTime
;
private
static
final
long
serialVersionUID
=
1L
;
public
String
getStaffClerkRelationId
()
{
return
staffClerkRelationId
;
}
public
void
setStaffClerkRelationId
(
String
staffClerkRelationId
)
{
this
.
staffClerkRelationId
=
staffClerkRelationId
==
null
?
null
:
staffClerkRelationId
.
trim
();
}
public
String
getStaffId
()
{
return
staffId
;
}
public
void
setStaffId
(
String
staffId
)
{
this
.
staffId
=
staffId
==
null
?
null
:
staffId
.
trim
();
}
public
String
getWxEnterpriseId
()
{
return
wxEnterpriseId
;
}
public
void
setWxEnterpriseId
(
String
wxEnterpriseId
)
{
this
.
wxEnterpriseId
=
wxEnterpriseId
==
null
?
null
:
wxEnterpriseId
.
trim
();
}
public
String
getWxUserId
()
{
return
wxUserId
;
}
public
void
setWxUserId
(
String
wxUserId
)
{
this
.
wxUserId
=
wxUserId
==
null
?
null
:
wxUserId
.
trim
();
}
public
String
getEnterpriseId
()
{
return
enterpriseId
;
}
public
void
setEnterpriseId
(
String
enterpriseId
)
{
this
.
enterpriseId
=
enterpriseId
==
null
?
null
:
enterpriseId
.
trim
();
}
public
String
getStoreId
()
{
return
storeId
;
}
public
void
setStoreId
(
String
storeId
)
{
this
.
storeId
=
storeId
==
null
?
null
:
storeId
.
trim
();
}
public
String
getClerkId
()
{
return
clerkId
;
}
public
void
setClerkId
(
String
clerkId
)
{
this
.
clerkId
=
clerkId
==
null
?
null
:
clerkId
.
trim
();
}
public
String
getClerkCode
()
{
return
clerkCode
;
}
public
void
setClerkCode
(
String
clerkCode
)
{
this
.
clerkCode
=
clerkCode
==
null
?
null
:
clerkCode
.
trim
();
}
public
Integer
getStatusFlag
()
{
return
statusFlag
;
}
public
void
setStatusFlag
(
Integer
statusFlag
)
{
this
.
statusFlag
=
statusFlag
;
}
public
Date
getCreateTime
()
{
return
createTime
;
}
public
void
setCreateTime
(
Date
createTime
)
{
this
.
createTime
=
createTime
;
}
public
Date
getUpdateTime
()
{
return
updateTime
;
}
public
void
setUpdateTime
(
Date
updateTime
)
{
this
.
updateTime
=
updateTime
;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/AuditApiService.java
View file @
cc6f74aa
...
@@ -25,4 +25,6 @@ public interface AuditApiService {
...
@@ -25,4 +25,6 @@ public interface AuditApiService {
List
<
AuditDTO
>
listByStoreId
(
String
storeId
);
List
<
AuditDTO
>
listByStoreId
(
String
storeId
);
AuditDTO
findByStoreIdAndChangeField
(
String
storeId
,
String
changeField
);
AuditDTO
findByStoreIdAndChangeField
(
String
storeId
,
String
changeField
);
void
insert
(
AuditDTO
audit
);
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffClerkRelationApiService.java
0 → 100644
View file @
cc6f74aa
package
com
.
gic
.
haoban
.
manage
.
api
.
service
;
import
java.util.List
;
import
java.util.Set
;
import
com.gic.haoban.manage.api.dto.StaffClerkRelationDTO
;
public
interface
StaffClerkRelationApiService
{
List
<
StaffClerkRelationDTO
>
listBindCode
(
String
enterpriseId
,
Set
<
String
>
clerkCodeList
);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanStaffClerkRelationMapper.java
View file @
cc6f74aa
package
com
.
gic
.
haoban
.
manage
.
service
.
dao
.
mapper
;
package
com
.
gic
.
haoban
.
manage
.
service
.
dao
.
mapper
;
import
java.util.List
;
import
java.util.Set
;
import
org.apache.ibatis.annotations.Param
;
import
com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation
;
import
com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation
;
public
interface
TabHaobanStaffClerkRelationMapper
{
public
interface
TabHaobanStaffClerkRelationMapper
{
...
@@ -14,4 +19,6 @@ public interface TabHaobanStaffClerkRelationMapper {
...
@@ -14,4 +19,6 @@ public interface TabHaobanStaffClerkRelationMapper {
int
updateByPrimaryKeySelective
(
TabHaobanStaffClerkRelation
record
);
int
updateByPrimaryKeySelective
(
TabHaobanStaffClerkRelation
record
);
int
updateByPrimaryKey
(
TabHaobanStaffClerkRelation
record
);
int
updateByPrimaryKey
(
TabHaobanStaffClerkRelation
record
);
List
<
TabHaobanStaffClerkRelation
>
listBindCode
(
@Param
(
"enterpriseId"
)
String
enterpriseId
,
@Param
(
"clerkCodeList"
)
Set
<
String
>
clerkCodeList
);
}
}
\ No newline at end of file
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/StaffClerkRelationService.java
0 → 100644
View file @
cc6f74aa
package
com
.
gic
.
haoban
.
manage
.
service
.
service
;
import
java.util.List
;
import
java.util.Set
;
import
com.gic.haoban.manage.api.dto.StaffClerkRelationDTO
;
public
interface
StaffClerkRelationService
{
List
<
StaffClerkRelationDTO
>
listBindCode
(
String
enterpriseId
,
Set
<
String
>
clerkCodeList
);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffClerkRelationServiceImpl.java
0 → 100644
View file @
cc6f74aa
package
com
.
gic
.
haoban
.
manage
.
service
.
service
.
impl
;
import
java.util.List
;
import
java.util.Set
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.haoban.manage.api.dto.StaffClerkRelationDTO
;
import
com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper
;
import
com.gic.haoban.manage.service.service.StaffClerkRelationService
;
@Service
public
class
StaffClerkRelationServiceImpl
implements
StaffClerkRelationService
{
@Autowired
private
TabHaobanStaffClerkRelationMapper
mapper
;
@Override
public
List
<
StaffClerkRelationDTO
>
listBindCode
(
String
enterpriseId
,
Set
<
String
>
clerkCodeList
)
{
return
EntityUtil
.
changeEntityListByJSON
(
StaffClerkRelationDTO
.
class
,
mapper
.
listBindCode
(
enterpriseId
,
clerkCodeList
));
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/AuditApiServiceImpl.java
View file @
cc6f74aa
...
@@ -22,6 +22,7 @@ import cn.hutool.core.collection.CollectionUtil;
...
@@ -22,6 +22,7 @@ import cn.hutool.core.collection.CollectionUtil;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.gic.api.base.commons.Page
;
import
com.gic.api.base.commons.Page
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.commons.util.StringUtil
;
import
com.gic.enterprise.api.dto.StoreDTO
;
import
com.gic.enterprise.api.dto.StoreDTO
;
import
com.gic.enterprise.api.dto.StoreDetailDTO
;
import
com.gic.enterprise.api.dto.StoreDetailDTO
;
import
com.gic.enterprise.api.dto.StorePhotoDTO
;
import
com.gic.enterprise.api.dto.StorePhotoDTO
;
...
@@ -325,4 +326,11 @@ public class AuditApiServiceImpl implements AuditApiService{
...
@@ -325,4 +326,11 @@ public class AuditApiServiceImpl implements AuditApiService{
boolean
b
=
qywxSuiteApiService
.
sendMessage
(
corpId
,
config
.
getWxSuiteid
(),
messageDTO
);
boolean
b
=
qywxSuiteApiService
.
sendMessage
(
corpId
,
config
.
getWxSuiteid
(),
messageDTO
);
}
}
@Override
public
void
insert
(
AuditDTO
audit
)
{
audit
.
setAuditId
(
com
.
gic
.
haoban
.
common
.
utils
.
StringUtil
.
randomUUID
());
audit
.
setCreateTime
(
new
Date
());
audit
.
setUpdateTime
(
new
Date
());
auditMapper
.
insertSelective
(
EntityUtil
.
changeEntityByJSON
(
TabHaobanAudit
.
class
,
audit
));
}
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffClerkRelationApiServiceImpl.java
0 → 100644
View file @
cc6f74aa
package
com
.
gic
.
haoban
.
manage
.
service
.
service
.
out
.
impl
;
import
java.util.List
;
import
java.util.Set
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
com.gic.haoban.manage.api.dto.StaffClerkRelationDTO
;
import
com.gic.haoban.manage.api.service.StaffClerkRelationApiService
;
import
com.gic.haoban.manage.service.service.StaffClerkRelationService
;
@Service
public
class
StaffClerkRelationApiServiceImpl
implements
StaffClerkRelationApiService
{
@Autowired
private
StaffClerkRelationService
staffClerkRelatinService
;
@Override
public
List
<
StaffClerkRelationDTO
>
listBindCode
(
String
enterpriseId
,
Set
<
String
>
clerkCodeList
)
{
return
staffClerkRelatinService
.
listBindCode
(
enterpriseId
,
clerkCodeList
);
}
}
haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml
View file @
cc6f74aa
...
@@ -43,6 +43,7 @@
...
@@ -43,6 +43,7 @@
<dubbo:service
interface=
"com.gic.haoban.manage.api.service.MaidianDictApiService"
ref=
"maidianDictApiServiceImpl"
timeout=
"10000"
/>
<dubbo:service
interface=
"com.gic.haoban.manage.api.service.MaidianDictApiService"
ref=
"maidianDictApiServiceImpl"
timeout=
"10000"
/>
<dubbo:service
interface=
"com.gic.haoban.manage.api.service.MaterialApiService"
ref=
"materialApiServiceImpl"
timeout=
"10000"
/>
<dubbo:service
interface=
"com.gic.haoban.manage.api.service.MaterialApiService"
ref=
"materialApiServiceImpl"
timeout=
"10000"
/>
<dubbo:service
interface=
"com.gic.haoban.manage.api.service.StaffClerkRelationApiService"
ref=
"staffClerkRelationApiServiceImpl"
timeout=
"10000"
/>
<dubbo:service
interface=
"com.gic.haoban.manage.api.service.DealSyncOperationApiService"
<dubbo:service
interface=
"com.gic.haoban.manage.api.service.DealSyncOperationApiService"
ref=
"dealSyncOperationApiServiceImpl"
timeout=
"10000"
/>
ref=
"dealSyncOperationApiServiceImpl"
timeout=
"10000"
/>
...
...
haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml
View file @
cc6f74aa
...
@@ -161,4 +161,15 @@
...
@@ -161,4 +161,15 @@
update_time = #{updateTime,jdbcType=TIMESTAMP}
update_time = #{updateTime,jdbcType=TIMESTAMP}
where staff_clerk_relation_id = #{staffClerkRelationId,jdbcType=VARCHAR}
where staff_clerk_relation_id = #{staffClerkRelationId,jdbcType=VARCHAR}
</update>
</update>
<select
id=
"listBindCode"
resultMap=
"BaseResultMap"
parameterType=
"java.lang.String"
>
select
<include
refid=
"Base_Column_List"
/>
from tab_haoban_staff_clerk_relation
where enterprise_id = #{enterpriseId,jdbcType=VARCHAR}
and status_flag = 1
and clerk_code in
<foreach
collection=
"clerkCodeList"
item=
"id"
index=
"index"
open=
"("
close=
")"
separator=
","
>
#{id,jdbcType=VARCHAR}
</foreach>
</select>
</mapper>
</mapper>
\ No newline at end of file
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
View file @
cc6f74aa
...
@@ -4,6 +4,7 @@ import java.util.ArrayList;
...
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.Set
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
...
@@ -19,31 +20,42 @@ import com.alibaba.fastjson.JSON;
...
@@ -19,31 +20,42 @@ import com.alibaba.fastjson.JSON;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.gic.clerk.api.dto.ClerkDTO
;
import
com.gic.clerk.api.dto.ClerkDTO
;
import
com.gic.clerk.api.dto.ClerkListDTO
;
import
com.gic.clerk.api.service.ClerkService
;
import
com.gic.clerk.api.service.ClerkService
;
import
com.gic.commons.util.DateUtil
;
import
com.gic.commons.util.DateUtil
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.enterprise.api.dto.EnterpriseDTO
;
import
com.gic.enterprise.api.dto.StoreDTO
;
import
com.gic.enterprise.api.dto.StoreDTO
;
import
com.gic.enterprise.api.service.EnterpriseService
;
import
com.gic.enterprise.api.service.StoreService
;
import
com.gic.enterprise.api.service.StoreService
;
import
com.gic.haoban.app.customer.service.api.service.DistributeApiService
;
import
com.gic.haoban.app.customer.service.api.service.DistributeApiService
;
import
com.gic.haoban.base.api.common.ShowFrontMessageException
;
import
com.gic.haoban.base.api.common.ShowFrontMessageException
;
import
com.gic.haoban.common.utils.GooglePhoneNumberUtil
;
import
com.gic.haoban.common.utils.GooglePhoneNumberUtil
;
import
com.gic.haoban.common.utils.HaobanResponse
;
import
com.gic.haoban.common.utils.HaobanResponse
;
import
com.gic.haoban.communicate.api.service.SyncHaobanToGicServiceApi
;
import
com.gic.haoban.communicate.api.service.SyncHaobanToGicServiceApi
;
import
com.gic.haoban.manage.api.dto.AuditDTO
;
import
com.gic.haoban.manage.api.dto.DepartmentDTO
;
import
com.gic.haoban.manage.api.dto.DepartmentDTO
;
import
com.gic.haoban.manage.api.dto.EnterpriseDetailDTO
;
import
com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO
;
import
com.gic.haoban.manage.api.dto.MemberUnionidRelatedDTO
;
import
com.gic.haoban.manage.api.dto.StaffClerkRelationDTO
;
import
com.gic.haoban.manage.api.dto.StaffDTO
;
import
com.gic.haoban.manage.api.dto.StaffDTO
;
import
com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO
;
import
com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO
;
import
com.gic.haoban.manage.api.dto.WxEnterpriseDTO
;
import
com.gic.haoban.manage.api.dto.WxEnterpriseDTO
;
import
com.gic.haoban.manage.api.service.AuditApiService
;
import
com.gic.haoban.manage.api.service.BindApiService
;
import
com.gic.haoban.manage.api.service.BindApiService
;
import
com.gic.haoban.manage.api.service.ClerkMainStoreRelatedApiService
;
import
com.gic.haoban.manage.api.service.ClerkMainStoreRelatedApiService
;
import
com.gic.haoban.manage.api.service.DepartmentApiService
;
import
com.gic.haoban.manage.api.service.DepartmentApiService
;
import
com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService
;
import
com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService
;
import
com.gic.haoban.manage.api.service.StaffApiService
;
import
com.gic.haoban.manage.api.service.StaffApiService
;
import
com.gic.haoban.manage.api.service.StaffClerkRelationApiService
;
import
com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService
;
import
com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService
;
import
com.gic.haoban.manage.api.service.WxEnterpriseApiService
;
import
com.gic.haoban.manage.api.service.WxEnterpriseApiService
;
import
com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService
;
import
com.gic.haoban.manage.web.anno.HttpLimit
;
import
com.gic.haoban.manage.web.anno.HttpLimit
;
import
com.gic.haoban.manage.web.errCode.HaoBanErrCode
;
import
com.gic.haoban.manage.web.errCode.HaoBanErrCode
;
import
com.gic.haoban.manage.web.interceptor.WebInterceptor
;
import
com.gic.haoban.manage.web.interceptor.WebInterceptor
;
import
com.gic.haoban.manage.web.vo.BindClerkVO
;
import
com.gic.haoban.manage.web.vo.ClerkStoreVO
;
import
com.gic.haoban.manage.web.vo.ClerkVo
;
import
com.gic.haoban.manage.web.vo.ClerkVo
;
import
com.gic.redis.data.util.RedisUtil
;
import
com.gic.redis.data.util.RedisUtil
;
import
com.gic.wechat.api.service.qywx.QywxUserApiService
;
import
com.gic.wechat.api.service.qywx.QywxUserApiService
;
...
@@ -77,6 +89,15 @@ public class ClerkController extends WebBaseController{
...
@@ -77,6 +89,15 @@ public class ClerkController extends WebBaseController{
private
WxEnterpriseApiService
wxEnterpriseApiService
;
private
WxEnterpriseApiService
wxEnterpriseApiService
;
@Autowired
@Autowired
private
MemberUnionidRelatedApiService
memberUnionidRelatedApiService
;
private
MemberUnionidRelatedApiService
memberUnionidRelatedApiService
;
@Autowired
private
WxEnterpriseRelatedApiService
wxEnterpriseRelatedApiService
;
@Autowired
private
EnterpriseService
enterpriseService
;
@Autowired
private
AuditApiService
auditApiService
;
@Autowired
private
StaffClerkRelationApiService
staffClerkRelationApiService
;
//导购列表
//导购列表
@RequestMapping
(
"/clerk-list"
)
@RequestMapping
(
"/clerk-list"
)
...
@@ -388,4 +409,185 @@ public class ClerkController extends WebBaseController{
...
@@ -388,4 +409,185 @@ public class ClerkController extends WebBaseController{
return
resultResponse
(
HaoBanErrCode
.
ERR_1
);
return
resultResponse
(
HaoBanErrCode
.
ERR_1
);
}
}
@RequestMapping
(
"query-clerk-list-by-code"
)
public
HaobanResponse
queryClerkListByCode
(
String
keyword
,
String
wxEnterpriseId
){
if
(
StringUtils
.
isAnyBlank
(
keyword
,
wxEnterpriseId
)){
return
resultResponse
(
HaoBanErrCode
.
ERR_2
);
}
List
<
EnterpriseDetailDTO
>
list
=
wxEnterpriseRelatedApiService
.
listEnterpriseByWxEnterpriseId
(
wxEnterpriseId
);
if
(
list
==
null
||
list
.
isEmpty
()){
return
resultResponse
(
HaoBanErrCode
.
ERR_1
);
}
List
<
ClerkStoreVO
>
clerkStoreList
=
new
ArrayList
<>();
for
(
EnterpriseDetailDTO
enterpriseDetailDTO
:
list
)
{
String
enterpriseId
=
enterpriseDetailDTO
.
getEnterpriseId
();
EnterpriseDTO
enterprise
=
enterpriseService
.
getEnterpriseById
(
enterpriseId
);
if
(
enterprise
==
null
){
continue
;
}
ClerkDTO
clerk
=
clerkService
.
getClerkByClerkCode
(
enterpriseId
,
keyword
);
if
(
clerk
==
null
){
continue
;
}
StoreDTO
store
=
storeService
.
getStore
(
clerk
.
getStoreId
());
ClerkStoreVO
vo
=
new
ClerkStoreVO
();
vo
.
setClerkCode
(
clerk
.
getClerkCode
());
vo
.
setClerkName
(
clerk
.
getClerkName
());
vo
.
setClerkType
(
clerk
.
getClerkType
());
vo
.
setEnterpriseName
(
enterprise
.
getEnterpriseName
());
vo
.
setHeadImg
(
clerk
.
getHeadImgUrl
());
vo
.
setPhoneNumber
(
clerk
.
getPhoneNumber
());
vo
.
setNationCode
(
clerk
.
getNationcode
());
if
(
store
!=
null
){
vo
.
setStoreName
(
store
.
getStoreName
());
}
clerkStoreList
.
add
(
vo
);
//staffDepartmentRelatedApiService.getOneByClerkCodeAndDepartmentId(clerk.getClerkCode(), departmentId);
//List<ClerkDTO> clerkList = clerkService.getClerkByPhoneNumber(phoneNumber, enterpriseId)
}
return
resultResponse
(
HaoBanErrCode
.
ERR_1
,
clerkStoreList
);
}
@RequestMapping
(
"bind-staff"
)
public
HaobanResponse
bindStaff
(
String
clerkId
,
String
clerkCode
,
String
staffId
,
String
wxUserId
,
String
wxEnterpriseId
,
Integer
auditType
,
Integer
commitType
){
if
(
StringUtils
.
isAnyBlank
(
clerkId
,
clerkCode
,
staffId
,
wxUserId
,
wxEnterpriseId
)){
return
resultResponse
(
HaoBanErrCode
.
ERR_2
);
}
if
(
auditType
==
null
||
commitType
==
null
){
return
resultResponse
(
HaoBanErrCode
.
ERR_2
);
}
ClerkDTO
clerk
=
clerkService
.
getclerkById
(
clerkId
);
if
(
clerk
==
null
){
return
resultResponse
(
HaoBanErrCode
.
ERR_10016
);
}
StaffDTO
staff
=
staffApiService
.
selectById
(
staffId
);
if
(
staff
==
null
){
return
resultResponse
(
HaoBanErrCode
.
ERR_10006
);
}
StoreDTO
store
=
storeService
.
getStore
(
clerk
.
getStoreId
());
AuditDTO
audit
=
new
AuditDTO
();
//店长提交 默认是审核通过
if
(
commitType
==
1
){
ClerkDTO
storeManager
=
clerkService
.
getClerkLeaderByStoreId
(
clerk
.
getStoreId
());
audit
.
setCommitName
(
storeManager
.
getClerkName
());
audit
.
setAuditStatus
(
1
);
//audit.setCommitStaffId(commitStaffId);
audit
.
setCommitStoreId
(
clerk
.
getStoreId
());
//audit.setAuditName(auditName);
audit
.
setAuditStatus
(
1
);
//audit.seta
}
else
{
audit
.
setCommitName
(
clerk
.
getClerkName
());
audit
.
setCommitStaffId
(
staffId
);
audit
.
setCommitStaffImg
(
staff
.
getHeadImg
());
audit
.
setCommitStoreId
(
clerk
.
getStoreId
());
audit
.
setCommitStoreName
(
store
.
getStoreName
());
audit
.
setAuditStatus
(
0
);
}
JSONObject
json
=
new
JSONObject
();
json
.
put
(
"clerkId"
,
clerkId
);
json
.
put
(
"clerkCode"
,
clerkCode
);
json
.
put
(
"clerkName"
,
clerk
.
getClerkName
());
json
.
put
(
"staffName"
,
staff
.
getStaffName
());
json
.
put
(
"staffId"
,
staffId
);
json
.
put
(
"wxUserId"
,
wxUserId
);
json
.
put
(
"headPic"
,
staff
.
getHeadImg
());
audit
.
setOldValue
(
json
.
toJSONString
());
audit
.
setCommitTime
(
new
Date
());
audit
.
setAuditType
(
2
);
auditApiService
.
insert
(
audit
);
return
resultResponse
(
HaoBanErrCode
.
ERR_1
);
}
@RequestMapping
(
"clerk-bind-staff"
)
public
HaobanResponse
clerkBindStaff
(
String
clerkId
,
String
clerkCode
,
String
staffId
,
String
wxUserId
,
String
wxEnterpriseId
,
Integer
auditType
,
Integer
commitType
){
if
(
StringUtils
.
isAnyBlank
(
clerkId
,
clerkCode
,
staffId
,
wxUserId
,
wxEnterpriseId
)){
return
resultResponse
(
HaoBanErrCode
.
ERR_2
);
}
if
(
auditType
==
null
||
commitType
==
null
){
return
resultResponse
(
HaoBanErrCode
.
ERR_2
);
}
ClerkDTO
clerk
=
clerkService
.
getclerkById
(
clerkId
);
if
(
clerk
==
null
){
return
resultResponse
(
HaoBanErrCode
.
ERR_10016
);
}
StaffDTO
staff
=
staffApiService
.
selectById
(
staffId
);
if
(
staff
==
null
){
return
resultResponse
(
HaoBanErrCode
.
ERR_10006
);
}
StoreDTO
store
=
storeService
.
getStore
(
clerk
.
getStoreId
());
AuditDTO
audit
=
new
AuditDTO
();
//店长提交 默认是审核通过
if
(
commitType
==
1
){
ClerkDTO
storeManager
=
clerkService
.
getClerkLeaderByStoreId
(
clerk
.
getStoreId
());
audit
.
setCommitName
(
storeManager
.
getClerkName
());
audit
.
setAuditStatus
(
1
);
//audit.setCommitStaffId(commitStaffId);
audit
.
setCommitStoreId
(
clerk
.
getStoreId
());
//audit.setAuditName(auditName);
audit
.
setAuditStatus
(
1
);
//audit.seta
}
else
{
audit
.
setCommitName
(
clerk
.
getClerkName
());
audit
.
setCommitStaffId
(
staffId
);
audit
.
setCommitStaffImg
(
staff
.
getHeadImg
());
audit
.
setCommitStoreId
(
clerk
.
getStoreId
());
audit
.
setCommitStoreName
(
store
.
getStoreName
());
audit
.
setAuditStatus
(
0
);
}
JSONObject
json
=
new
JSONObject
();
json
.
put
(
"clerkId"
,
clerkId
);
json
.
put
(
"clerkCode"
,
clerkCode
);
json
.
put
(
"clerkName"
,
clerk
.
getClerkName
());
json
.
put
(
"staffName"
,
staff
.
getStaffName
());
json
.
put
(
"staffId"
,
staffId
);
json
.
put
(
"wxUserId"
,
wxUserId
);
json
.
put
(
"headPic"
,
staff
.
getHeadImg
());
audit
.
setOldValue
(
json
.
toJSONString
());
audit
.
setCommitTime
(
new
Date
());
audit
.
setAuditType
(
2
);
auditApiService
.
insert
(
audit
);
return
resultResponse
(
HaoBanErrCode
.
ERR_1
);
}
@RequestMapping
(
"store-clerk-list"
)
public
HaobanResponse
storeClerkList
(
String
storeId
,
String
wxEnterpriseId
){
if
(
StringUtils
.
isAnyBlank
(
storeId
,
wxEnterpriseId
)){
return
resultResponse
(
HaoBanErrCode
.
ERR_2
);
}
StoreDTO
store
=
storeService
.
getStore
(
storeId
);
if
(
store
==
null
){
return
resultResponse
(
HaoBanErrCode
.
ERR_2
);
}
List
<
ClerkListDTO
>
list
=
clerkService
.
getClerkByStoreId
(
store
.
getEnterpriseId
(),
storeId
);
Set
<
String
>
clerkCodeList
=
list
.
stream
().
map
(
ClerkListDTO:
:
getClerkCode
).
collect
(
Collectors
.
toSet
());
List
<
StaffClerkRelationDTO
>
bindRelationList
=
staffClerkRelationApiService
.
listBindCode
(
store
.
getEnterpriseId
(),
clerkCodeList
);
Map
<
String
,
StaffClerkRelationDTO
>
bindCodeMap
=
bindRelationList
.
stream
().
collect
(
Collectors
.
toMap
(
StaffClerkRelationDTO:
:
getClerkCode
,
s
->
s
));
List
<
BindClerkVO
>
bindList
=
new
ArrayList
<>();
List
<
BindClerkVO
>
unBindList
=
new
ArrayList
<>();
for
(
ClerkListDTO
clerkListDTO
:
list
)
{
BindClerkVO
vo
=
EntityUtil
.
changeEntityByJSON
(
BindClerkVO
.
class
,
clerkListDTO
);
if
(
bindCodeMap
.
keySet
().
contains
(
clerkListDTO
.
getClerkCode
())){
vo
.
setStaffId
(
bindCodeMap
.
get
(
clerkListDTO
.
getClerkCode
()).
getStaffId
());
bindList
.
add
(
vo
);
}
else
{
unBindList
.
add
(
vo
);
}
}
return
resultResponse
(
HaoBanErrCode
.
ERR_10009
);
}
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java
View file @
cc6f74aa
...
@@ -199,6 +199,8 @@ public enum HaoBanErrCode {
...
@@ -199,6 +199,8 @@ public enum HaoBanErrCode {
ERR_10014
(
10014
,
"请输入手机号"
),
ERR_10014
(
10014
,
"请输入手机号"
),
ERR_10015
(
10015
,
"素材不存在"
),
ERR_10015
(
10015
,
"素材不存在"
),
ERR_10016
(
10016
,
"导购不存在"
),
ERR_999
(
999
,
"操作失败"
),
ERR_999
(
999
,
"操作失败"
),
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/BindClerkVO.java
0 → 100644
View file @
cc6f74aa
package
com
.
gic
.
haoban
.
manage
.
web
.
vo
;
import
java.io.Serializable
;
public
class
BindClerkVO
implements
Serializable
{
private
String
clerkId
;
private
Integer
clerkType
;
private
String
clerkName
;
private
String
staffId
;
private
String
clerkCode
;
public
String
getClerkId
()
{
return
clerkId
;
}
public
void
setClerkId
(
String
clerkId
)
{
this
.
clerkId
=
clerkId
;
}
public
Integer
getClerkType
()
{
return
clerkType
;
}
public
void
setClerkType
(
Integer
clerkType
)
{
this
.
clerkType
=
clerkType
;
}
public
String
getClerkName
()
{
return
clerkName
;
}
public
void
setClerkName
(
String
clerkName
)
{
this
.
clerkName
=
clerkName
;
}
public
String
getStaffId
()
{
return
staffId
;
}
public
void
setStaffId
(
String
staffId
)
{
this
.
staffId
=
staffId
;
}
public
String
getClerkCode
()
{
return
clerkCode
;
}
public
void
setClerkCode
(
String
clerkCode
)
{
this
.
clerkCode
=
clerkCode
;
}
}
haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml
View file @
cc6f74aa
...
@@ -57,5 +57,7 @@
...
@@ -57,5 +57,7 @@
<dubbo:reference
interface=
"com.gic.enterprise.api.service.EnterpriseService"
id=
"enterpriseService"
/>
<dubbo:reference
interface=
"com.gic.enterprise.api.service.EnterpriseService"
id=
"enterpriseService"
/>
<dubbo:reference
interface=
"com.gic.haoban.manage.api.service.StaffClerkRelationApiService"
id=
"staffClerkRelationApiService"
/>
</beans>
</beans>
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