Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
order-center-tool-2
Project
Project
Details
Activity
Releases
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
陈文明
order-center-tool-2
Commits
5c3e5256
Commit
5c3e5256
authored
Apr 15, 2025
by
zhuxiaofeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
merge
parent
530a8e49
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
437 additions
and
37 deletions
+437
-37
ListSellerConst.java
...a/com/zm/order/tool/server/constants/ListSellerConst.java
+98
-1
ListSellerRefundConst.java
...zm/order/tool/server/constants/ListSellerRefundConst.java
+104
-5
ListSellerTempConst.java
...m/zm/order/tool/server/constants/ListSellerTempConst.java
+104
-6
UpgradeSellerLists.java
...om/zm/order/tool/server/constants/UpgradeSellerLists.java
+106
-0
OrderConvertTask.java
...a/com/zm/order/tool/server/listener/OrderConvertTask.java
+25
-25
No files found.
src/main/java/com/zm/order/tool/server/constants/ListSellerConst.java
View file @
5c3e5256
...
...
@@ -17,7 +17,7 @@ public class ListSellerConst {
static
{
//永和
list
.
add
(
216585L
);
list
.
add
(
218534L
);
list
.
add
(
218608L
);
list
.
add
(
220645L
);
...
...
@@ -26,6 +26,103 @@ public class ListSellerConst {
list
.
add
(
220641L
);
list
.
add
(
213637L
);
list
.
add
(
34639L
);
list
.
add
(
206429L
);
list
.
add
(
50331L
);
list
.
add
(
23200L
);
list
.
add
(
25666L
);
list
.
add
(
204846L
);
list
.
add
(
206246L
);
list
.
add
(
206458L
);
list
.
add
(
208369L
);
list
.
add
(
209446L
);
list
.
add
(
49756L
);
list
.
add
(
202295L
);
list
.
add
(
50405L
);
list
.
add
(
40978L
);
list
.
add
(
215950L
);
list
.
add
(
209268L
);
list
.
add
(
205302L
);
list
.
add
(
210191L
);
list
.
add
(
44416L
);
list
.
add
(
203228L
);
list
.
add
(
201242L
);
list
.
add
(
34727L
);
list
.
add
(
38353L
);
list
.
add
(
48685L
);
list
.
add
(
41446L
);
list
.
add
(
45986L
);
list
.
add
(
204097L
);
list
.
add
(
39718L
);
list
.
add
(
203947L
);
list
.
add
(
204500L
);
list
.
add
(
44361L
);
list
.
add
(
203286L
);
list
.
add
(
36048L
);
list
.
add
(
50694L
);
list
.
add
(
40481L
);
list
.
add
(
28969L
);
list
.
add
(
204399L
);
list
.
add
(
213865L
);
list
.
add
(
205955L
);
list
.
add
(
27321L
);
list
.
add
(
205244L
);
list
.
add
(
201912L
);
list
.
add
(
208765L
);
list
.
add
(
50926L
);
list
.
add
(
202242L
);
list
.
add
(
207207L
);
list
.
add
(
206005L
);
list
.
add
(
206970L
);
list
.
add
(
205537L
);
list
.
add
(
40686L
);
list
.
add
(
209315L
);
list
.
add
(
216048L
);
list
.
add
(
41447L
);
list
.
add
(
212850L
);
list
.
add
(
209264L
);
list
.
add
(
215809L
);
list
.
add
(
216121L
);
list
.
add
(
209618L
);
list
.
add
(
43737L
);
list
.
add
(
205523L
);
list
.
add
(
206405L
);
list
.
add
(
203997L
);
list
.
add
(
202373L
);
list
.
add
(
21466L
);
list
.
add
(
21349L
);
list
.
add
(
208035L
);
list
.
add
(
207420L
);
list
.
add
(
201691L
);
list
.
add
(
205268L
);
list
.
add
(
210669L
);
list
.
add
(
211492L
);
list
.
add
(
213753L
);
list
.
add
(
40061L
);
list
.
add
(
204338L
);
list
.
add
(
204787L
);
list
.
add
(
30251L
);
list
.
add
(
205784L
);
list
.
add
(
207915L
);
list
.
add
(
211162L
);
list
.
add
(
40583L
);
list
.
add
(
201075L
);
list
.
add
(
50380L
);
list
.
add
(
43780L
);
list
.
add
(
46611L
);
list
.
add
(
201438L
);
list
.
add
(
210117L
);
list
.
add
(
50408L
);
list
.
add
(
206562L
);
list
.
add
(
215143L
);
list
.
add
(
212229L
);
list
.
add
(
30842L
);
list
.
add
(
211077L
);
list
.
add
(
45750L
);
list
.
add
(
209669L
);
list
.
add
(
204923L
);
list
.
add
(
206286L
);
}
}
src/main/java/com/zm/order/tool/server/constants/ListSellerRefundConst.java
View file @
5c3e5256
...
...
@@ -16,13 +16,112 @@ public class ListSellerRefundConst {
public
static
List
<
Long
>
list
=
new
ArrayList
<>();
static
{
//85
list
.
add
(
204102L
);
//永和
list
.
add
(
203683L
);
list
.
add
(
49006L
);
list
.
add
(
216585L
);
list
.
add
(
218534L
);
list
.
add
(
218608L
);
list
.
add
(
220645L
);
list
.
add
(
220643L
);
list
.
add
(
220724L
);
list
.
add
(
220641L
);
list
.
add
(
213637L
);
list
.
add
(
34639L
);
list
.
add
(
206429L
);
list
.
add
(
50331L
);
list
.
add
(
23200L
);
list
.
add
(
25666L
);
list
.
add
(
204846L
);
list
.
add
(
206246L
);
list
.
add
(
206458L
);
list
.
add
(
208369L
);
list
.
add
(
209446L
);
list
.
add
(
49756L
);
list
.
add
(
202295L
);
list
.
add
(
50405L
);
list
.
add
(
40978L
);
list
.
add
(
215950L
);
list
.
add
(
209268L
);
list
.
add
(
205302L
);
list
.
add
(
210191L
);
list
.
add
(
44416L
);
list
.
add
(
203228L
);
list
.
add
(
201242L
);
list
.
add
(
34727L
);
list
.
add
(
38353L
);
list
.
add
(
48685L
);
list
.
add
(
41446L
);
list
.
add
(
45986L
);
list
.
add
(
204097L
);
list
.
add
(
39718L
);
list
.
add
(
203947L
);
list
.
add
(
204500L
);
list
.
add
(
44361L
);
list
.
add
(
203286L
);
list
.
add
(
36048L
);
list
.
add
(
50694L
);
list
.
add
(
40481L
);
list
.
add
(
28969L
);
list
.
add
(
204399L
);
list
.
add
(
213865L
);
list
.
add
(
205955L
);
list
.
add
(
27321L
);
list
.
add
(
205244L
);
list
.
add
(
201912L
);
list
.
add
(
208765L
);
list
.
add
(
50926L
);
list
.
add
(
202242L
);
list
.
add
(
207207L
);
list
.
add
(
206005L
);
list
.
add
(
206970L
);
list
.
add
(
205537L
);
list
.
add
(
40686L
);
list
.
add
(
209315L
);
list
.
add
(
216048L
);
list
.
add
(
41447L
);
list
.
add
(
212850L
);
list
.
add
(
209264L
);
list
.
add
(
215809L
);
list
.
add
(
216121L
);
list
.
add
(
209618L
);
list
.
add
(
43737L
);
list
.
add
(
205523L
);
list
.
add
(
206405L
);
list
.
add
(
203997L
);
list
.
add
(
202373L
);
list
.
add
(
21466L
);
list
.
add
(
21349L
);
list
.
add
(
208035L
);
list
.
add
(
207420L
);
list
.
add
(
201691L
);
list
.
add
(
205268L
);
list
.
add
(
210669L
);
list
.
add
(
211492L
);
list
.
add
(
213753L
);
list
.
add
(
40061L
);
list
.
add
(
204338L
);
list
.
add
(
204787L
);
list
.
add
(
30251L
);
list
.
add
(
205784L
);
list
.
add
(
207915L
);
list
.
add
(
211162L
);
list
.
add
(
40583L
);
list
.
add
(
201075L
);
list
.
add
(
50380L
);
list
.
add
(
43780L
);
list
.
add
(
46611L
);
list
.
add
(
201438L
);
list
.
add
(
210117L
);
list
.
add
(
50408L
);
list
.
add
(
206562L
);
list
.
add
(
215143L
);
list
.
add
(
212229L
);
list
.
add
(
30842L
);
list
.
add
(
211077L
);
list
.
add
(
45750L
);
list
.
add
(
209669L
);
list
.
add
(
204923L
);
list
.
add
(
206286L
);
}
}
src/main/java/com/zm/order/tool/server/constants/ListSellerTempConst.java
View file @
5c3e5256
...
...
@@ -16,13 +16,111 @@ public class ListSellerTempConst {
public
static
List
<
Long
>
list
=
new
ArrayList
<>();
static
{
//85
list
.
add
(
204102L
);
list
.
add
(
216585L
);
list
.
add
(
218534L
);
list
.
add
(
218608L
);
list
.
add
(
220645L
);
list
.
add
(
220643L
);
list
.
add
(
220724L
);
list
.
add
(
220641L
);
list
.
add
(
213637L
);
//永和
// list.add(203683L);
list
.
add
(
49006L
);
list
.
add
(
34639L
);
list
.
add
(
206429L
);
list
.
add
(
50331L
);
list
.
add
(
23200L
);
list
.
add
(
25666L
);
list
.
add
(
204846L
);
list
.
add
(
206246L
);
list
.
add
(
206458L
);
list
.
add
(
208369L
);
list
.
add
(
209446L
);
list
.
add
(
49756L
);
list
.
add
(
202295L
);
list
.
add
(
50405L
);
list
.
add
(
40978L
);
list
.
add
(
215950L
);
list
.
add
(
209268L
);
list
.
add
(
205302L
);
list
.
add
(
210191L
);
list
.
add
(
44416L
);
list
.
add
(
203228L
);
list
.
add
(
201242L
);
list
.
add
(
34727L
);
list
.
add
(
38353L
);
list
.
add
(
48685L
);
list
.
add
(
41446L
);
list
.
add
(
45986L
);
list
.
add
(
204097L
);
list
.
add
(
39718L
);
list
.
add
(
203947L
);
list
.
add
(
204500L
);
list
.
add
(
44361L
);
list
.
add
(
203286L
);
list
.
add
(
36048L
);
list
.
add
(
50694L
);
list
.
add
(
40481L
);
list
.
add
(
28969L
);
list
.
add
(
204399L
);
list
.
add
(
213865L
);
list
.
add
(
205955L
);
list
.
add
(
27321L
);
list
.
add
(
205244L
);
list
.
add
(
201912L
);
list
.
add
(
208765L
);
list
.
add
(
50926L
);
list
.
add
(
202242L
);
list
.
add
(
207207L
);
list
.
add
(
206005L
);
list
.
add
(
206970L
);
list
.
add
(
205537L
);
list
.
add
(
40686L
);
list
.
add
(
209315L
);
list
.
add
(
216048L
);
list
.
add
(
41447L
);
list
.
add
(
212850L
);
list
.
add
(
209264L
);
list
.
add
(
215809L
);
list
.
add
(
216121L
);
list
.
add
(
209618L
);
list
.
add
(
43737L
);
list
.
add
(
205523L
);
list
.
add
(
206405L
);
list
.
add
(
203997L
);
list
.
add
(
202373L
);
list
.
add
(
21466L
);
list
.
add
(
21349L
);
list
.
add
(
208035L
);
list
.
add
(
207420L
);
list
.
add
(
201691L
);
list
.
add
(
205268L
);
list
.
add
(
210669L
);
list
.
add
(
211492L
);
list
.
add
(
213753L
);
list
.
add
(
40061L
);
list
.
add
(
204338L
);
list
.
add
(
204787L
);
list
.
add
(
30251L
);
list
.
add
(
205784L
);
list
.
add
(
207915L
);
list
.
add
(
211162L
);
list
.
add
(
40583L
);
list
.
add
(
201075L
);
list
.
add
(
50380L
);
list
.
add
(
43780L
);
list
.
add
(
46611L
);
list
.
add
(
201438L
);
list
.
add
(
210117L
);
list
.
add
(
50408L
);
list
.
add
(
206562L
);
list
.
add
(
215143L
);
list
.
add
(
212229L
);
list
.
add
(
30842L
);
list
.
add
(
211077L
);
list
.
add
(
45750L
);
list
.
add
(
209669L
);
list
.
add
(
204923L
);
list
.
add
(
206286L
);
}
...
...
src/main/java/com/zm/order/tool/server/constants/UpgradeSellerLists.java
View file @
5c3e5256
...
...
@@ -1249,5 +1249,111 @@ public class UpgradeSellerLists {
LIST
.
add
(
220626L
);
LIST
.
add
(
220632L
);
LIST
.
add
(
220634L
);
LIST
.
add
(
218534L
);
LIST
.
add
(
218608L
);
LIST
.
add
(
220645L
);
LIST
.
add
(
220643L
);
LIST
.
add
(
220724L
);
LIST
.
add
(
220641L
);
LIST
.
add
(
213637L
);
LIST
.
add
(
34639L
);
LIST
.
add
(
206429L
);
LIST
.
add
(
50331L
);
LIST
.
add
(
23200L
);
LIST
.
add
(
25666L
);
LIST
.
add
(
204846L
);
LIST
.
add
(
206246L
);
LIST
.
add
(
206458L
);
LIST
.
add
(
208369L
);
LIST
.
add
(
209446L
);
LIST
.
add
(
49756L
);
LIST
.
add
(
202295L
);
LIST
.
add
(
50405L
);
LIST
.
add
(
40978L
);
LIST
.
add
(
215950L
);
LIST
.
add
(
209268L
);
LIST
.
add
(
205302L
);
LIST
.
add
(
210191L
);
LIST
.
add
(
44416L
);
LIST
.
add
(
203228L
);
LIST
.
add
(
201242L
);
LIST
.
add
(
34727L
);
LIST
.
add
(
38353L
);
LIST
.
add
(
48685L
);
LIST
.
add
(
41446L
);
LIST
.
add
(
45986L
);
LIST
.
add
(
204097L
);
LIST
.
add
(
39718L
);
LIST
.
add
(
203947L
);
LIST
.
add
(
204500L
);
LIST
.
add
(
44361L
);
LIST
.
add
(
203286L
);
LIST
.
add
(
36048L
);
LIST
.
add
(
50694L
);
LIST
.
add
(
40481L
);
LIST
.
add
(
28969L
);
LIST
.
add
(
204399L
);
LIST
.
add
(
213865L
);
LIST
.
add
(
205955L
);
LIST
.
add
(
27321L
);
LIST
.
add
(
205244L
);
LIST
.
add
(
201912L
);
LIST
.
add
(
208765L
);
LIST
.
add
(
50926L
);
LIST
.
add
(
202242L
);
LIST
.
add
(
207207L
);
LIST
.
add
(
206005L
);
LIST
.
add
(
206970L
);
LIST
.
add
(
205537L
);
LIST
.
add
(
40686L
);
LIST
.
add
(
209315L
);
LIST
.
add
(
216048L
);
LIST
.
add
(
41447L
);
LIST
.
add
(
212850L
);
LIST
.
add
(
209264L
);
LIST
.
add
(
215809L
);
LIST
.
add
(
216121L
);
LIST
.
add
(
209618L
);
LIST
.
add
(
43737L
);
LIST
.
add
(
205523L
);
LIST
.
add
(
206405L
);
LIST
.
add
(
203997L
);
LIST
.
add
(
202373L
);
LIST
.
add
(
21466L
);
LIST
.
add
(
21349L
);
LIST
.
add
(
208035L
);
LIST
.
add
(
207420L
);
LIST
.
add
(
201691L
);
LIST
.
add
(
205268L
);
LIST
.
add
(
210669L
);
LIST
.
add
(
211492L
);
LIST
.
add
(
213753L
);
LIST
.
add
(
40061L
);
LIST
.
add
(
204338L
);
LIST
.
add
(
204787L
);
LIST
.
add
(
30251L
);
LIST
.
add
(
205784L
);
LIST
.
add
(
207915L
);
LIST
.
add
(
211162L
);
LIST
.
add
(
40583L
);
LIST
.
add
(
201075L
);
LIST
.
add
(
50380L
);
LIST
.
add
(
43780L
);
LIST
.
add
(
46611L
);
LIST
.
add
(
201438L
);
LIST
.
add
(
210117L
);
LIST
.
add
(
50408L
);
LIST
.
add
(
206562L
);
LIST
.
add
(
215143L
);
LIST
.
add
(
212229L
);
LIST
.
add
(
30842L
);
LIST
.
add
(
211077L
);
LIST
.
add
(
45750L
);
LIST
.
add
(
209669L
);
LIST
.
add
(
204923L
);
LIST
.
add
(
206286L
);
}
}
src/main/java/com/zm/order/tool/server/listener/OrderConvertTask.java
View file @
5c3e5256
...
...
@@ -49,7 +49,7 @@ public class OrderConvertTask {
private
OrderRoutingRefundService
refundService
;
//
@Async
@Scheduled
(
cron
=
"0
50 22
* * ?"
)
@Scheduled
(
cron
=
"0
40 20
* * ?"
)
public
Result
execute1
()
{
Result
result
=
new
Result
();
try
{
...
...
@@ -65,7 +65,7 @@ public class OrderConvertTask {
}
@Async
@Scheduled
(
cron
=
"0
50 22
* * ?"
)
@Scheduled
(
cron
=
"0
45 20
* * ?"
)
public
Result
execute2
()
{
Result
result
=
new
Result
();
try
{
...
...
@@ -81,7 +81,7 @@ public class OrderConvertTask {
}
@Async
@Scheduled
(
cron
=
"0
50 22
* * ?"
)
@Scheduled
(
cron
=
"0
45 20
* * ?"
)
public
Result
execute3
()
{
Result
result
=
new
Result
();
try
{
...
...
@@ -98,7 +98,7 @@ public class OrderConvertTask {
}
@Async
@Scheduled
(
cron
=
"0
50 22
* * ?"
)
@Scheduled
(
cron
=
"0
45 20
* * ?"
)
public
Result
execute4
()
{
Result
result
=
new
Result
();
try
{
...
...
@@ -114,7 +114,7 @@ public class OrderConvertTask {
}
@Async
@Scheduled
(
cron
=
"0
50 22
* * ?"
)
@Scheduled
(
cron
=
"0
45 20
* * ?"
)
public
Result
execute5
()
{
Result
result
=
new
Result
();
try
{
...
...
@@ -130,7 +130,7 @@ public class OrderConvertTask {
}
@Async
@Scheduled
(
cron
=
"0
50 22
* * ?"
)
@Scheduled
(
cron
=
"0
45 20
* * ?"
)
public
Result
execute6
()
{
Result
result
=
new
Result
();
try
{
...
...
@@ -147,7 +147,7 @@ public class OrderConvertTask {
@Async
@Scheduled
(
cron
=
"0
50 22
* * ?"
)
@Scheduled
(
cron
=
"0
45 20
* * ?"
)
public
Result
execute7
()
{
Result
result
=
new
Result
();
try
{
...
...
@@ -164,7 +164,7 @@ public class OrderConvertTask {
@Async
@Scheduled
(
cron
=
"0
50 22
* * ?"
)
@Scheduled
(
cron
=
"0
45 20
* * ?"
)
public
Result
execute8
()
{
Result
result
=
new
Result
();
try
{
...
...
@@ -180,23 +180,23 @@ public class OrderConvertTask {
}
//
//
@Async
// @Scheduled(cron = "0 0
22 * * ?")
//
public Result executeRefund() {
//
Result result = new Result();
//
try {
//
logger.info("executeRefund[start]!");
//
refundService.refundConvertNew();
//
refundService.commentConvert();
//
refundService.itemCommentConvert();
//
logger.info("executeRefund[end]!");
//
result.setStatus(true);
//
} catch (Throwable e) {
//
logger.error("OrderConvertTask[execute] failed!, cause by:{}", e);
//
result.setException(ExceptionConstants.SYSTEM_ERROR);
//
}
//
return result;
//
}
@Async
@Scheduled
(
cron
=
"0 59
22 * * ?"
)
public
Result
executeRefund
()
{
Result
result
=
new
Result
();
try
{
logger
.
info
(
"executeRefund[start]!"
);
refundService
.
refundConvertNew
();
refundService
.
commentConvert
();
refundService
.
itemCommentConvert
();
logger
.
info
(
"executeRefund[end]!"
);
result
.
setStatus
(
true
);
}
catch
(
Throwable
e
)
{
logger
.
error
(
"OrderConvertTask[execute] failed!, cause by:{}"
,
e
);
result
.
setException
(
ExceptionConstants
.
SYSTEM_ERROR
);
}
return
result
;
}
...
...
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