From 5118be73667b82ffde9553ba4ac52cc0d7facd25 Mon Sep 17 00:00:00 2001 From: czc Date: Fri, 21 Jul 2023 18:33:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cyl/manager/oms/pojo/vo/ManagerOrderDetailVO.java | 2 ++ .../src/main/java/com/cyl/manager/oms/service/OrderService.java | 1 + 2 files changed, 3 insertions(+) diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderDetailVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderDetailVO.java index 9f9ffe4..ff75f25 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderDetailVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderDetailVO.java @@ -33,6 +33,8 @@ public class ManagerOrderDetailVO { private List productInfo; @ApiModelProperty("发货时间") private LocalDateTime deliveryTime; + @ApiModelProperty("收货时间") + private LocalDateTime receiveTime; @ApiModelProperty("物流单号") private String expressNo; @ApiModelProperty("物流名称") diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java index 2619b6c..be77802 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/service/OrderService.java @@ -120,6 +120,7 @@ public class OrderService { managerOrderDetailVO.setPayType(order.getPayType()); managerOrderDetailVO.setTotalAmount(order.getTotalAmount()); managerOrderDetailVO.setPayAmount(order.getPayAmount()); + managerOrderDetailVO.setReceiveTime(order.getReceiveTime()); //封装订单地址信息 ManagerOrderAddressVo managerOrderAddressVo = new ManagerOrderAddressVo(); managerOrderAddressVo.setUserPhone(order.getReceiverPhone());