Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gdtel-gztel-school-center
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
吴学德
gdtel-gztel-school-center
Commits
d74996cd
Commit
d74996cd
authored
Feb 21, 2020
by
黄森林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
智能平台推送信息接口优化
parent
b3d259e4
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
12 deletions
+11
-12
service-manager/src/main/java/com/winsun/controller/IntelligentPlatformPushController.java
+11
-12
No files found.
service-manager/src/main/java/com/winsun/controller/IntelligentPlatformPushController.java
View file @
d74996cd
...
...
@@ -38,15 +38,6 @@ public class IntelligentPlatformPushController {
/**
* 智能平台推送信息接收
* 订单状态(转义后的状态)与智能平台受理状态对照表:
* 状态ID 状态名称 智能平台状态
* 6 待配送 待配送
* 7 物流配送中 物流配货中、物流配送中、重发配送【待跟进】、待分销商审核
* 8 配送成功 配送成功【待收费】
* 4 归档 归档
* 5 作废 作废、分销商作废
* 10 受理异常 受理异常
* 2 待受理 待撤单
*
* @param sign
* @param type
...
...
@@ -77,8 +68,16 @@ public class IntelligentPlatformPushController {
Wrapper
<
Object
>
wrapper
=
new
EntityWrapper
<>();
wrapper
.
eq
(
"order_id"
,
signMap
.
get
(
"orderNum"
));
String
status
=
signMap
.
get
(
"status"
).
toString
();
String
orderStatus
=
OrderStatus
.
findById
(
signMap
.
get
(
"statusId"
).
toString
()).
getName
();
Integer
num
=
orderViewMapper
.
IntelligentPlatformPush
(
wrapper
,
status
,
orderStatus
);
String
orderStatus
=
null
;
try
{
orderStatus
=
OrderStatus
.
findById
(
signMap
.
get
(
"statusId"
).
toString
()).
getName
();
}
catch
(
Exception
e
)
{
resultMap
.
put
(
"code"
,
"12001"
);
resultMap
.
put
(
"msg"
,
"订单状态不存在"
);
log
.
error
(
e
.
getMessage
(),
e
);
return
resultMap
;
}
Integer
num
=
orderViewMapper
.
IntelligentPlatformPush
(
wrapper
,
status
,
orderStatus
);
if
(
num
>
0
)
{
if
(
type
.
equals
(
"dkd"
)
||
type
.
equals
(
"rh"
))
{
Wrapper
<
OrderView
>
wrapper1
=
new
EntityWrapper
<>();
...
...
@@ -111,7 +110,7 @@ public class IntelligentPlatformPushController {
return
resultMap
;
}
else
{
log
.
info
(
"更新失败"
);
resultMap
.
put
(
"code"
,
"
00
001"
);
resultMap
.
put
(
"code"
,
"
12
001"
);
resultMap
.
put
(
"msg"
,
"智能平台订单号不能为空"
);
}
...
...
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