From 847d7f8c8ee81988b242614f782dd766291fb441 Mon Sep 17 00:00:00 2001 From: chuzhichao Date: Mon, 3 Jul 2023 09:59:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=8F=91=E8=B4=A7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cyl/manager/oms/pojo/vo/ManagerOrderVO.java | 6 ++++++ ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml | 2 ++ 2 files changed, 8 insertions(+) diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderVO.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderVO.java index 63481ea..3e64ce1 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/vo/ManagerOrderVO.java @@ -75,6 +75,12 @@ public class ManagerOrderVO { @ApiModelProperty(name = "productInfo", value = "订单商品数据") private List productList; + @ApiModelProperty(name = "deliveryTime",value = "发货时间",required = true,dataType = "LocalDataTime") + private Date deliveryTime; + + @ApiModelProperty(name = "deliverySn",value = "物流单号",required = true,dataType = "String") + private String deliverySn; + private String receiverName; private String receiverPhone; diff --git a/ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml b/ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml index 676bbaa..83c080a 100644 --- a/ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml +++ b/ruoyi-mall/src/main/resources/mapper/oms/OrderMapper.xml @@ -102,6 +102,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.receiver_city receiverCity, a.receiver_district receiverDistrict, a.receiver_detail_address receiverDetailAddress, + a.delivery_time deliveryTime, + a.delivery_sn deliverySn, -- b.quantity buyNum, -- b.pic, -- b.sp_data spData,