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
fba297d9
Commit
fba297d9
authored
Aug 14, 2020
by
fudahua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
导购信息修改
parent
d2aecd87
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
169 additions
and
48 deletions
+169
-48
ClerkController.java
...com/gic/haoban/manage/web/controller/ClerkController.java
+71
-48
ClerkDetailVo.java
...main/java/com/gic/haoban/manage/web/vo/ClerkDetailVo.java
+98
-0
No files found.
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/ClerkController.java
View file @
fba297d9
package
com
.
gic
.
haoban
.
manage
.
web
.
controller
;
package
com
.
gic
.
haoban
.
manage
.
web
.
controller
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Set
;
import
java.util.stream.Collectors
;
import
com.gic.haoban.manage.api.enums.*
;
import
org.apache.commons.lang3.StringUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
cn.hutool.core.collection.CollectionUtil
;
import
cn.hutool.core.collection.CollectionUtil
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
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.dto.ClerkListDTO
;
...
@@ -33,43 +15,26 @@ import com.gic.enterprise.api.dto.StoreDTO;
...
@@ -33,43 +15,26 @@ import com.gic.enterprise.api.dto.StoreDTO;
import
com.gic.enterprise.api.service.EnterpriseService
;
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.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.*
;
import
com.gic.haoban.manage.api.dto.AuditSettingDTO
;
import
com.gic.haoban.manage.api.enums.*
;
import
com.gic.haoban.manage.api.dto.ClerkMainStoreRelatedDTO
;
import
com.gic.haoban.manage.api.service.*
;
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.StaffClerkRelationDTO
;
import
com.gic.haoban.manage.api.dto.StaffDTO
;
import
com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO
;
import
com.gic.haoban.manage.api.dto.WxEnterpriseDTO
;
import
com.gic.haoban.manage.api.service.AuditApiService
;
import
com.gic.haoban.manage.api.service.AuditSettingApiService
;
import
com.gic.haoban.manage.api.service.BindApiService
;
import
com.gic.haoban.manage.api.service.ClerkMainStoreRelatedApiService
;
import
com.gic.haoban.manage.api.service.DepartmentApiService
;
import
com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService
;
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.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.utils.RouterConstant
;
import
com.gic.haoban.manage.web.utils.RouterConstant
;
import
com.gic.haoban.manage.web.vo.BindClerkVO
;
import
com.gic.haoban.manage.web.vo.*
;
import
com.gic.haoban.manage.web.vo.ClerkStoreVO
;
import
com.gic.haoban.manage.web.vo.ClerkVo
;
import
com.gic.haoban.manage.web.vo.StaffStoreVO
;
import
com.gic.haoban.manage.web.vo.StoreClerkVO
;
import
com.gic.redis.data.util.RedisUtil
;
import
com.gic.redis.data.util.RedisUtil
;
import
com.gic.wechat.api.service.qywx.QywxUserApiService
;
import
org.apache.commons.lang3.StringUtils
;
import
com.google.i18n.phonenumbers.PhoneNumberUtil
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.*
;
import
java.util.stream.Collectors
;
@RestController
@RestController
public
class
ClerkController
extends
WebBaseController
{
public
class
ClerkController
extends
WebBaseController
{
...
@@ -793,4 +758,62 @@ public class ClerkController extends WebBaseController{
...
@@ -793,4 +758,62 @@ public class ClerkController extends WebBaseController{
return
resultResponse
(
HaoBanErrCode
.
ERR_1
);
return
resultResponse
(
HaoBanErrCode
.
ERR_1
);
}
}
/**
* 导购详情
* @param clerkId
* @param wxEnterpriseId
* @return
*/
@RequestMapping
(
"/clerk-detail"
)
public
HaobanResponse
clerkDetail
(
String
clerkId
,
String
wxEnterpriseId
)
{
StaffClerkRelationDTO
staffRelation
=
staffClerkRelationApiService
.
getByClerkId
(
clerkId
);
if
(
staffRelation
==
null
){
return
resultResponse
(
HaoBanErrCode
.
ERR_10006
);
}
ClerkDTO
clerk
=
clerkService
.
getClerkByClerkId
(
clerkId
);
if
(
clerk
==
null
){
return
resultResponse
(
HaoBanErrCode
.
ERR_10006
);
}
return
resultResponse
(
HaoBanErrCode
.
ERR_1
,
EntityUtil
.
changeEntityByJSON
(
ClerkDetailVo
.
class
,
clerk
));
}
/**
* 更新导购
* @param clerkId
* @param fieldType
* @return
*/
@RequestMapping
(
"/save-clerk"
)
public
HaobanResponse
clerkSave
(
String
clerkId
,
String
fieldValue
,
Integer
fieldType
)
{
StaffClerkRelationDTO
staffRelation
=
staffClerkRelationApiService
.
getByClerkId
(
clerkId
);
if
(
staffRelation
==
null
){
return
resultResponse
(
HaoBanErrCode
.
ERR_10006
);
}
ClerkDTO
clerk
=
clerkService
.
getClerkByClerkId
(
clerkId
);
if
(
clerk
==
null
){
return
resultResponse
(
HaoBanErrCode
.
ERR_10006
);
}
if
(
fieldType
==
0
)
{
clerk
.
setClerkName
(
fieldValue
);
}
else
if
(
fieldType
==
1
)
{
clerk
.
setClerkGender
(
fieldValue
);
}
else
if
(
fieldType
==
2
)
{
String
[]
split
=
fieldValue
.
split
(
"-"
);
if
(
split
.
length
==
2
)
{
clerk
.
setPhoneNumber
(
split
[
1
]);
clerk
.
setNationcode
(
split
[
0
]);
}
else
{
logger
.
info
(
"手机号不争取:{}"
,
fieldValue
);
return
resultResponse
(
HaoBanErrCode
.
ERR_5
);
}
}
else
if
(
fieldType
==
3
)
{
clerk
.
setHeadImgUrl
(
fieldValue
);
}
clerkService
.
updateClerk
(
clerk
);
return
resultResponse
(
HaoBanErrCode
.
ERR_1
);
}
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/ClerkDetailVo.java
0 → 100644
View file @
fba297d9
package
com
.
gic
.
haoban
.
manage
.
web
.
vo
;
import
com.gic.clerk.api.dto.StoreInfoDTO
;
import
com.gic.clerk.api.dto.UserRightDTO
;
import
java.io.Serializable
;
import
java.util.Date
;
import
java.util.List
;
/**
* Created 2020/8/14.
*
* @author hua
*/
public
class
ClerkDetailVo
implements
Serializable
{
private
String
clerkId
;
private
String
clerkName
;
private
String
clerkCode
;
private
String
storeId
;
private
String
clerkGender
;
private
String
phoneNumber
;
private
String
enterpriseId
;
private
String
headImgUrl
;
private
String
nationcode
;
public
String
getClerkId
()
{
return
clerkId
;
}
public
void
setClerkId
(
String
clerkId
)
{
this
.
clerkId
=
clerkId
;
}
public
String
getClerkName
()
{
return
clerkName
;
}
public
void
setClerkName
(
String
clerkName
)
{
this
.
clerkName
=
clerkName
;
}
public
String
getClerkCode
()
{
return
clerkCode
;
}
public
void
setClerkCode
(
String
clerkCode
)
{
this
.
clerkCode
=
clerkCode
;
}
public
String
getStoreId
()
{
return
storeId
;
}
public
void
setStoreId
(
String
storeId
)
{
this
.
storeId
=
storeId
;
}
public
String
getClerkGender
()
{
return
clerkGender
;
}
public
void
setClerkGender
(
String
clerkGender
)
{
this
.
clerkGender
=
clerkGender
;
}
public
String
getPhoneNumber
()
{
return
phoneNumber
;
}
public
void
setPhoneNumber
(
String
phoneNumber
)
{
this
.
phoneNumber
=
phoneNumber
;
}
public
String
getEnterpriseId
()
{
return
enterpriseId
;
}
public
void
setEnterpriseId
(
String
enterpriseId
)
{
this
.
enterpriseId
=
enterpriseId
;
}
public
String
getHeadImgUrl
()
{
return
headImgUrl
;
}
public
void
setHeadImgUrl
(
String
headImgUrl
)
{
this
.
headImgUrl
=
headImgUrl
;
}
public
String
getNationcode
()
{
return
nationcode
;
}
public
void
setNationcode
(
String
nationcode
)
{
this
.
nationcode
=
nationcode
;
}
}
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