6.7.1

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/app/GameQuery.java

@@ -14,6 +14,7 @@ public class GameQuery extends AbstractPagedQuery {
     private int courseId;
     private int gameType;
     private int gameStatus;
+    private String playerName;
     
     public String getGameName() {
         return gameName;
@@ -47,6 +48,14 @@ public class GameQuery extends AbstractPagedQuery {
         this.gameStatus = gameStatus;
     }
 
+    public String getPlayerName() {
+        return playerName;
+    }
+
+    public void setPlayerName(String playerName) {
+        this.playerName = playerName;
+    }
+    
     @Override
     public String toString(){
         StringBuilder builder = new StringBuilder();
@@ -54,7 +63,8 @@ public class GameQuery extends AbstractPagedQuery {
         builder.append("gameName: ").append(gameName)
                 .append(", ").append("courseId: ").append(courseId)
                 .append(", ").append("gameType: ").append(gameType)
-                .append(", ").append("gameStatus ").append(gameStatus);
+                .append(", ").append("gameStatus ").append(gameStatus)
+                .append(", ").append("playerName").append(playerName);
         builder.append("]");
         return builder.toString();
     }

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

@@ -31,7 +31,7 @@ public class BuyVoucherActivityBean implements Serializable {
 	private String sendName;//发送方名称
 	private String actName;//活动名称
 	private String wishing;//祝福语
-
+	private BigDecimal grossPrice ; //毛利
 	public Integer getId() {
 		return id;
 	}
@@ -180,6 +180,14 @@ public class BuyVoucherActivityBean implements Serializable {
 		this.redPacketPrice = redPacketPrice;
 	}
 	
+	public BigDecimal getGrossPrice() {
+		return grossPrice;
+	}
+
+	public void setGrossPrice(BigDecimal grossPrice) {
+		this.grossPrice = grossPrice;
+	}
+		
 	public String getSendName() {
 		return sendName;
 	}

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

@@ -5,13 +5,13 @@ package com.ctrip.fun.common.vo.order;
 
 import java.util.List;
 
-
 /**
  * @content
  * @author csleng
  * @date
  */
-public class CommuneOrderBean extends AbstractOrderBean<CommuneOrderResourceBean> {
+public class CommuneOrderBean extends
+		AbstractOrderBean<CommuneOrderResourceBean> {
 
 	private static final long serialVersionUID = 3371199399012530137L;
 
@@ -61,6 +61,11 @@ public class CommuneOrderBean extends AbstractOrderBean<CommuneOrderResourceBean
 	 */
 	private String recommendUid;
 
+	/**
+	 * 推荐人工作Id
+	 */
+	private Integer userWorkerId;
+
 	public String getRecommendCode() {
 		return recommendCode;
 	}
@@ -150,4 +155,12 @@ public class CommuneOrderBean extends AbstractOrderBean<CommuneOrderResourceBean
 		this.recommendUid = recommendUid;
 	}
 
+	public Integer getUserWorkerId() {
+		return userWorkerId;
+	}
+
+	public void setUserWorkerId(Integer userWorkerId) {
+		this.userWorkerId = userWorkerId;
+	}
+
 }

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/user/UserBean.java

@@ -311,7 +311,19 @@ public class UserBean implements Serializable {
     private String hobby;
     private String faceImage;
     
+    /**
+     * 工作号id
+     */
+    private Integer userWorkerId;
+
     
+    public Integer getUserWorkerId() {
+		return userWorkerId;
+	}
+
+	public void setUserWorkerId(Integer userWorkerId) {
+		this.userWorkerId = userWorkerId;
+	}
 
 	public String getFaceImage() {
 		return faceImage;

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/user/UserWorkerBean.java

+package com.ctrip.fun.common.vo.user;
+
+import java.util.Date;
+
+public class UserWorkerBean {
+
+	private int id;
+	/**
+	 * 工作号唯一标识
+	 */
+	private String uid;
+	
+
+	/**
+	 * 绑定的手机号
+	 */
+	private String mobilePhone;
+	/**
+	 * 真实姓名
+	 */
+	private String realName;
+	/**
+	 * 创建时间
+	 */
+	private Date createTime;
+
+	/**
+	 * 父id
+	 */
+	private int level;
+	/**
+	 * 部门id
+	 */
+	private int deptId;
+	/**
+	 * 是否在职0：在职；1：不在职
+	 */
+	private int status;
+	/**
+	 * 修改时间
+	 */
+	private Date datachangeTime;
+	/**
+	 * 0:销售总监；1:销售经理；2:销售员
+	 */
+	private int levelStatus;
+	/**
+	 * 密码
+	 */
+	private String password;
+	/**
+	 * 归属小组
+	 */
+	private int groupId;
+	
+	/**
+	 * 区域code
+	 */
+	private String regionCode;
+	
+	/**
+	 * 区域名称
+	 */
+	private String  regionName;
+	
+	/**
+	 * 部门名称
+	 */
+	private String deptName;
+		
+	
+	public int getId() {
+		return id;
+	}
+	public void setId(int id) {
+		this.id = id;
+	}
+	public String getUid() {
+		return uid;
+	}
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+	public String getMobilePhone() {
+		return mobilePhone;
+	}
+	public void setMobilePhone(String mobilePhone) {
+		this.mobilePhone = mobilePhone;
+	}
+	public String getRealName() {
+		return realName;
+	}
+	public void setRealName(String realName) {
+		this.realName = realName;
+	}
+	public Date getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	public int getLevel() {
+		return level;
+	}
+	public void setLevel(int level) {
+		this.level = level;
+	}
+	public int getDeptId() {
+		return deptId;
+	}
+	public void setDeptId(int deptId) {
+		this.deptId = deptId;
+	}
+	public int getStatus() {
+		return status;
+	}
+	public void setStatus(int status) {
+		this.status = status;
+	}
+	public Date getDatachangeTime() {
+		return datachangeTime;
+	}
+	public void setDatachangeTime(Date datachangeTime) {
+		this.datachangeTime = datachangeTime;
+	}
+	public int getLevelStatus() {
+		return levelStatus;
+	}
+	public void setLevelStatus(int levelStatus) {
+		this.levelStatus = levelStatus;
+	}
+	public String getPassword() {
+		return password;
+	}
+	public void setPassword(String password) {
+		this.password = password;
+	}
+	public int getGroupId() {
+		return groupId;
+	}
+	public void setGroupId(int groupId) {
+		this.groupId = groupId;
+	}
+	public String getRegionCode() {
+		return regionCode;
+	}
+	public void setRegionCode(String regionCode) {
+		this.regionCode = regionCode;
+	}
+	public String getRegionName() {
+		return regionName;
+	}
+	public void setRegionName(String regionName) {
+		this.regionName = regionName;
+	}
+	public String getDeptName() {
+		return deptName;
+	}
+	public void setDeptName(String deptName) {
+		this.deptName = deptName;
+	}
+}