Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
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
order-group-application
order-group
Commits
ec942dc6
Commit
ec942dc6
authored
Dec 01, 2020
by
邓杰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
配送进程
parent
3482fb59
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
3 deletions
+15
-3
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
+1
-1
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+1
-1
order-application-service/src/main/java/cn/freemud/utils/DateTimeUtil.java
+12
-0
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderOperationHistoryResp.java
+1
-1
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
View file @
ec942dc6
...
...
@@ -663,7 +663,7 @@ public class QueryOrdersResponse {
@NoArgsConstructor
@Data
public
static
class
OperationHistory
{
private
Stri
ng
createTime
;
private
Lo
ng
createTime
;
private
String
operationDesc
;
private
String
operationMethod
;
private
String
orderCode
;
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
ec942dc6
...
...
@@ -1124,7 +1124,7 @@ public class OrderServiceImpl implements Orderservice {
List
<
OrderRiderResponseVo
.
Operation
>
operationList
=
new
ArrayList
<>();
orderBean
.
getOrderOperationHistoryList
().
stream
().
forEach
(
operationHistory
->
{
OrderRiderResponseVo
.
Operation
operation
=
new
OrderRiderResponseVo
.
Operation
();
operation
.
setCreateTime
(
operationHistory
.
getCreateTime
(
));
operation
.
setCreateTime
(
DateTimeUtil
.
timeStampToTime
(
operationHistory
.
getCreateTime
()
));
operation
.
setOperationDesc
(
operationHistory
.
getOperationDesc
());
operation
.
setOperationMethod
(
operationHistory
.
getOperationMethod
());
operation
.
setOperator
(
operationHistory
.
getOperator
());
...
...
order-application-service/src/main/java/cn/freemud/utils/DateTimeUtil.java
View file @
ec942dc6
package
cn
.
freemud
.
utils
;
import
java.text.SimpleDateFormat
;
import
java.time.*
;
import
java.time.format.DateTimeFormatter
;
import
java.time.format.DateTimeParseException
;
...
...
@@ -280,5 +281,16 @@ public class DateTimeUtil {
public
static
String
getCurDateAfterTwentyYear
()
{
return
getCurrentLocalDate
().
plus
(
2
,
ChronoUnit
.
DECADES
).
format
(
DATE_FORMATTER
);
}
/**
* 时间戳转换成时间
* @param l 传入的时间戳
* @return 返回格式化时间
*/
public
static
String
timeStampToTime
(
Long
l
){
SimpleDateFormat
simpleDateFormat
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
Date
date
=
new
Date
(
l
);
String
res
=
simpleDateFormat
.
format
(
date
);
return
res
;
}
}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderOperationHistoryResp.java
View file @
ec942dc6
...
...
@@ -17,7 +17,7 @@ import lombok.Data;
@Data
public
class
OrderOperationHistoryResp
{
private
Stri
ng
createTime
;
private
Lo
ng
createTime
;
//操作描述
private
String
operationDesc
;
//操作方法
...
...
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