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
2c4aa533
Commit
2c4aa533
authored
Apr 30, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
6e5f1a0c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
CreateTypeEnum.java
.../src/main/java/com/gic/store/constant/CreateTypeEnum.java
+5
-5
ClerkApiServiceImpl.java
...com/gic/store/service/outer/impl/ClerkApiServiceImpl.java
+1
-1
No files found.
gic-store-api/src/main/java/com/gic/store/constant/CreateTypeEnum.java
View file @
2c4aa533
...
...
@@ -7,12 +7,12 @@ package com.gic.store.constant;
public
enum
CreateTypeEnum
{
BACKGROUND_ADD
(
1
,
"后台新增"
),
BATCH_IMPORT
(
2
,
"批量导入"
),
ORDER
(
3
,
"
订单生成
"
),
ERP
(
4
,
"
erp
同步"
),
ORDER
(
3
,
"
增量订单同步
"
),
ERP
(
4
,
"
ERP
同步"
),
API
(
5
,
"API接口"
),
MEMBER
(
6
,
"
会员生成
"
),
BULKORDER
(
7
,
"批量
导入订单
"
),
BULKMEMBER
(
8
,
"批量
导入会员
"
)
MEMBER
(
6
,
"
增量会员同步
"
),
BULKORDER
(
7
,
"批量
订单同步
"
),
BULKMEMBER
(
8
,
"批量
会员同步
"
)
;
...
...
gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkApiServiceImpl.java
View file @
2c4aa533
...
...
@@ -181,7 +181,7 @@ public class ClerkApiServiceImpl implements ClerkApiService {
// 查询条件对应的storeId
String
storeIdByClerkSearch
;
if
(
StringUtils
.
isNotBlank
(
clerkSearchDTO
.
getSearch
()))
{
List
<
Integer
>
storeInfoIdsBySearch
=
clerkService
.
getStoreInfoIdsBySearch
(
enterpriseId
,
null
);
List
<
Integer
>
storeInfoIdsBySearch
=
clerkService
.
getStoreInfoIdsBySearch
(
enterpriseId
,
clerkSearchDTO
.
getSearch
()
);
if
(
CollectionUtils
.
isEmpty
(
groupIds
)
||
CollectionUtils
.
isEmpty
(
storeInfoIdsBySearch
))
{
storeIdByClerkSearch
=
""
;
}
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