退单

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/BuyVoucherActivityQuery.java

@@ -21,7 +21,7 @@ public class BuyVoucherActivityQuery extends AbstractPagedQuery {
 	private Date createdTimeStart;//
 	private Date createdTimeStart;//
 	private Date createdTimeEnd;
 	private Date createdTimeEnd;
 	private Integer buyAndUsed;//是否买了并使用了券1：有效 0失效
 	private Integer buyAndUsed;//是否买了并使用了券1：有效 0失效
-	private String regionCode; //区域   0-全区域,100-上海 ，110-广州，120-北京
+	private String regionCode; //区域   1-全区域,100-上海 ，110-广州，120-北京
 
 
 	public Integer getId() {
 	public Integer getId() {
 		return id;
 		return id;

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/AbstractOpOrderBean.java

@@ -276,8 +276,33 @@ public abstract class AbstractOpOrderBean {
     private BigDecimal discountAfterOrderAmount;
     private BigDecimal discountAfterOrderAmount;
     /**一种折扣*/
     /**一种折扣*/
     private BigDecimal discountRate;
     private BigDecimal discountRate;
+    
+    /**退款按钮是否显示 */
+    private Integer canRefund;
+    
+    /**打球时间*/
+    private Date playDate;
+    
+    /**订单类型*/
+    private int orderCategory;
+
+    public int getOrderCategory() {
+		return orderCategory;
+	}
+
+	public void setOrderCategory(int orderCategory) {
+		this.orderCategory = orderCategory;
+	}
 
 
-    public long getOrderNo() {
+	public Date getPlayDate() {
+		return playDate;
+	}
+
+	public void setPlayDate(Date playDate) {
+		this.playDate = playDate;
+	}
+
+	public long getOrderNo() {
         return orderNo;
         return orderNo;
     }
     }
 
 
@@ -285,7 +310,15 @@ public abstract class AbstractOpOrderBean {
         return userName;
         return userName;
     }
     }
 
 
-    public Integer getQuantity() {
+    public Integer getCanRefund() {
+		return canRefund;
+	}
+
+	public void setCanRefund(Integer canRefund) {
+		this.canRefund = canRefund;
+	}
+
+	public Integer getQuantity() {
         return quantity;
         return quantity;
     }
     }
 
 

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/user/CommuneExtBean.java

@@ -146,6 +146,7 @@ public class CommuneExtBean implements java.io.Serializable {
     private String renewer;
     private String renewer;
     /**标签*/
     /**标签*/
     private String labels;
     private String labels;
+    
 
 
 
 
     public Integer getId() {
     public Integer getId() {