劵置换

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

+package com.ctrip.fun.common.vo.basic;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class VoucherGiftBean implements Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	private Integer id;
+	
+	/**
+	 * 置换规则id
+	 */
+	private Integer giftRuleId;
+	
+	/**
+	 * 置换规则名称
+	 */
+	private String giftRuleName;
+	
+	/**
+	 * 置换张数
+	 */
+	private Integer number;
+	
+	/**
+	 * 状态 0 销售提交  1 客户确认 2 客户取消 3销售取消
+	 */
+	private Integer status;
+	
+	/**
+	 * 客户uid
+	 */
+	private String clientUid;
+	
+	/**
+	 * 销售工作号id
+	 */
+	private Integer userWorkerId;
+	
+	/**
+	 * 销售提交时间
+	 */
+	private Date createdTime;
+	
+	/**
+	 * 客户确认时间
+	 */
+	private Date affirmTime;
+	
+	/**
+	 * 取消时间
+	 */
+	private Date cancelTime;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Integer getGiftRuleId() {
+		return giftRuleId;
+	}
+
+	public void setGiftRuleId(Integer giftRuleId) {
+		this.giftRuleId = giftRuleId;
+	}
+
+	public String getGiftRuleName() {
+		return giftRuleName;
+	}
+
+	public void setGiftRuleName(String giftRuleName) {
+		this.giftRuleName = giftRuleName;
+	}
+
+	public Integer getNumber() {
+		return number;
+	}
+
+	public void setNumber(Integer number) {
+		this.number = number;
+	}
+
+	public Integer getStatus() {
+		return status;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	public String getClientUid() {
+		return clientUid;
+	}
+
+	public void setClientUid(String clientUid) {
+		this.clientUid = clientUid;
+	}
+
+	public Integer getUserWorkerId() {
+		return userWorkerId;
+	}
+
+	public void setUserWorkerId(Integer userWorkerId) {
+		this.userWorkerId = userWorkerId;
+	}
+
+	public Date getCreatedTime() {
+		return createdTime;
+	}
+
+	public void setCreatedTime(Date createdTime) {
+		this.createdTime = createdTime;
+	}
+
+	public Date getAffirmTime() {
+		return affirmTime;
+	}
+
+	public void setAffirmTime(Date affirmTime) {
+		this.affirmTime = affirmTime;
+	}
+
+	public Date getCancelTime() {
+		return cancelTime;
+	}
+
+	public void setCancelTime(Date cancelTime) {
+		this.cancelTime = cancelTime;
+	}
+	
+	
+	
+	
+	
+}

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

+package com.ctrip.fun.common.vo.basic;
+
+import com.ctrip.fun.common.vo.AbstractPagedQuery;
+
+@SuppressWarnings("rawtypes")
+public class VoucherGiftQuery extends AbstractPagedQuery{
+	
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -5874854787742050433L;
+
+	private Integer id;
+	
+	private String userId;
+	
+
+	private Integer status;
+	
+	private String uid;
+	
+	//查询用户token
+    private String token;
+	
+	public String getUid() {
+		return uid;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
+	public String getUserId() {
+		return userId;
+	}
+
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+
+	public Integer getStatus() {
+		return status;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	public String getToken() {
+		return token;
+	}
+
+	public void setToken(String token) {
+		this.token = token;
+	}
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	
+
+}

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

+package com.ctrip.fun.common.vo.basic;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class VoucherGiftRuleBean implements Serializable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+
+	/**
+	 * 主键
+	 */
+	private Integer id;
+	
+	
+	/**
+	 * 换卷规则名称
+	 */
+	private String giftName;
+	
+	/**
+	 * 开始时间
+	 */
+	private Date startTime;
+	
+	
+	/**
+	 * 结束时间
+	 */
+	private Date endTime;
+	
+	/**
+	 * 被换的卷规则id
+	 */
+	private Integer fromRuleId;
+	
+	/**
+	 *换成的卷规则id
+	 */
+	private Integer toRuleId;
+	
+	/**
+	 * 规则状态 0 暂停 1  开始
+	 */
+	private Integer status;
+	
+	/**
+	 * 被换的劵名称
+	 */
+	private String fromRuleName;
+	
+	/**
+	 *换成的卷名称
+	 */
+	private String toRuleName;
+	
+	/**
+	 * 劵来源 0 不限 1 线上 2 线下 
+	 */
+	private Integer  source;
+	
+	/**
+	 * 是否已审核通过 0初始值  1 审核通过 2未通过
+	 */
+	private Integer isPass;
+	
+	/**
+	 * 审核时间
+	 */
+	private Date passTime;
+	
+	/**
+	 * 审核人
+	 */
+	private String passName;
+	
+	/**
+	 * 创建时间
+	 */
+	private Date createdTime;
+	
+	/**
+	 * 创建人
+	 */
+	private String createdName;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getGiftName() {
+		return giftName;
+	}
+
+	public void setGiftName(String giftName) {
+		this.giftName = giftName;
+	}
+
+	public Date getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+
+	public Date getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+
+	public Integer getFromRuleId() {
+		return fromRuleId;
+	}
+
+	public void setFromRuleId(Integer fromRuleId) {
+		this.fromRuleId = fromRuleId;
+	}
+
+	public Integer getToRuleId() {
+		return toRuleId;
+	}
+
+	public void setToRuleId(Integer toRuleId) {
+		this.toRuleId = toRuleId;
+	}
+
+	public Integer getStatus() {
+		return status;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	public String getFromRuleName() {
+		return fromRuleName;
+	}
+
+	public void setFromRuleName(String fromRuleName) {
+		this.fromRuleName = fromRuleName;
+	}
+
+	public String getToRuleName() {
+		return toRuleName;
+	}
+
+	public void setToRuleName(String toRuleName) {
+		this.toRuleName = toRuleName;
+	}
+
+	public Integer getSource() {
+		return source;
+	}
+
+	public void setSource(Integer source) {
+		this.source = source;
+	}
+
+	public Integer getIsPass() {
+		return isPass;
+	}
+
+	public void setIsPass(Integer isPass) {
+		this.isPass = isPass;
+	}
+
+	public Date getPassTime() {
+		return passTime;
+	}
+
+	public void setPassTime(Date passTime) {
+		this.passTime = passTime;
+	}
+
+	public String getPassName() {
+		return passName;
+	}
+
+	public void setPassName(String passName) {
+		this.passName = passName;
+	}
+
+	public Date getCreatedTime() {
+		return createdTime;
+	}
+
+	public void setCreatedTime(Date createdTime) {
+		this.createdTime = createdTime;
+	}
+
+	public String getCreatedName() {
+		return createdName;
+	}
+
+	public void setCreatedName(String createdName) {
+		this.createdName = createdName;
+	}
+	
+}

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

+package com.ctrip.fun.common.vo.basic;
+
+import java.io.Serializable;
+
+public class VoucherGiftVo implements Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	private Integer id;
+
+	/**
+	 * 置换规则id
+	 */
+	private String giftRuleId;
+	
+	/**
+	 * 置换规则名称
+	 */
+	private String giftRuleName;
+
+	/**
+	 * 置换张数
+	 */
+	private Integer number;
+	
+	/**
+	 * 状态 0 销售提交  1 客户确认 2 客户取消 3销售取消
+	 */
+	private Integer status;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	
+	public String getGiftRuleName() {
+		return giftRuleName;
+	}
+
+	public void setGiftRuleName(String giftRuleName) {
+		this.giftRuleName = giftRuleName;
+	}
+	
+	
+	public String getGiftRuleId() {
+		return giftRuleId;
+	}
+
+	public void setGiftRuleId(String giftRuleId) {
+		this.giftRuleId = giftRuleId;
+	}
+
+	public Integer getNumber() {
+		return number;
+	}
+
+	public void setNumber(Integer number) {
+		this.number = number;
+	}
+
+	public Integer getStatus() {
+		return status;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+	
+}

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

@@ -25,7 +25,9 @@ public enum VoucherSourceEnum {
     
     RULE_REGISTMINIAPP_PRESENT(7, "用户注册赠送"),
     
-    RULE_VOUCHERUSED_PRESENT(8, "用户用券赠送");
+    RULE_VOUCHERUSED_PRESENT(8, "用户用券赠送"),
+    
+    RULE_GIFT_PRESENT(9, "用户置换");
 
     private int value;
     private String msg;