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());