Commit ec942dc6 by 邓杰

配送进程

parent 3482fb59
...@@ -663,7 +663,7 @@ public class QueryOrdersResponse { ...@@ -663,7 +663,7 @@ public class QueryOrdersResponse {
@NoArgsConstructor @NoArgsConstructor
@Data @Data
public static class OperationHistory { public static class OperationHistory {
private String createTime; private Long createTime;
private String operationDesc; private String operationDesc;
private String operationMethod; private String operationMethod;
private String orderCode; private String orderCode;
......
...@@ -1124,7 +1124,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1124,7 +1124,7 @@ public class OrderServiceImpl implements Orderservice {
List<OrderRiderResponseVo.Operation> operationList = new ArrayList<>(); List<OrderRiderResponseVo.Operation> operationList = new ArrayList<>();
orderBean.getOrderOperationHistoryList().stream().forEach(operationHistory -> { orderBean.getOrderOperationHistoryList().stream().forEach(operationHistory -> {
OrderRiderResponseVo.Operation operation = new OrderRiderResponseVo.Operation(); OrderRiderResponseVo.Operation operation = new OrderRiderResponseVo.Operation();
operation.setCreateTime(operationHistory.getCreateTime()); operation.setCreateTime(DateTimeUtil.timeStampToTime(operationHistory.getCreateTime()));
operation.setOperationDesc(operationHistory.getOperationDesc()); operation.setOperationDesc(operationHistory.getOperationDesc());
operation.setOperationMethod(operationHistory.getOperationMethod()); operation.setOperationMethod(operationHistory.getOperationMethod());
operation.setOperator(operationHistory.getOperator()); operation.setOperator(operationHistory.getOperator());
......
package cn.freemud.utils; package cn.freemud.utils;
import java.text.SimpleDateFormat;
import java.time.*; import java.time.*;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException; import java.time.format.DateTimeParseException;
...@@ -280,5 +281,16 @@ public class DateTimeUtil { ...@@ -280,5 +281,16 @@ public class DateTimeUtil {
public static String getCurDateAfterTwentyYear() { public static String getCurDateAfterTwentyYear() {
return getCurrentLocalDate().plus(2, ChronoUnit.DECADES).format(DATE_FORMATTER); 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;
}
} }
...@@ -17,7 +17,7 @@ import lombok.Data; ...@@ -17,7 +17,7 @@ import lombok.Data;
@Data @Data
public class OrderOperationHistoryResp { public class OrderOperationHistoryResp {
private String createTime; private Long createTime;
//操作描述 //操作描述
private String operationDesc; private String operationDesc;
//操作方法 //操作方法
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment