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
f1f642e2
Commit
f1f642e2
authored
Jul 02, 2019
by
陶光胜
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'developer' of
http://115.159.76.241/base_platform_enterprise/gic-store
into developer
parents
55605e48
092fe02b
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
81 additions
and
2 deletions
+81
-2
WeekdayEnum.java
...api/src/main/java/com/gic/store/constant/WeekdayEnum.java
+41
-0
StoreBusinessTimeDTO.java
...src/main/java/com/gic/store/dto/StoreBusinessTimeDTO.java
+10
-0
StoreBusinessTimeService.java
.../java/com/gic/store/service/StoreBusinessTimeService.java
+2
-0
StoreBusinessTimeServiceImpl.java
.../gic/store/service/impl/StoreBusinessTimeServiceImpl.java
+27
-2
StoreApiServiceImpl.java
...java/com/gic/store/service/outer/StoreApiServiceImpl.java
+1
-0
No files found.
gic-store-api/src/main/java/com/gic/store/constant/WeekdayEnum.java
0 → 100644
View file @
f1f642e2
package
com
.
gic
.
store
.
constant
;
/**
* @author zhiwj
* @date 2019/7/2
*/
public
enum
WeekdayEnum
{
MONDAY
(
1
,
"周一"
),
TUESDAY
(
2
,
"周二"
),
WEDNESDAY
(
3
,
"周三"
),
THURSDAY
(
4
,
"周四"
),
FRIDAY
(
5
,
"周五"
),
SATURDAY
(
6
,
"周六"
),
SUNDAY
(
7
,
"周日"
);
private
int
code
;
private
String
message
;
WeekdayEnum
(
int
code
,
String
message
)
{
this
.
code
=
code
;
this
.
message
=
message
;
}
public
int
getCode
()
{
return
code
;
}
public
String
getMessage
()
{
return
message
;
}
public
static
String
parse
(
int
code
)
{
for
(
WeekdayEnum
weekday
:
values
())
{
if
(
weekday
.
getCode
()
==
code
)
{
return
weekday
.
message
;
}
}
return
null
;
}
}
gic-store-api/src/main/java/com/gic/store/dto/StoreBusinessTimeDTO.java
View file @
f1f642e2
...
...
@@ -35,6 +35,8 @@ public class StoreBusinessTimeDTO implements Serializable {
*/
private
Integer
storeId
;
private
String
weekdayShow
;
public
Integer
getStoreBusinessTimeId
()
{
return
storeBusinessTimeId
;
}
...
...
@@ -74,4 +76,12 @@ public class StoreBusinessTimeDTO implements Serializable {
public
void
setStoreId
(
Integer
storeId
)
{
this
.
storeId
=
storeId
;
}
public
String
getWeekdayShow
()
{
return
weekdayShow
;
}
public
void
setWeekdayShow
(
String
weekdayShow
)
{
this
.
weekdayShow
=
weekdayShow
;
}
}
gic-store-service/src/main/java/com/gic/store/service/StoreBusinessTimeService.java
View file @
f1f642e2
...
...
@@ -13,4 +13,6 @@ public interface StoreBusinessTimeService {
void
editStoreBusinessTime
(
Integer
enterpriseId
,
Integer
storeId
,
List
<
StoreBusinessTimeDTO
>
businessTimeList
,
List
<
Integer
>
delBusinessTimes
);
List
<
TabStoreBusinessTime
>
listBusinessTime
(
Integer
storeId
);
void
convertBusinessTime
(
List
<
StoreBusinessTimeDTO
>
businessTimeDTOList
);
}
gic-store-service/src/main/java/com/gic/store/service/impl/StoreBusinessTimeServiceImpl.java
View file @
f1f642e2
package
com
.
gic
.
store
.
service
.
impl
;
import
com.gic.commons.util.GlobalInfo
;
import
com.gic.store.constant.WeekdayEnum
;
import
com.gic.store.dao.mapper.TabStoreBusinessTimeMapper
;
import
com.gic.store.dto.StoreBusinessTimeDTO
;
import
com.gic.store.entity.TabStoreBusinessTime
;
...
...
@@ -11,6 +13,8 @@ import org.springframework.transaction.annotation.Transactional;
import
java.util.Date
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
java.util.stream.Stream
;
/**
* @author zhiwj
...
...
@@ -30,7 +34,7 @@ public class StoreBusinessTimeServiceImpl implements StoreBusinessTimeService {
tabStoreBusinessTimeMapper
.
deleteByPrimaryKey
(
delId
);
}
}
if
(
CollectionUtils
.
isNotEmpty
(
businessTimeList
))
{
if
(
CollectionUtils
.
isNotEmpty
(
businessTimeList
))
{
for
(
StoreBusinessTimeDTO
storeBusinessTimeDTO
:
businessTimeList
)
{
TabStoreBusinessTime
businessTime
=
new
TabStoreBusinessTime
();
businessTime
.
setStoreBusinessTimeId
(
storeBusinessTimeDTO
.
getStoreBusinessTimeId
());
...
...
@@ -50,6 +54,27 @@ public class StoreBusinessTimeServiceImpl implements StoreBusinessTimeService {
@Override
public
List
<
TabStoreBusinessTime
>
listBusinessTime
(
Integer
storeId
)
{
return
tabStoreBusinessTimeMapper
.
listBusinessTime
(
storeId
);
return
tabStoreBusinessTimeMapper
.
listBusinessTime
(
storeId
);
}
@Override
public
void
convertBusinessTime
(
List
<
StoreBusinessTimeDTO
>
businessTimeDTOList
)
{
for
(
StoreBusinessTimeDTO
storeBusinessTimeDTO
:
businessTimeDTOList
)
{
String
weekday
=
storeBusinessTimeDTO
.
getWeekday
();
List
<
Integer
>
list
=
Stream
.
of
(
weekday
.
split
(
GlobalInfo
.
FLAG_COMMA
)).
map
(
Integer:
:
parseInt
).
collect
(
Collectors
.
toList
());
if
(
list
.
size
()
>=
3
&&
list
.
get
(
list
.
size
()
-
1
)
-
list
.
get
(
0
)
==
list
.
size
()
-
1
)
{
// 超过三条的需要判断
// 都是连续的
storeBusinessTimeDTO
.
setWeekdayShow
(
WeekdayEnum
.
parse
(
list
.
get
(
0
))
+
"至"
+
WeekdayEnum
.
parse
(
list
.
get
(
list
.
size
()
-
1
)));
}
else
{
// 直接解析返回
StringBuilder
sb
=
new
StringBuilder
();
for
(
Integer
code
:
list
)
{
sb
.
append
(
WeekdayEnum
.
parse
(
code
)).
append
(
"、"
);
}
sb
.
deleteCharAt
(
sb
.
length
()
-
1
);
storeBusinessTimeDTO
.
setWeekdayShow
(
sb
.
toString
());
}
}
}
}
gic-store-service/src/main/java/com/gic/store/service/outer/StoreApiServiceImpl.java
View file @
f1f642e2
...
...
@@ -100,6 +100,7 @@ public class StoreApiServiceImpl implements StoreApiService {
List
<
TabStoreBusinessTime
>
tabBusinessTimeList
=
storeBusinessTimeService
.
listBusinessTime
(
store
.
getStoreId
());
List
<
StoreBusinessTimeDTO
>
businessTimeDTOList
=
EntityUtil
.
changeEntityListByOrika
(
StoreBusinessTimeDTO
.
class
,
tabBusinessTimeList
);
storeDTO
.
setBusinessTimeList
(
businessTimeDTOList
);
storeBusinessTimeService
.
convertBusinessTime
(
businessTimeDTOList
);
List
<
TabStoreBrand
>
storeBrandList
=
storeBrandService
.
listStoreBrandByIds
(
store
.
getBrandIds
());
List
<
StoreBrandDTO
>
brandDTOList
=
EntityUtil
.
changeEntityListByOrika
(
StoreBrandDTO
.
class
,
storeBrandList
);
storeDTO
.
setBrandList
(
brandDTOList
);
...
...
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