Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-enterprise
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-platform-enterprise
Commits
77d42f04
Commit
77d42f04
authored
Jun 02, 2020
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
同步门店营业时间给一个默认值
parent
8245517b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
2 deletions
+13
-2
WmMallStoreController.java
...c/enterprise/web/controller/wm/WmMallStoreController.java
+3
-0
WmStoreSyncController.java
...c/enterprise/web/controller/wm/WmStoreSyncController.java
+10
-2
No files found.
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/wm/WmMallStoreController.java
View file @
77d42f04
...
...
@@ -361,6 +361,9 @@ public class WmMallStoreController {
public
RestResponse
getHasConfigMemberCard
(
Integer
wmMallStoreId
)
{
ServiceResponse
<
Long
>
result
=
weimobMerchantService
.
getMcuAreaId
(
wmMallStoreId
);
if
(
result
.
isSuccess
())
{
if
(
result
.
getResult
()
==
null
)
{
return
RestResponse
.
failure
(
ErrorCode
.
SYSTEM_ERROR
.
getCode
(),
"未配置会员卡,数据为空"
);
}
return
RestResponse
.
success
(
result
.
getResult
().
toString
());
}
return
RestResponse
.
failure
(
result
.
getCode
(),
result
.
getMessage
());
...
...
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/wm/WmStoreSyncController.java
View file @
77d42f04
...
...
@@ -721,7 +721,11 @@ public class WmStoreSyncController {
return
e
.
getWeekdayShow
()
+
businessHours
;
}).
forEach
(
businessTime:
:
append
);
}
weimobPhysicalStoreDTO
.
setBussinessHours
(
businessTime
.
toString
());
if
(
StringUtils
.
isBlank
(
businessTime
.
toString
()))
{
weimobPhysicalStoreDTO
.
setBussinessHours
(
"08:00-22:00"
);
}
else
{
weimobPhysicalStoreDTO
.
setBussinessHours
(
businessTime
.
toString
());
}
WeimobStoreAccountDTO
accountDTO
=
new
WeimobStoreAccountDTO
();
ClerkDTO
headClerk
=
getHeadClerk
(
storeDTO
.
getEnterpriseId
(),
storeDTO
.
getStoreId
());
...
...
@@ -807,7 +811,11 @@ public class WmStoreSyncController {
return
e
.
getWeekdayShow
()
+
businessHours
;
}).
forEach
(
businessTime:
:
append
);
}
weimobPhysicalStoreDTO
.
setBussinessHours
(
businessTime
.
toString
());
if
(
StringUtils
.
isBlank
(
businessTime
.
toString
()))
{
weimobPhysicalStoreDTO
.
setBussinessHours
(
"08:00-22:00"
);
}
else
{
weimobPhysicalStoreDTO
.
setBussinessHours
(
businessTime
.
toString
());
}
WeimobStoreAccountDTO
accountDTO
=
new
WeimobStoreAccountDTO
();
ClerkDTO
headClerk
=
getHeadClerk
(
storeDTO
.
getEnterpriseId
(),
storeDTO
.
getStoreId
());
...
...
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