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
840e69e2
Commit
840e69e2
authored
Oct 18, 2019
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
6d17baac
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
StoreServiceImpl.java
...ain/java/com/gic/store/service/impl/StoreServiceImpl.java
+2
-2
StoreRegionController.java
...a/com/gic/store/web/controller/StoreRegionController.java
+2
-1
No files found.
gic-store-service/src/main/java/com/gic/store/service/impl/StoreServiceImpl.java
View file @
840e69e2
...
...
@@ -171,8 +171,8 @@ public class StoreServiceImpl implements StoreService {
storeDTO
.
getRegionId
()
!=
null
&&
StringUtils
.
isNotBlank
(
storeDTO
.
getStoreCode
())
&&
CollectionUtils
.
isNotEmpty
(
storeDTO
.
getPhotoList
())
&&
storeDTO
.
getStoreType
()
!=
null
&&
storeDTO
.
getErpStatus
()
!=
null
&&
//
storeDTO.getStoreType() != null &&
//
storeDTO.getErpStatus() != null &&
StringUtils
.
isNotBlank
(
storeDTO
.
getConactsPhone
())
&&
CollectionUtils
.
isNotEmpty
(
storeDTO
.
getBusinessTimeList
())
&&
storeDTO
.
getStoreGroupId
()
!=
null
&&
...
...
gic-store-web/src/main/java/com/gic/store/web/controller/StoreRegionController.java
View file @
840e69e2
...
...
@@ -4,6 +4,7 @@ import com.gic.api.base.commons.Page;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.commons.webapi.reponse.RestResponse
;
import
com.gic.enterprise.utils.UserDetailUtils
;
import
com.gic.store.constant.StoreOwnTypeEnum
;
import
com.gic.store.dto.StoreRegionDTO
;
import
com.gic.store.service.StoreRegionApiService
;
import
com.gic.store.web.qo.PageQO
;
...
...
@@ -50,7 +51,7 @@ public class StoreRegionController {
@RequestMapping
(
"/list-store-region"
)
public
RestResponse
listStoreRegion
(
String
search
)
{
Integer
enterpriseId
=
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
();
ServiceResponse
<
List
<
StoreRegionDTO
>>
serviceResponse
=
storeRegionApiService
.
listStoreRegion
(
enterpriseId
,
search
);
ServiceResponse
<
List
<
StoreRegionDTO
>>
serviceResponse
=
storeRegionApiService
.
listStoreRegion
(
enterpriseId
,
search
,
StoreOwnTypeEnum
.
OWNER
.
getCode
()
);
if
(
serviceResponse
.
isSuccess
())
{
return
RestResponse
.
success
(
serviceResponse
.
getResult
());
}
else
{
...
...
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