user/role/tright 7.11

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

@@ -15,11 +15,11 @@ public class OrderStatusVo {
     /**
      * 0未支付，1已支付
      */
-    private String payment_status;
+    private Integer payment_status;
     /**
      * 支付类型
      */
-    private String pay_type;
+    private Integer pay_type;
     /**
      * 支付单号
      */
@@ -55,7 +55,7 @@ public class OrderStatusVo {
     /**
      * 0不可分润，1可分润，2已分润
      */
-    private String divide_status;
+    private Integer divide_status;
     /**
      * 分润时间
      */
@@ -63,7 +63,7 @@ public class OrderStatusVo {
     /**
      * 0未支付 1出票中（已支付）2出票成功/预订成功/有房 3出票失败/预订失败/无房 4核销中 5核销完成 6部分退货/退款 7全部退款退货 8取消 9已完成
      */
-    private String order_status;
+    private Integer order_status;
     /**
      * 第三方订单号
      */
@@ -91,7 +91,7 @@ public class OrderStatusVo {
     /**
      * 是否删除 0 未删除 1 已删除
      */
-    private String is_delete;
+    private Integer is_delete;
 
     private String agent_company_id;
 
@@ -105,22 +105,6 @@ public class OrderStatusVo {
         this.id = id;
     }
 
-    public String getPayment_status() {
-        return payment_status;
-    }
-
-    public void setPayment_status(String payment_status) {
-        this.payment_status = payment_status;
-    }
-
-    public String getPay_type() {
-        return pay_type;
-    }
-
-    public void setPay_type(String pay_type) {
-        this.pay_type = pay_type;
-    }
-
     public String getPayment_id() {
         return payment_id;
     }
@@ -185,14 +169,6 @@ public class OrderStatusVo {
         this.subledge_time = subledge_time;
     }
 
-    public String getDivide_status() {
-        return divide_status;
-    }
-
-    public void setDivide_status(String divide_status) {
-        this.divide_status = divide_status;
-    }
-
     public String getDivide_time() {
         return divide_time;
     }
@@ -201,14 +177,6 @@ public class OrderStatusVo {
         this.divide_time = divide_time;
     }
 
-    public String getOrder_status() {
-        return order_status;
-    }
-
-    public void setOrder_status(String order_status) {
-        this.order_status = order_status;
-    }
-
     public String getThird_order_id() {
         return third_order_id;
     }
@@ -257,14 +225,6 @@ public class OrderStatusVo {
         this.product_company_name = product_company_name;
     }
 
-    public String getIs_delete() {
-        return is_delete;
-    }
-
-    public void setIs_delete(String is_delete) {
-        this.is_delete = is_delete;
-    }
-
     public String getAgent_company_id() {
         return agent_company_id;
     }
@@ -280,4 +240,44 @@ public class OrderStatusVo {
     public void setAgent_company_name(String agent_company_name) {
         this.agent_company_name = agent_company_name;
     }
+
+    public Integer getPayment_status() {
+        return payment_status;
+    }
+
+    public void setPayment_status(Integer payment_status) {
+        this.payment_status = payment_status;
+    }
+
+    public Integer getPay_type() {
+        return pay_type;
+    }
+
+    public void setPay_type(Integer pay_type) {
+        this.pay_type = pay_type;
+    }
+
+    public Integer getDivide_status() {
+        return divide_status;
+    }
+
+    public void setDivide_status(Integer divide_status) {
+        this.divide_status = divide_status;
+    }
+
+    public Integer getOrder_status() {
+        return order_status;
+    }
+
+    public void setOrder_status(Integer order_status) {
+        this.order_status = order_status;
+    }
+
+    public Integer getIs_delete() {
+        return is_delete;
+    }
+
+    public void setIs_delete(Integer is_delete) {
+        this.is_delete = is_delete;
+    }
 }

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

@@ -31,7 +31,7 @@ public class OrderTicketDetailVo {
     /**
      * 0未使用，1已核销，2退票，3过期
      */
-    private String ticket_status;
+    private Integer ticket_status;
     /**
      * 时间
      */
@@ -77,11 +77,11 @@ public class OrderTicketDetailVo {
         this.ticket_code = ticket_code;
     }
 
-    public String getTicket_status() {
+    public Integer getTicket_status() {
         return ticket_status;
     }
 
-    public void setTicket_status(String ticket_status) {
+    public void setTicket_status(Integer ticket_status) {
         this.ticket_status = ticket_status;
     }
 

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

@@ -79,7 +79,7 @@ public class OrderVo {
     /**
      * 子订单类型
      */
-    private String sub_order_type;
+    private Integer sub_order_type;
     /**
      * 订单时间
      */
@@ -262,11 +262,11 @@ public class OrderVo {
         this.order_type = order_type;
     }
 
-    public String getSub_order_type() {
+    public Integer getSub_order_type() {
         return sub_order_type;
     }
 
-    public void setSub_order_type(String sub_order_type) {
+    public void setSub_order_type(Integer sub_order_type) {
         this.sub_order_type = sub_order_type;
     }
 

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

@@ -35,7 +35,7 @@ public class TyyOrderVo {
     /**
      * 订单子类型: 1、扫码购票，2、网络购票，3、自助机购票，4、扫码支付，5、预约
      */
-    private String sub_order_type;
+    private Integer sub_order_type;
     private String product_id;
     /**
      * 产品名称
@@ -97,13 +97,13 @@ public class TyyOrderVo {
      * 订单状态
      * 0,待付款、1,已付款（出票中）、2,成功出票、3,核销中、4,核销完成、5,部分退款、6,全部退款、7,已取消
      */
-    private String order_status;
+    private Integer order_status;
 
     private String create_date;
     /**
      * 付款类型 0：微信  1:支付宝 2:通联
      */
-    private String pay_type;
+    private Integer pay_type;
     /**
      * 付款凭证编号
      */
@@ -171,14 +171,6 @@ public class TyyOrderVo {
         this.order_type = order_type;
     }
 
-    public String getSub_order_type() {
-        return sub_order_type;
-    }
-
-    public void setSub_order_type(String sub_order_type) {
-        this.sub_order_type = sub_order_type;
-    }
-
     public String getProduct_id() {
         return product_id;
     }
@@ -299,14 +291,6 @@ public class TyyOrderVo {
         this.refund_poundage_price = refund_poundage_price;
     }
 
-    public String getOrder_status() {
-        return order_status;
-    }
-
-    public void setOrder_status(String order_status) {
-        this.order_status = order_status;
-    }
-
     public String getCreate_date() {
         return create_date;
     }
@@ -315,14 +299,6 @@ public class TyyOrderVo {
         this.create_date = create_date;
     }
 
-    public String getPay_type() {
-        return pay_type;
-    }
-
-    public void setPay_type(String pay_type) {
-        this.pay_type = pay_type;
-    }
-
     public String getPay_type_id() {
         return pay_type_id;
     }
@@ -370,4 +346,28 @@ public class TyyOrderVo {
     public void setTongl_ordersn(String tongl_ordersn) {
         this.tongl_ordersn = tongl_ordersn;
     }
+
+    public Integer getSub_order_type() {
+        return sub_order_type;
+    }
+
+    public void setSub_order_type(Integer sub_order_type) {
+        this.sub_order_type = sub_order_type;
+    }
+
+    public Integer getOrder_status() {
+        return order_status;
+    }
+
+    public void setOrder_status(Integer order_status) {
+        this.order_status = order_status;
+    }
+
+    public Integer getPay_type() {
+        return pay_type;
+    }
+
+    public void setPay_type(Integer pay_type) {
+        this.pay_type = pay_type;
+    }
 }