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
c50d492a
Commit
c50d492a
authored
Nov 06, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加提示
parent
df36199e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
4 deletions
+12
-4
StoreController.java
...in/java/com/gic/store/web/controller/StoreController.java
+12
-4
No files found.
gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java
View file @
c50d492a
...
...
@@ -406,7 +406,10 @@ public class StoreController extends DownloadUtils {
// 如果是批量修改状态 要转移门店
ServiceResponse
<
Void
>
serviceResponse
=
storeTransferApiService
.
save
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
(),
storeIds
,
toStoreId
);
}
tranMemberStore
(
storeIds
,
memberTransStoreId
,
memberTransType
);
ServiceResponse
<
Boolean
>
serviceResponse
=
tranMemberStore
(
storeIds
,
memberTransStoreId
,
memberTransType
);
if
(!
serviceResponse
.
isSuccess
())
{
logger
.
warn
(
"转移会员失败:{}"
,
serviceResponse
.
getMessage
());
}
// 写日志
String
[]
storeArr
=
storeIds
.
split
(
","
);
StoreSearchDTO
storeSearchDTO
=
new
StoreSearchDTO
();
...
...
@@ -436,7 +439,7 @@ public class StoreController extends DownloadUtils {
return
EnterpriseRestResponse
.
failure
(
response
);
}
private
void
tranMemberStore
(
String
storeIds
,
Integer
memberTransStoreId
,
Integer
memberTransType
)
{
private
ServiceResponse
<
Boolean
>
tranMemberStore
(
String
storeIds
,
Integer
memberTransStoreId
,
Integer
memberTransType
)
{
if
(
memberTransStoreId
!=
null
&&
memberTransType
!=
null
)
{
List
<
StoreDTO
>
storeInfoList
;
StoreSearchDTO
storeSearchDTO
=
new
StoreSearchDTO
();
...
...
@@ -449,8 +452,10 @@ public class StoreController extends DownloadUtils {
}
Integer
storeInfoId
=
storeApiService
.
getStoreById
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
(),
memberTransStoreId
).
getResult
().
getStoreInfoId
();
List
<
Integer
>
storeInfoIdList
=
storeInfoList
.
stream
().
map
(
StoreInfoDTO:
:
getStoreInfoId
).
collect
(
Collectors
.
toList
());
userOwnerApiService
.
transferStore
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
(),
storeInfoIdList
,
storeInfoId
,
memberTransType
);
ServiceResponse
<
Boolean
>
serviceResponse
=
userOwnerApiService
.
transferStore
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
(),
storeInfoIdList
,
storeInfoId
,
memberTransType
);
return
serviceResponse
;
}
return
null
;
}
@RequestMapping
(
"list-store-export-field"
)
...
...
@@ -645,7 +650,10 @@ public class StoreController extends DownloadUtils {
if
(
StringUtils
.
isNotBlank
(
cacheStoreId
))
{
return
RestResponse
.
failure
(
ErrorCode
.
OPERATION_FAILED
.
getCode
(),
"请其他门店会员转移完毕后再试"
);
}
tranMemberStore
(
storeId
,
toStoreId
,
memberTransType
);
ServiceResponse
<
Boolean
>
serviceResponse
=
tranMemberStore
(
storeId
,
toStoreId
,
memberTransType
);
if
(!
serviceResponse
.
isSuccess
())
{
return
EnterpriseRestResponse
.
failure
(
ErrorCode
.
UNKNOWN_ERROR
.
getCode
(),
serviceResponse
.
getMessage
());
}
cacheMap
.
put
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
(),
storeId
);
String
[]
split
=
storeId
.
split
(
","
);
for
(
String
store
:
split
)
{
...
...
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