部分退款

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

@@ -18,6 +18,10 @@ public enum VoucherRegionCodeEnum {
     */
     */
     BEIJING("120", "北京"),
     BEIJING("120", "北京"),
     /**
     /**
+     * 俱乐部
+     */
+    CLUB("130", "俱乐部"),
+    /**
      * 不限
      * 不限
      */
      */
     NOLIMIT("1", "全国");
     NOLIMIT("1", "全国");

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

@@ -8,11 +8,11 @@ public enum VoucherTypeCodeEnum {
 	/**
 	/**
      * 正常卷
      * 正常卷
      */
      */
-    NORMAL(1, "正常卷"),
+    NORMAL(1, "正常劵"),
     /**
     /**
      * 体验卷
      * 体验卷
      */
      */
-    EXPERIENCR(2, "体验卷");
+    EXPERIENCR(2, "体验劵");
 
 
     private Integer value;
     private Integer value;
     private String msg;
     private String msg;

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

@@ -8,6 +8,7 @@ import java.util.Map;
  * @date: 2014-08-26
  * @date: 2014-08-26
  */
  */
 public enum VourcherUsedEnum {
 public enum VourcherUsedEnum {
+	LOCK(2, "已锁定"),
     USED(1, "已使用"),
     USED(1, "已使用"),
     UNUSED(0, "未使用");
     UNUSED(0, "未使用");
 
 

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

@@ -4,6 +4,8 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
+import com.ctrip.fun.common.vo.basic.VoucherBean;
+
 public class CourseOrderListExcelBean extends CourseOrderListBean {
 public class CourseOrderListExcelBean extends CourseOrderListBean {
 
 
     /** 注册时间. */
     /** 注册时间. */
@@ -66,6 +68,31 @@ public class CourseOrderListExcelBean extends CourseOrderListBean {
     
     
     private boolean isDelayOrder;
     private boolean isDelayOrder;
 
 
+    /**
+     * 劵数量
+     */
+    private Integer voucherCount;
+    
+    /**
+     * 劵使用的情况
+     */
+    private String voucherIDList;
+
+    /**
+     * 劵名称
+     */
+    private List<String> voucherList;
+
+	public List<String> getVoucherList() {
+		return voucherList;
+	}
+
+	public void setVoucherList(List<String> voucherList) {
+		this.voucherList = voucherList;
+	}
+
+	
+    
     public Date getRegisterTime() {
     public Date getRegisterTime() {
         return registerTime;
         return registerTime;
     }
     }
@@ -200,5 +227,25 @@ public class CourseOrderListExcelBean extends CourseOrderListBean {
 		this.isDelayOrder = isDelayOrder;
 		this.isDelayOrder = isDelayOrder;
 	}
 	}
 	
 	
+	 public Integer getVoucherCount() {
+			return voucherCount;
+	}
+
+	public void setVoucherCount(Integer voucherCount) {
+		this.voucherCount = voucherCount;
+	}
+
+	public String getVoucherIDList() {
+		return voucherIDList;
+	}
+
+	public void setVoucherIDList(String voucherIDList) {
+		this.voucherIDList = voucherIDList;
+	}
+
+	
+	
+
+
     
     
 }
 }

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

@@ -106,6 +106,21 @@ public class EventActivityOrderListExcelBean extends EventActivityOrderListBean
     private String platform;
     private String platform;
     
     
 
 
+    /**
+     * 劵数量
+     */
+    private Integer voucherCount;
+    
+    /**
+     * 劵使用的情况
+     */
+    private String voucherIDList;
+
+    /**
+     * 劵名称
+     */
+    private List<String> voucherList;
+    
     public String getUid() {
     public String getUid() {
         return uid;
         return uid;
     }
     }
@@ -323,4 +338,28 @@ public class EventActivityOrderListExcelBean extends EventActivityOrderListBean
 		this.platform = platform;
 		this.platform = platform;
 	}
 	}
 
 
+	public Integer getVoucherCount() {
+		return voucherCount;
+	}
+
+	public void setVoucherCount(Integer voucherCount) {
+		this.voucherCount = voucherCount;
+	}
+
+	public String getVoucherIDList() {
+		return voucherIDList;
+	}
+
+	public void setVoucherIDList(String voucherIDList) {
+		this.voucherIDList = voucherIDList;
+	}
+
+	public List<String> getVoucherList() {
+		return voucherList;
+	}
+
+	public void setVoucherList(List<String> voucherList) {
+		this.voucherList = voucherList;
+	}
+
 }
 }