From df5ae268717034c1e443008cb558e585702a528f Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Tue, 8 Sep 2020 15:49:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85vo=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E7=B1=BB=E5=9E=8B=E5=A6=82=E6=9E=9C=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4express?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../co/yixiang/modules/order/vo/YxStoreOrderQueryVo.java  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/vo/YxStoreOrderQueryVo.java b/yshop-mall/src/main/java/co/yixiang/modules/order/vo/YxStoreOrderQueryVo.java
index c5edb2a4..39f4ae8f 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/order/vo/YxStoreOrderQueryVo.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/order/vo/YxStoreOrderQueryVo.java
@@ -1,6 +1,7 @@
 package co.yixiang.modules.order.vo;
 
 
+import cn.hutool.core.util.StrUtil;
 import co.yixiang.modules.cart.vo.YxStoreCartQueryVo;
 import co.yixiang.modules.order.service.dto.StatusDto;
 import co.yixiang.modules.product.vo.YxSystemStoreQueryVo;
@@ -127,6 +128,12 @@ public class YxStoreOrderQueryVo implements Serializable {
     @ApiModelProperty(value = "发货类型")
     private String deliveryType;
 
+    public String getDeliveryType() {
+        if(StrUtil.isBlank(deliveryType)) return "express";
+        return deliveryType;
+    }
+
+
     @ApiModelProperty(value = "快递单号/手机号")
     private String deliveryId;
 
@@ -177,6 +184,7 @@ public class YxStoreOrderQueryVo implements Serializable {
     @ApiModelProperty(value = "配送方式 1=快递 ，2=门店自提")
     private Integer shippingType;
 
+
     @ApiModelProperty(value = "支付渠道(0微信公众号1微信小程序)")
     private Integer isChannel;