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
cd5e9c75
Commit
cd5e9c75
authored
Oct 21, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
导购交互优化
parent
d267d315
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
2 deletions
+23
-2
ClerkSearchTypeEnum.java
...main/java/com/gic/store/constant/ClerkSearchTypeEnum.java
+20
-0
ClerkController.java
...in/java/com/gic/store/web/controller/ClerkController.java
+3
-2
No files found.
gic-store-api/src/main/java/com/gic/store/constant/ClerkSearchTypeEnum.java
0 → 100644
View file @
cd5e9c75
package
com
.
gic
.
store
.
constant
;
/**
* @author zhiwj
* @Description:
* @date 2020-10-21 11:30
*/
public
enum
ClerkSearchTypeEnum
{
CLERK
(
1
),
STORE
(
2
);
private
Integer
type
;
ClerkSearchTypeEnum
(
Integer
type
)
{
this
.
type
=
type
;
}
public
Integer
getType
()
{
return
type
;
}
}
gic-store-web/src/main/java/com/gic/store/web/controller/ClerkController.java
View file @
cd5e9c75
...
@@ -18,6 +18,7 @@ import com.gic.enterprise.service.QrCodeApiService;
...
@@ -18,6 +18,7 @@ import com.gic.enterprise.service.QrCodeApiService;
import
com.gic.enterprise.utils.ResultControllerUtils
;
import
com.gic.enterprise.utils.ResultControllerUtils
;
import
com.gic.enterprise.utils.UserDetailUtils
;
import
com.gic.enterprise.utils.UserDetailUtils
;
import
com.gic.store.constant.ClerkLogReasonEnum
;
import
com.gic.store.constant.ClerkLogReasonEnum
;
import
com.gic.store.constant.ClerkSearchTypeEnum
;
import
com.gic.store.dto.ClerkDTO
;
import
com.gic.store.dto.ClerkDTO
;
import
com.gic.store.dto.ClerkLogDTO
;
import
com.gic.store.dto.ClerkLogDTO
;
import
com.gic.store.dto.ClerkSearchDTO
;
import
com.gic.store.dto.ClerkSearchDTO
;
...
@@ -252,7 +253,7 @@ public class ClerkController extends DownloadUtils {
...
@@ -252,7 +253,7 @@ public class ClerkController extends DownloadUtils {
public
RestResponse
listClerk
(
@RequestBody
ClerkSearchDTO
clerkSearchDTO
)
{
public
RestResponse
listClerk
(
@RequestBody
ClerkSearchDTO
clerkSearchDTO
)
{
Integer
enterpriseId
=
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
();
Integer
enterpriseId
=
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
();
clerkSearchDTO
.
setEnterpriseId
(
enterpriseId
);
clerkSearchDTO
.
setEnterpriseId
(
enterpriseId
);
if
(
clerkSearchDTO
.
getSearchType
()
==
2
)
{
if
(
ClerkSearchTypeEnum
.
STORE
.
getType
().
equals
(
clerkSearchDTO
.
getSearchType
())
)
{
// 如果是查询门店 查询参数其实是storeSearch
// 如果是查询门店 查询参数其实是storeSearch
String
search
=
clerkSearchDTO
.
getSearch
();
String
search
=
clerkSearchDTO
.
getSearch
();
clerkSearchDTO
.
setStoreSearch
(
search
);
clerkSearchDTO
.
setStoreSearch
(
search
);
...
@@ -281,7 +282,7 @@ public class ClerkController extends DownloadUtils {
...
@@ -281,7 +282,7 @@ public class ClerkController extends DownloadUtils {
public
RestResponse
countClerk
(
@RequestBody
ClerkSearchDTO
clerkSearchDTO
)
{
public
RestResponse
countClerk
(
@RequestBody
ClerkSearchDTO
clerkSearchDTO
)
{
Integer
enterpriseId
=
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
();
Integer
enterpriseId
=
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
();
clerkSearchDTO
.
setEnterpriseId
(
enterpriseId
);
clerkSearchDTO
.
setEnterpriseId
(
enterpriseId
);
if
(
clerkSearchDTO
.
getSearchType
()
==
2
)
{
if
(
ClerkSearchTypeEnum
.
STORE
.
getType
().
equals
(
clerkSearchDTO
.
getSearchType
())
)
{
// 如果是查询门店 查询参数其实是storeSearch
// 如果是查询门店 查询参数其实是storeSearch
String
search
=
clerkSearchDTO
.
getSearch
();
String
search
=
clerkSearchDTO
.
getSearch
();
clerkSearchDTO
.
setStoreSearch
(
search
);
clerkSearchDTO
.
setStoreSearch
(
search
);
...
...
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