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
356e476a
Commit
356e476a
authored
May 27, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
导购bug
parent
9923f6b1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
11 deletions
+7
-11
ClerkApiService.java
.../src/main/java/com/gic/store/service/ClerkApiService.java
+1
-1
ClerkApiServiceImpl.java
...com/gic/store/service/outer/impl/ClerkApiServiceImpl.java
+5
-9
ClerkController.java
...in/java/com/gic/store/web/controller/ClerkController.java
+1
-1
No files found.
gic-store-api/src/main/java/com/gic/store/service/ClerkApiService.java
View file @
356e476a
...
...
@@ -119,7 +119,7 @@ public interface ClerkApiService {
*/
ServiceResponse
<
List
<
ClerkDTO
>>
listClerkByIds
(
Integer
enterpriseId
,
String
clerkIds
);
ServiceResponse
<
List
<
ClerkDTO
>>
listClerkByStoreI
d
(
Integer
enterpriseId
,
Integer
store
Id
,
String
search
);
ServiceResponse
<
List
<
ClerkDTO
>>
listClerkByStoreI
nfoId
(
Integer
enterpriseId
,
Integer
storeInfo
Id
,
String
search
);
/**
* 店长
...
...
gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkApiServiceImpl.java
View file @
356e476a
...
...
@@ -443,15 +443,11 @@ public class ClerkApiServiceImpl implements ClerkApiService {
}
@Override
public
ServiceResponse
<
List
<
ClerkDTO
>>
listClerkByStoreId
(
Integer
enterpriseId
,
Integer
storeId
,
String
search
)
{
ServiceResponse
<
StoreDTO
>
response
=
storeApiService
.
getStoreById
(
enterpriseId
,
storeId
);
if
(
response
.
isSuccess
()
&&
response
.
getResult
()
!=
null
)
{
List
<
Integer
>
storeInfoIds
=
new
ArrayList
<>();
storeInfoIds
.
add
(
response
.
getResult
().
getStoreInfoId
());
List
<
TabClerk
>
clerkList
=
this
.
clerkService
.
listClerkByStoreInfoId
(
enterpriseId
,
storeInfoIds
,
search
);
return
ServiceResponse
.
success
(
EntityUtil
.
changeEntityListByJSON
(
ClerkDTO
.
class
,
clerkList
));
}
return
ServiceResponse
.
success
();
public
ServiceResponse
<
List
<
ClerkDTO
>>
listClerkByStoreInfoId
(
Integer
enterpriseId
,
Integer
storeInfoId
,
String
search
)
{
List
<
Integer
>
storeInfoIds
=
new
ArrayList
<>();
storeInfoIds
.
add
(
storeInfoId
);
List
<
TabClerk
>
clerkList
=
this
.
clerkService
.
listClerkByStoreInfoId
(
enterpriseId
,
storeInfoIds
,
search
);
return
ServiceResponse
.
success
(
EntityUtil
.
changeEntityListByJSON
(
ClerkDTO
.
class
,
clerkList
));
}
@Override
...
...
gic-store-web/src/main/java/com/gic/store/web/controller/ClerkController.java
View file @
356e476a
...
...
@@ -291,7 +291,7 @@ public class ClerkController extends DownloadUtils {
@RequestMapping
(
"/list-clerk-in-store"
)
public
RestResponse
listClerkInStore
(
Integer
storeId
,
String
search
)
{
ServiceResponse
<
List
<
ClerkDTO
>>
serviceResponse
=
clerkApiService
.
listClerkByStoreId
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
(),
storeId
,
search
);
ServiceResponse
<
List
<
ClerkDTO
>>
serviceResponse
=
clerkApiService
.
listClerkByStoreI
nfoI
d
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
(),
storeId
,
search
);
return
ResultControllerUtils
.
commonResult
(
serviceResponse
);
}
...
...
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