Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-store
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
base_platform_enterprise
gic-store
Commits
adaf4bad
Commit
adaf4bad
authored
Apr 01, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加导购
parent
7d5c6edf
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
5 deletions
+38
-5
ClerkApiService.java
.../src/main/java/com/gic/store/service/ClerkApiService.java
+24
-0
ClerkApiServiceImpl.java
...com/gic/store/service/outer/impl/ClerkApiServiceImpl.java
+11
-0
StoreApiServiceImpl.java
...com/gic/store/service/outer/impl/StoreApiServiceImpl.java
+3
-4
ClerkImportController.java
...a/com/gic/store/web/controller/ClerkImportController.java
+0
-1
No files found.
gic-store-api/src/main/java/com/gic/store/service/ClerkApiService.java
View file @
adaf4bad
...
...
@@ -108,4 +108,28 @@ public interface ClerkApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.lang.String>
*/
ServiceResponse
<
String
>
importClerkForOperation
(
ProcessBatchClerkDTO
clerkInfo
);
/**
* @Title: existClerkInStore
* @Description: 判断导购在不在某个门店下
* @author zhiwj
* @param clerkId
* @param storeId
* @param enterpriseId
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse
<
Boolean
>
existClerkInStore
(
Integer
clerkId
,
Integer
storeId
,
Integer
enterpriseId
);
/**
* @Title: addClerkToOtherStore
* @Description: 将同样导购的信息添加到另一个门店下
* @author zhiwj
* @param clerkId
* @param storeId
* @param enterpriseId
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
* @throws
*/
ServiceResponse
<
Void
>
addClerkToOtherStore
(
Integer
clerkId
,
Integer
storeId
,
Integer
enterpriseId
);
}
gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkApiServiceImpl.java
View file @
adaf4bad
...
...
@@ -418,6 +418,17 @@ public class ClerkApiServiceImpl implements ClerkApiService {
return
ServiceResponse
.
success
(
id
.
toString
());
}
@Override
public
ServiceResponse
<
Boolean
>
existClerkInStore
(
Integer
clerkId
,
Integer
storeId
,
Integer
enterpriseId
)
{
return
null
;
}
@Override
public
ServiceResponse
<
Void
>
addClerkToOtherStore
(
Integer
clerkId
,
Integer
storeId
,
Integer
enterpriseId
)
{
return
null
;
}
private
static
ServiceResponse
<
String
>
responseErrorElement
(
ImportClerkBatchResultEnum
error
)
{
logger
.
warn
(
"批处理导购错误返回结果:{}"
,
error
.
toString
());
return
ServiceResponse
.
failure
(
error
.
getCode
(),
error
.
toString
());
...
...
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java
View file @
adaf4bad
...
...
@@ -467,10 +467,9 @@ public class StoreApiServiceImpl implements StoreApiService {
for
(
StoreDTO
storeDTO
:
storeDTOList
)
{
List
<
StorePhotoDTO
>
photoList
=
storeDTO
.
getPhotoList
();
List
<
String
>
list
=
Optional
.
ofNullable
(
photoList
).
orElse
(
Collections
.
emptyList
()).
stream
().
map
(
StorePhotoDTO:
:
getImageUrl
).
collect
(
Collectors
.
toList
());
//
todo
给一个门店图片默认值测试
// 给一个门店图片默认值测试
if
(
CollectionUtils
.
isNotEmpty
(
list
))
{
// list = Arrays.asList("http://gicdev.demogic.com/gic-web/static/img/side-img.dc95242.png");
list
=
Arrays
.
asList
(
"https://pic01-10001430.image.myqcloud.com/a5a82c47-5892-4c1c-afaf-0f8d4d41e032"
);
list
=
Arrays
.
asList
(
Constants
.
DEFAULT_PHOTO
);
}
resultMap
.
put
(
storeDTO
.
getStoreId
(),
list
);
}
...
...
@@ -870,7 +869,7 @@ public class StoreApiServiceImpl implements StoreApiService {
logger
.
info
(
"enterpriseId:{}, storeId:{} , 门店不存在"
,
enterpriseId
,
storeId
);
return
ServiceResponse
.
failure
(
ErrorCode
.
NOTEXISTS
.
getCode
(),
ErrorCode
.
NOTEXISTS
.
getMsg
());
}
//
todo
修改门店缓存时间
// 修改门店缓存时间
RedisUtil
.
setCache
(
key
,
storeDTO
,
storeExpiredTime
,
TimeUnit
.
HOURS
);
}
StorePhotoDTO
storePhotoDTO
=
new
StorePhotoDTO
();
...
...
gic-store-web/src/main/java/com/gic/store/web/controller/ClerkImportController.java
View file @
adaf4bad
...
...
@@ -139,7 +139,6 @@ public class ClerkImportController {
}
if
(
clerkImportApiService
.
hasImportingClerk
(
enterpriseId
).
getResult
())
{
// TODO userId
// 开队列
String
r
=
clerkImportApiService
.
importDataToClerk
(
enterpriseId
,
"123"
,
uuId
).
getResult
();
if
(
StringUtils
.
isNotBlank
(
r
))
{
...
...
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