优惠券创建增加分享限制

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

@@ -115,8 +115,8 @@ public class BuyVoucherActivityBean implements Serializable {
 		this.buyLimitTimes = buyLimitTimes;
 	}
 
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	public Date getActivityStart() {
 		return activityStart;
 	}
@@ -125,8 +125,8 @@ public class BuyVoucherActivityBean implements Serializable {
 		this.activityStart = activityStart;
 	}
 	
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	public Date getActivityEnd() {
 		return activityEnd;
 	}

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

@@ -36,6 +36,16 @@ public class VoucherBean {
      * 使用规则
      */
     private String remark;
+    
+    //是否可分享
+    private int shared;
+    
+    //是否分享了
+    private int isShare;
+    
+    //领券人限制:不限制,vpi,社员,社员并且vip
+    private int userLimit;//0,2,4,6
+    
     public Integer getId() {
         return id;
     }
@@ -171,4 +181,30 @@ public class VoucherBean {
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
+	public int getShared() {
+		return shared;
+	}
+
+	public void setShared(int shared) {
+		this.shared = shared;
+	}
+
+	public int getIsShare() {
+		return isShare;
+	}
+
+	public void setIsShare(int isShare) {
+		this.isShare = isShare;
+	}
+
+	public int getUserLimit() {
+		return userLimit;
+	}
+
+	public void setUserLimit(int userLimit) {
+		this.userLimit = userLimit;
+	}
+    
+    
 }

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

@@ -161,6 +161,11 @@ public class VoucherRuleBean implements java.io.Serializable {
      * 是否可分享
      */
     private int shared;//是否可分享：1是;0否  
+    
+    /**
+     * 分享领取限制
+     */
+    private int userLimit;//分享领取限制0:不限 2社员
 
     @SuppressWarnings("rawtypes")
     public AbstractRuleConditionBean getRuleCondition() {
@@ -415,4 +420,12 @@ public class VoucherRuleBean implements java.io.Serializable {
 		this.shared = shared;
 	}
 
+	public int getUserLimit() {
+		return userLimit;
+	}
+
+	public void setUserLimit(int userLimit) {
+		this.userLimit = userLimit;
+	}
+
 }