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
604ed7bf
Commit
604ed7bf
authored
Apr 24, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
日志
parent
f2480abf
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
33 additions
and
2 deletions
+33
-2
ClerkController.java
...in/java/com/gic/store/web/controller/ClerkController.java
+1
-1
ClerkImportController.java
...a/com/gic/store/web/controller/ClerkImportController.java
+11
-0
StoreController.java
...in/java/com/gic/store/web/controller/StoreController.java
+10
-0
StoreImportController.java
...a/com/gic/store/web/controller/StoreImportController.java
+11
-1
No files found.
gic-store-web/src/main/java/com/gic/store/web/controller/ClerkController.java
View file @
604ed7bf
...
...
@@ -222,7 +222,7 @@ public class ClerkController extends DownloadUtils {
clerkDTO
.
setOperatorName
(
UserDetailUtils
.
getUserDetail
().
getUserInfo
().
getUserName
());
ServiceResponse
serviceResponse
=
clerkApiService
.
saveOrUpdate
(
clerkDTO
);
if
(
serviceResponse
.
isSuccess
())
{
LogUtils
.
createLog
((
clerkQO
.
getClerkId
()
==
null
?
"新增"
:
"
修改
"
)
+
"导购"
,
clerkQO
.
getClerkName
());
LogUtils
.
createLog
((
clerkQO
.
getClerkId
()
==
null
?
"新增"
:
"
编辑
"
)
+
"导购"
,
clerkQO
.
getClerkName
());
return
RestResponse
.
success
(
serviceResponse
.
getResult
());
}
else
{
return
RestResponse
.
failure
(
serviceResponse
.
getCode
(),
serviceResponse
.
getMessage
());
...
...
gic-store-web/src/main/java/com/gic/store/web/controller/ClerkImportController.java
View file @
604ed7bf
...
...
@@ -125,6 +125,8 @@ public class ClerkImportController {
return
RestResponse
.
failure
(
ErrorCode
.
OPERATION_FAILED
.
getCode
(),
"总列数与模板不一致"
);
}
clerkImportApiService
.
delClerkTmp
(
enterpriseId
);
int
logCount
=
0
;
StringBuilder
sb
=
new
StringBuilder
();
for
(
Map
<
Integer
,
String
>
row
:
data
)
{
ClerkTmpDTO
bean
=
this
.
validateData
(
row
,
enterpriseId
);
try
{
...
...
@@ -136,6 +138,10 @@ public class ClerkImportController {
}
catch
(
Exception
e
)
{
logger
.
warn
(
e
);
}
if
(
logCount
>
3
)
{
sb
.
append
(
bean
.
getStoreName
()).
append
(
","
);
}
logCount
++;
}
if
(
clerkImportApiService
.
hasImportingClerk
(
enterpriseId
).
getResult
())
{
...
...
@@ -145,6 +151,11 @@ public class ClerkImportController {
logger
.
warn
(
"队列错误, {}"
,
r
);
return
RestResponse
.
failure
(
ErrorCode
.
PARAMETER_ERROR
.
getCode
(),
"网络错误"
);
}
if
(
sb
.
length
()
>
0
&&
logCount
>
0
)
{
sb
.
deleteCharAt
(
sb
.
length
()
-
1
);
sb
.
append
(
"等"
).
append
(
logCount
).
append
(
"名导购"
);
}
LogUtils
.
createLog
(
"批量导入"
,
sb
.
toString
());
}
else
{
Page
page
=
clerkImportApiService
.
listClerkTmp
(
enterpriseId
,
false
,
pageQO
.
getCurrentPage
(),
pageQO
.
getPageSize
()).
getResult
();
Map
<
Object
,
Object
>
result
=
new
HashMap
<>(
8
);
...
...
gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java
View file @
604ed7bf
...
...
@@ -302,6 +302,16 @@ public class StoreController extends DownloadUtils {
}
ServiceResponse
response
=
this
.
storeApiService
.
bulkUpdateStore
(
storeIds
,
value
,
enterpriseId
,
type
,
UserDetailUtils
.
getUserDetail
().
getUserId
(),
UserDetailUtils
.
getUserDetail
().
getUserInfo
().
getUserName
());
if
(
response
.
isSuccess
())
{
StoreSearchDTO
storeSearchDTO
=
new
StoreSearchDTO
();
List
<
StoreDTO
>
storeList
=
this
.
storeApiService
.
listStore
(
storeSearchDTO
,
1
,
3
).
getResult
().
getResult
();
if
(
CollectionUtils
.
isNotEmpty
(
storeList
))
{
String
storeName
=
storeList
.
stream
().
map
(
StoreDTO:
:
getStoreName
).
reduce
((
x
,
y
)
->
x
+
","
+
y
).
get
();
String
[]
storeArr
=
storeIds
.
split
(
","
);
if
(
storeArr
.
length
>
3
)
{
storeName
+=
"等"
+
storeArr
.
length
+
"家门店"
;
}
LogUtils
.
createLog
(
type
==
1
?
"修改启用状态"
:
"批量编辑"
,
storeName
);
}
return
RestResponse
.
success
();
}
return
EnterpriseRestResponse
.
failure
(
response
);
...
...
gic-store-web/src/main/java/com/gic/store/web/controller/StoreImportController.java
View file @
604ed7bf
...
...
@@ -147,6 +147,8 @@ public class StoreImportController {
//重置临时表数据
storeImportApiService
.
delStoreTmp
(
enterpriseId
);
//批量插入数据到门店临时表,用于队列导入到门店表
int
logCount
=
0
;
StringBuilder
sb
=
new
StringBuilder
();
for
(
Map
<
Integer
,
String
>
row
:
data
)
{
StoreTmpDTO
bean
=
this
.
validateData
(
row
,
enterpriseId
,
storeRegion
.
getRegionId
(),
isReplace
);
bean
.
setRegionId
(
storeRegion
.
getRegionId
());
...
...
@@ -160,6 +162,10 @@ public class StoreImportController {
}
catch
(
Exception
e
)
{
logger
.
warn
(
e
);
}
if
(
logCount
>
3
)
{
sb
.
append
(
bean
.
getStoreName
()).
append
(
","
);
}
logCount
++;
}
if
(
storeImportApiService
.
hasImportingStore
(
enterpriseId
).
getResult
())
{
...
...
@@ -171,6 +177,11 @@ public class StoreImportController {
logger
.
warn
(
"队列错误, {}"
,
r
);
return
RestResponse
.
failure
(
ErrorCode
.
PARAMETER_ERROR
.
getCode
(),
"网络错误"
);
}
if
(
sb
.
length
()
>
0
&&
logCount
>
0
)
{
sb
.
deleteCharAt
(
sb
.
length
()
-
1
);
sb
.
append
(
"等"
).
append
(
logCount
).
append
(
"家门店"
);
}
LogUtils
.
createLog
(
"批量导入"
,
sb
.
toString
());
}
else
{
Page
page
=
storeImportApiService
.
listStoreTmp
(
enterpriseId
,
false
,
pageQO
.
getCurrentPage
(),
pageQO
.
getPageSize
()).
getResult
();
Map
<
Object
,
Object
>
result
=
new
HashMap
<>(
8
);
...
...
@@ -191,7 +202,6 @@ public class StoreImportController {
}
else
{
return
RestResponse
.
failure
(
ErrorCode
.
PARAMETER_ERROR
.
getCode
(),
"选择xlsx格式文件上传"
);
}
LogUtils
.
createLog
(
"导入门店"
,
"门店"
);
return
RestResponse
.
success
();
}
...
...
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