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
442b8c6b
Commit
442b8c6b
authored
Nov 12, 2019
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加门店日志
parent
e0be2ec0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
11 deletions
+13
-11
StoreApiServiceImpl.java
...com/gic/store/service/outer/impl/StoreApiServiceImpl.java
+13
-11
No files found.
gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java
View file @
442b8c6b
...
...
@@ -207,17 +207,19 @@ public class StoreApiServiceImpl implements StoreApiService {
sb
.
append
(
"门店电话"
).
append
(
"【"
).
append
(
oldStore
.
getConactsPhone
()).
append
(
"】"
)
.
append
(
"变更为【"
).
append
(
newStore
.
getConactsPhone
()).
append
(
"】"
);
}
if
(!
CollectionUtils
.
isEqualCollection
(
oldStore
.
getBusinessTimeList
(),
newStore
.
getBusinessTimeList
()))
{
this
.
storeBusinessTimeService
.
convertBusinessTime
(
newStore
.
getBusinessTimeList
());
String
oldBusinessTimeShow
=
oldStore
.
getBusinessTimeList
().
stream
()
.
map
(
e
->
e
.
getWeekdayShow
()
+
":"
+
DateUtil
.
dateToStr
(
e
.
getOpenTime
(),
DateUtil
.
FORMAT_MINUTE_TIME
)
+
"~"
+
DateUtil
.
dateToStr
(
e
.
getCloseTime
(),
DateUtil
.
FORMAT_MINUTE_TIME
))
.
reduce
((
x
,
y
)
->
x
+
""
+
y
).
orElse
(
""
);
String
newBusinessTimeShow
=
newStore
.
getBusinessTimeList
().
stream
()
.
map
(
e
->
e
.
getWeekdayShow
()
+
":"
+
DateUtil
.
dateToStr
(
e
.
getOpenTime
(),
DateUtil
.
FORMAT_MINUTE_TIME
)
+
"~"
+
DateUtil
.
dateToStr
(
e
.
getCloseTime
(),
DateUtil
.
FORMAT_MINUTE_TIME
))
.
reduce
((
x
,
y
)
->
x
+
","
+
y
)
.
orElse
(
""
);
sb
.
append
(
"营业时间"
).
append
(
"【"
).
append
(
oldBusinessTimeShow
).
append
(
"】"
)
.
append
(
"变更为【"
).
append
(
newBusinessTimeShow
).
append
(
"】"
);
if
(
CollectionUtils
.
isNotEmpty
(
oldStore
.
getBusinessTimeList
()))
{
if
(!
CollectionUtils
.
isEqualCollection
(
oldStore
.
getBusinessTimeList
(),
newStore
.
getBusinessTimeList
()))
{
this
.
storeBusinessTimeService
.
convertBusinessTime
(
newStore
.
getBusinessTimeList
());
String
oldBusinessTimeShow
=
oldStore
.
getBusinessTimeList
().
stream
()
.
map
(
e
->
e
.
getWeekdayShow
()
+
":"
+
DateUtil
.
dateToStr
(
e
.
getOpenTime
(),
DateUtil
.
FORMAT_MINUTE_TIME
)
+
"~"
+
DateUtil
.
dateToStr
(
e
.
getCloseTime
(),
DateUtil
.
FORMAT_MINUTE_TIME
))
.
reduce
((
x
,
y
)
->
x
+
""
+
y
).
orElse
(
""
);
String
newBusinessTimeShow
=
newStore
.
getBusinessTimeList
().
stream
()
.
map
(
e
->
e
.
getWeekdayShow
()
+
":"
+
DateUtil
.
dateToStr
(
e
.
getOpenTime
(),
DateUtil
.
FORMAT_MINUTE_TIME
)
+
"~"
+
DateUtil
.
dateToStr
(
e
.
getCloseTime
(),
DateUtil
.
FORMAT_MINUTE_TIME
))
.
reduce
((
x
,
y
)
->
x
+
","
+
y
)
.
orElse
(
""
);
sb
.
append
(
"营业时间"
).
append
(
"【"
).
append
(
oldBusinessTimeShow
).
append
(
"】"
)
.
append
(
"变更为【"
).
append
(
newBusinessTimeShow
).
append
(
"】"
);
}
}
if
(
StringUtils
.
isNotBlank
(
newStore
.
getBrandIds
())
&&
!
StringUtils
.
equals
(
newStore
.
getBrandIds
(),
oldStore
.
getBrandIds
()))
{
List
<
TabStoreBrand
>
tabStoreBrands
=
this
.
storeBrandService
.
listStoreBrandByIds
(
newStore
.
getBrandIds
());
...
...
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