小程序券券列表可以过滤正在分享中的券；增加获分享记录的查询vo

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

@@ -20,6 +20,10 @@ public class VoucherQueryDto extends AbstractPagedQuery {
     private Integer expired;
     //优惠券是否可分享
     private Integer shared;
+    //是否正在分享
+    private Integer isShare;
+    //查询用户token
+    private String token;
 
     // 新增的字段
     private Integer resourceId;
@@ -152,6 +156,22 @@ public class VoucherQueryDto extends AbstractPagedQuery {
 	public void setInviterUid(String inviterUid) {
 		this.inviterUid = inviterUid;
 	}
+
+	public Integer getIsShare() {
+		return isShare;
+	}
+
+	public void setIsShare(Integer isShare) {
+		this.isShare = isShare;
+	}
+
+	public String getToken() {
+		return token;
+	}
+
+	public void setToken(String token) {
+		this.token = token;
+	}
 	
 	
 

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

+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;
+
+/**
+ * @author gaoc
+ */
+public class VoucherShareLogQuery extends AbstractPagedQuery<VoucherShareLogQuery> {
+
+    private static final long serialVersionUID = 9139646793590664960L;
+
+    /**
+     * id
+     */
+    private Integer id;
+    /**
+     *用户uid
+     */
+    private String uid;
+    /**
+     * 现金券条件
+     */
+    private String token;
+    /**
+     * 现金券生效时间
+     */
+    private Date startCreateTime;
+
+    /**
+     * 现金券失效时间
+     */
+    private Date endCreateTime;
+
+    private int status;
+
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+    
+    public String getUid() {
+		return uid;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    public Date getStartCreateTime() {
+        return startCreateTime;
+    }
+
+    public void setStartCreateTime(Date startCreateTime) {
+        this.startCreateTime = startCreateTime;
+    }
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    public Date getEndCreateTime() {
+        return endCreateTime;
+    }
+
+    public void setEndCreateTime(Date endCreateTime) {
+        this.endCreateTime = endCreateTime;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+	public String getToken() {
+		return token;
+	}
+
+	public void setToken(String token) {
+		this.token = token;
+	}
+    
+}