diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderInfoVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderInfoVO.java index fd80c449d..72d4e27b5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderInfoVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderInfoVO.java @@ -328,6 +328,66 @@ public class StoreOrderInfoVO { */ @ApiModelProperty(value = "物流运单号(快递单号),档口/用户自己填写时可能存在多个,使用“,”分割") private String expressWaybillNo; + /** + * 发货人-名称 + */ + @ApiModelProperty(value = "发货人-名称") + private String originContactName; + /** + * 发货人-电话 + */ + @ApiModelProperty(value = "发货人-电话") + private String originContactPhoneNumber; + /** + * 发货人-省编码 + */ + @ApiModelProperty(value = "发货人-省编码") + private String originProvinceCode; + /** + * 发货人-市编码 + */ + @ApiModelProperty(value = "发货人-市编码") + private String originCityCode; + /** + * 发货人-区县编码 + */ + @ApiModelProperty(value = "发货人-区县编码") + private String originCountyCode; + /** + * 发货人-详细地址 + */ + @ApiModelProperty(value = "发货人-详细地址") + private String originDetailAddress; + /** + * 收货人-名称 + */ + @ApiModelProperty(value = "收货人-名称") + private String destinationContactName; + /** + * 收货人-电话 + */ + @ApiModelProperty(value = "收货人-电话") + private String destinationContactPhoneNumber; + /** + * 收货人-省编码 + */ + @ApiModelProperty(value = "收货人-省编码") + private String destinationProvinceCode; + /** + * 收货人-市编码 + */ + @ApiModelProperty(value = "收货人-市编码") + private String destinationCityCode; + /** + * 收货人-区县编码 + */ + @ApiModelProperty(value = "收货人-区县编码") + private String destinationCountyCode; + /** + * 收货人-详细地址 + */ + @ApiModelProperty(value = "收货人-详细地址") + private String destinationDetailAddress; /** * 商品单价 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderPageItemVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderPageItemVO.java index 10e482bed..84bc0865c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderPageItemVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderPageItemVO.java @@ -321,6 +321,66 @@ public class StoreOrderPageItemVO extends StoreOrderDTO { */ @ApiModelProperty(value = "物流运单号(快递单号),档口/用户自己填写时可能存在多个,使用“,”分割") private String expressWaybillNo; + /** + * 发货人-名称 + */ + @ApiModelProperty(value = "发货人-名称") + private String originContactName; + /** + * 发货人-电话 + */ + @ApiModelProperty(value = "发货人-电话") + private String originContactPhoneNumber; + /** + * 发货人-省编码 + */ + @ApiModelProperty(value = "发货人-省编码") + private String originProvinceCode; + /** + * 发货人-市编码 + */ + @ApiModelProperty(value = "发货人-市编码") + private String originCityCode; + /** + * 发货人-区县编码 + */ + @ApiModelProperty(value = "发货人-区县编码") + private String originCountyCode; + /** + * 发货人-详细地址 + */ + @ApiModelProperty(value = "发货人-详细地址") + private String originDetailAddress; + /** + * 收货人-名称 + */ + @ApiModelProperty(value = "收货人-名称") + private String destinationContactName; + /** + * 收货人-电话 + */ + @ApiModelProperty(value = "收货人-电话") + private String destinationContactPhoneNumber; + /** + * 收货人-省编码 + */ + @ApiModelProperty(value = "收货人-省编码") + private String destinationProvinceCode; + /** + * 收货人-市编码 + */ + @ApiModelProperty(value = "收货人-市编码") + private String destinationCityCode; + /** + * 收货人-区县编码 + */ + @ApiModelProperty(value = "收货人-区县编码") + private String destinationCountyCode; + /** + * 收货人-详细地址 + */ + @ApiModelProperty(value = "收货人-详细地址") + private String destinationDetailAddress; /** * 商品单价 */