user/role/tright 7.10

src/main/java/com/pangding/web/authority/vo/OrderRelVo.java

+package com.pangding.web.authority.vo;
+
+import com.yanzuoguang.dao.TableAnnotation;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/7/10 18:03
+ */
+@TableAnnotation("pd_order_rel")
+public class OrderRelVo {
+    private String id;
+    private String group_ordersn;
+    private String ordersn;
+
+    /**
+     * 商品类型   1 景区  2 酒店  3餐饮  4  特产
+     */
+    private String good_type;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getGroup_ordersn() {
+        return group_ordersn;
+    }
+
+    public void setGroup_ordersn(String group_ordersn) {
+        this.group_ordersn = group_ordersn;
+    }
+
+    public String getOrdersn() {
+        return ordersn;
+    }
+
+    public void setOrdersn(String ordersn) {
+        this.ordersn = ordersn;
+    }
+
+    public String getGood_type() {
+        return good_type;
+    }
+
+    public void setGood_type(String good_type) {
+        this.good_type = good_type;
+    }
+}

src/main/java/com/pangding/web/authority/vo/TyyOrderMixVo.java

@@ -16,14 +16,14 @@ public class TyyOrderMixVo {
     private String paytype;
     private String paymenttime;
     private String paystatus;
-    private Integer order_status;
+    private String order_status;
     private String piaostorderid;
     private String memberid;
     private String enterpriseid;
     private String usertel;
     private String ordertime;
     private Double purchaseprice;
-    private Integer sub_order_type;
+    private String sub_order_type;
     private String emancipated;
     private String emancipated_date;
     private String profit_checked;
@@ -133,11 +133,11 @@ public class TyyOrderMixVo {
         this.paystatus = paystatus;
     }
 
-    public Integer getOrder_status() {
+    public String getOrder_status() {
         return order_status;
     }
 
-    public void setOrder_status(Integer order_status) {
+    public void setOrder_status(String order_status) {
         this.order_status = order_status;
     }
 
@@ -189,11 +189,11 @@ public class TyyOrderMixVo {
         this.purchaseprice = purchaseprice;
     }
 
-    public Integer getSub_order_type() {
+    public String getSub_order_type() {
         return sub_order_type;
     }
 
-    public void setSub_order_type(Integer sub_order_type) {
+    public void setSub_order_type(String sub_order_type) {
         this.sub_order_type = sub_order_type;
     }
 

src/main/java/com/pangding/web/authority/vo/TyyOrderVo.java

@@ -97,13 +97,13 @@ public class TyyOrderVo {
      * 订单状态
      * 0,待付款、1,已付款（出票中）、2,成功出票、3,核销中、4,核销完成、5,部分退款、6,全部退款、7,已取消
      */
-    private Integer order_status;
+    private String order_status;
 
     private String create_date;
     /**
      * 付款类型 0：微信  1:支付宝 2:通联
      */
-    private Integer pay_type;
+    private String pay_type;
     /**
      * 付款凭证编号
      */
@@ -299,11 +299,11 @@ public class TyyOrderVo {
         this.refund_poundage_price = refund_poundage_price;
     }
 
-    public Integer getOrder_status() {
+    public String getOrder_status() {
         return order_status;
     }
 
-    public void setOrder_status(Integer order_status) {
+    public void setOrder_status(String order_status) {
         this.order_status = order_status;
     }
 
@@ -315,11 +315,11 @@ public class TyyOrderVo {
         this.create_date = create_date;
     }
 
-    public Integer getPay_type() {
+    public String getPay_type() {
         return pay_type;
     }
 
-    public void setPay_type(Integer pay_type) {
+    public void setPay_type(String pay_type) {
         this.pay_type = pay_type;
     }
 

src/main/java/com/pangding/web/authority/vo/resvo/OrderStepThreeResVo.java

 package com.pangding.web.authority.vo.resvo;
 
-import com.pangding.web.authority.vo.TyyOrderbackVo;
-import com.pangding.web.authority.vo.TyyOrderdetailsVo;
-import com.pangding.web.authority.vo.TyyOrdersVo;
-import com.pangding.web.authority.vo.TyyTouristVo;
+import com.pangding.web.authority.vo.*;
 
 import java.util.List;
 
@@ -22,6 +19,16 @@ public class OrderStepThreeResVo {
 
     private TyyTouristVo tyyTouristVo;
 
+    private OrderRelVo orderRelVo;
+
+    public OrderRelVo getOrderRelVo() {
+        return orderRelVo;
+    }
+
+    public void setOrderRelVo(OrderRelVo orderRelVo) {
+        this.orderRelVo = orderRelVo;
+    }
+
     public TyyTouristVo getTyyTouristVo() {
         return tyyTouristVo;
     }