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
2ea20328
Commit
2ea20328
authored
Aug 20, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
会员处理进度条
parent
6c2e4f9c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
3 deletions
+24
-3
StoreController.java
...in/java/com/gic/store/web/controller/StoreController.java
+22
-3
dubbo-gic-store-web.xml
gic-store-web/src/main/resources/dubbo-gic-store-web.xml
+2
-0
No files found.
gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java
View file @
2ea20328
...
...
@@ -22,7 +22,9 @@ import com.gic.enterprise.utils.LicenseUtils;
import
com.gic.enterprise.utils.ResultControllerUtils
;
import
com.gic.enterprise.utils.UserDetailUtils
;
import
com.gic.log.api.service.LogApiService
;
import
com.gic.member.api.dto.BatchTaskOperaInfDTO
;
import
com.gic.member.api.dto.StoreBatchUpdateDTO
;
import
com.gic.member.api.service.BatchOperationApiService
;
import
com.gic.member.api.service.StoreUpdateApiService
;
import
com.gic.redis.data.util.RedisUtil
;
import
com.gic.store.constant.*
;
...
...
@@ -52,9 +54,7 @@ import org.springframework.web.bind.annotation.RestController;
import
javax.servlet.http.HttpServletRequest
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.*
;
import
java.util.concurrent.ConcurrentHashMap
;
import
java.util.stream.Collectors
;
...
...
@@ -97,6 +97,8 @@ public class StoreController extends DownloadUtils {
private
EnterpriseApiService
enterpriseApiService
;
@Autowired
private
StoreTransferApiService
storeTransferApiService
;
@Autowired
private
BatchOperationApiService
batchOperationApiService
;
private
Map
<
Integer
,
SimpleDateFormat
>
map
=
new
ConcurrentHashMap
<>();
...
...
@@ -613,6 +615,23 @@ public class StoreController extends DownloadUtils {
return
EnterpriseRestResponse
.
failure
(
response
);
}
@RequestMapping
(
"process-store-member"
)
public
RestResponse
transferStoreMember
(){
ServiceResponse
<
List
<
BatchTaskOperaInfDTO
>>
resp
=
batchOperationApiService
.
queryUnderwayTask
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseId
());
if
(!
resp
.
isSuccess
())
{
return
ResultControllerUtils
.
commonResult
(
resp
);
}
List
<
BatchTaskOperaInfDTO
>
list
=
resp
.
getResult
();
if
(
CollectionUtils
.
isNotEmpty
(
list
))
{
List
<
BatchTaskOperaInfDTO
>
processList
=
list
.
stream
().
filter
(
e
->
e
.
getTaskType
()
==
17
).
collect
(
Collectors
.
toList
());
return
RestResponse
.
success
(
processList
);
}
return
RestResponse
.
success
(
Collections
.
emptyList
());
}
private
List
<
StoreListSourceVO
>
getStoreAllListSource
(
Integer
enterpriseId
)
{
List
<
StoreListSourceVO
>
list
=
new
ArrayList
<>();
ServiceResponse
<
List
<
StoreDictDTO
>>
serviceResponse
=
this
.
storeDictApiService
.
listStoreField
(
enterpriseId
);
...
...
gic-store-web/src/main/resources/dubbo-gic-store-web.xml
View file @
2ea20328
...
...
@@ -63,5 +63,6 @@
<dubbo:reference
interface=
"com.gic.enterprise.service.AuditLogApiService"
id=
"auditLogApiService"
timeout=
"6000"
/>
<dubbo:reference
interface=
"com.gic.enterprise.service.EnterpriseApiService"
id=
"enterpriseApiService"
timeout=
"6000"
/>
<dubbo:reference
interface=
"com.gic.store.service.DictApiService"
id=
"dictApiService"
timeout=
"6000"
/>
<dubbo:reference
interface=
"com.gic.member.api.service.BatchOperationApiService"
id=
"batchOperationApiService"
timeout=
"6000"
/>
</beans>
\ No newline at end of file
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