Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
holmes
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
QA
holmes
Commits
bf444748
Commit
bf444748
authored
Mar 04, 2022
by
黎博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增/api/order/orderTrack接口
parent
0436b17b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
128 additions
and
0 deletions
+128
-0
OrderController.java
...olmes/controller/mock/keystone/jdbuy/OrderController.java
+64
-0
JdOrderTrackRequest.java
...olmes/entity/mock/keystone/jdbuy/JdOrderTrackRequest.java
+13
-0
JdOrderTrackResponse.java
...lmes/entity/mock/keystone/jdbuy/JdOrderTrackResponse.java
+51
-0
No files found.
src/main/java/cn/qg/holmes/controller/mock/keystone/jdbuy/OrderController.java
View file @
bf444748
...
@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.PostMapping;
...
@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.text.ParseException
;
import
java.util.*
;
import
java.util.*
;
@Slf4j
@Slf4j
...
@@ -188,6 +189,69 @@ public class OrderController {
...
@@ -188,6 +189,69 @@ public class OrderController {
return
response
;
return
response
;
}
}
/**
* 7.8 查询配送信息
*/
@PostMapping
(
"/api/order/orderTrack"
)
public
JdOrderTrackResponse
getOrderTrack
(
JdOrderTrackRequest
request
)
throws
ParseException
{
String
jdOrderId
=
request
.
getJdOrderId
();
JdOrderTrackResponse
response
=
new
JdOrderTrackResponse
();
response
.
setSuccess
(
true
);
response
.
setResultMessage
(
""
);
response
.
setResultCode
(
"0000"
);
JdOrderTrackResponse
.
OrderTrackInfo
orderTrackInfo
=
new
JdOrderTrackResponse
.
OrderTrackInfo
();
List
<
JdOrderTrackResponse
.
OrderTrack
>
orderTrackList
=
new
ArrayList
<>();
List
<
JdOrderTrackResponse
.
WaybillCode
>
waybillCodeList
=
new
ArrayList
<>();
JdOrderTrackResponse
.
OrderTrack
orderTrack1
=
new
JdOrderTrackResponse
.
OrderTrack
();
JdOrderTrackResponse
.
OrderTrack
orderTrack2
=
new
JdOrderTrackResponse
.
OrderTrack
();
JdOrderTrackResponse
.
OrderTrack
orderTrack3
=
new
JdOrderTrackResponse
.
OrderTrack
();
JdOrderTrackResponse
.
OrderTrack
orderTrack4
=
new
JdOrderTrackResponse
.
OrderTrack
();
JdOrderTrackResponse
.
OrderTrack
orderTrack5
=
new
JdOrderTrackResponse
.
OrderTrack
();
JdOrderTrackResponse
.
WaybillCode
waybillCode
=
new
JdOrderTrackResponse
.
WaybillCode
();
orderTrack1
.
setContent
(
"您提交了订单,请等待系统确认"
);
orderTrack1
.
setMsgTime
(
DateUtils
.
convertStr
(
"2022-03-01 23:27:13"
,
"yyyy-MM-dd hh:mm:ss"
));
orderTrack1
.
setOperator
(
"客户"
);
orderTrack2
.
setContent
(
"温馨提示:您的订单将由京东指定厂家为您发货,请您耐心等待"
);
orderTrack2
.
setMsgTime
(
DateUtils
.
convertStr
(
"2022-03-01 23:27:45"
,
"yyyy-MM-dd hh:mm:ss"
));
orderTrack2
.
setOperator
(
"系统"
);
orderTrack3
.
setContent
(
"您的订单正在出库,请耐心等待"
);
orderTrack3
.
setMsgTime
(
DateUtils
.
convertStr
(
"2022-03-02 15:22:34"
,
"yyyy-MM-dd hh:mm:ss"
));
orderTrack3
.
setOperator
(
"系统"
);
orderTrack4
.
setContent
(
"您的订单已交付京东快递, 运单号为JDVC12992534651"
);
orderTrack4
.
setMsgTime
(
DateUtils
.
convertStr
(
"2022-03-02 15:25:01"
,
"yyyy-MM-dd hh:mm:ss"
));
orderTrack4
.
setOperator
(
"系统"
);
orderTrack5
.
setContent
(
"您的订单开始配送"
);
orderTrack5
.
setMsgTime
(
DateUtils
.
convertStr
(
"2022-03-03 10:22:34"
,
"yyyy-MM-dd hh:mm:ss"
));
orderTrack5
.
setOperator
(
"京东快递"
);
orderTrackList
.
add
(
orderTrack1
);
orderTrackList
.
add
(
orderTrack2
);
orderTrackList
.
add
(
orderTrack3
);
orderTrackList
.
add
(
orderTrack4
);
orderTrackList
.
add
(
orderTrack5
);
waybillCode
.
setOrderId
(
Long
.
valueOf
(
jdOrderId
));
waybillCode
.
setCarrier
(
"京东快递"
);
waybillCode
.
setDeliveryOrderId
(
"JDVD02626228685"
);
waybillCode
.
setParentId
(
0L
);
waybillCodeList
.
add
(
waybillCode
);
orderTrackInfo
.
setJdOrderId
(
jdOrderId
);
orderTrackInfo
.
setOrderTrack
(
orderTrackList
);
orderTrackInfo
.
setWaybillCode
(
waybillCodeList
);
response
.
setResult
(
orderTrackInfo
);
return
response
;
}
/**
/**
* 11.1 查询推送消息
* 11.1 查询推送消息
*
*
...
...
src/main/java/cn/qg/holmes/entity/mock/keystone/jdbuy/JdOrderTrackRequest.java
0 → 100644
View file @
bf444748
package
cn
.
qg
.
holmes
.
entity
.
mock
.
keystone
.
jdbuy
;
import
lombok.Data
;
@Data
public
class
JdOrderTrackRequest
{
private
String
token
;
private
String
jdOrderId
;
private
Integer
waybillCode
=
1
;
}
src/main/java/cn/qg/holmes/entity/mock/keystone/jdbuy/JdOrderTrackResponse.java
0 → 100644
View file @
bf444748
package
cn
.
qg
.
holmes
.
entity
.
mock
.
keystone
.
jdbuy
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
lombok.Data
;
import
java.util.Date
;
import
java.util.List
;
/**
* 7.8 查询配送信息
*/
@Data
public
class
JdOrderTrackResponse
extends
JdBaseResponse
{
private
static
final
String
TIME_FORMAT_YYYYMMDDHHMMSS
=
"yyyy-MM-dd HH:mm:ss"
;
private
OrderTrackInfo
result
;
@Data
public
static
class
OrderTrackInfo
{
private
List
<
OrderTrack
>
orderTrack
;
private
String
jdOrderId
;
private
List
<
WaybillCode
>
waybillCode
;
}
@Data
public
static
class
OrderTrack
{
private
String
content
;
//操作内容明细
@JsonFormat
(
timezone
=
"GMT+8"
,
pattern
=
TIME_FORMAT_YYYYMMDDHHMMSS
)
private
Date
msgTime
;
//操作时间
private
String
operator
;
//操作员名称
}
@Data
public
static
class
WaybillCode
{
private
Long
orderId
;
//订单号
private
Long
parentId
;
//父订单号
private
String
carrier
;
//承运商
private
String
deliveryOrderId
;
//运单号
}
}
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