买券活动后台配置功能

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/BuyVoucherActivityBean.java → fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/BuyVoucherActivityBean.java

-package com.ctrip.fun.common.vo.order;
+package com.ctrip.fun.common.vo.basic;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 
 public class BuyVoucherActivityBean implements Serializable {
 	private static final long serialVersionUID = 100000000000L;
@@ -16,7 +21,11 @@ public class BuyVoucherActivityBean implements Serializable {
 	private String message;// 购买成功后的提示
 	private Integer valid;//活动有效标识1：有效 0失效
 	private Integer buyLimitTimes;//限制购买次数
-
+	private Date activityStart;//活动开始时间
+	private Date activityEnd;//活动结束时间
+	private String voucherIds;//发放的券的id拼接
+	private String miniAppMessage;//买券成功之后提示信息
+	private Date createdTime;//优惠券创建时间
 
 	public Integer getId() {
 		return id;
@@ -106,4 +115,50 @@ public class BuyVoucherActivityBean implements Serializable {
 		this.buyLimitTimes = buyLimitTimes;
 	}
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	public Date getActivityStart() {
+		return activityStart;
+	}
+
+	public void setActivityStart(Date activityStart) {
+		this.activityStart = activityStart;
+	}
+	
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	public Date getActivityEnd() {
+		return activityEnd;
+	}
+
+	public void setActivityEnd(Date activityEnd) {
+		this.activityEnd = activityEnd;
+	}
+
+	public String getVoucherIds() {
+		return voucherIds;
+	}
+
+	public void setVoucherIds(String voucherIds) {
+		this.voucherIds = voucherIds;
+	}
+
+	public String getMiniAppMessage() {
+		return miniAppMessage;
+	}
+
+	public void setMiniAppMessage(String miniAppMessage) {
+		this.miniAppMessage = miniAppMessage;
+	}
+
+	public Date getCreatedTime() {
+		return createdTime;
+	}
+
+	public void setCreatedTime(Date createdTime) {
+		this.createdTime = createdTime;
+	}
+
+
+
 }

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

-package com.ctrip.fun.common.vo.product;
+package com.ctrip.fun.common.vo.basic;
 import java.util.Date;
 
+import org.springframework.format.annotation.DateTimeFormat;
+
 import com.ctrip.fun.common.vo.AbstractPagedQuery;
+import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
  * Created by pat on 14-5-26.
@@ -50,6 +53,8 @@ public class BuyVoucherActivityQuery extends AbstractPagedQuery {
 		this.valid = valid;
 	}
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	public Date getCreatedTimeStart() {
 		return createdTimeStart;
 	}
@@ -58,6 +63,8 @@ public class BuyVoucherActivityQuery extends AbstractPagedQuery {
 		this.createdTimeStart = createdTimeStart;
 	}
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	public Date getCreatedTimeEnd() {
 		return createdTimeEnd;
 	}