Merge branch 'f-6.6.6' of 192.168.10.6:caosy/fun-common into f-6.6.6

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

@@ -240,6 +240,11 @@ public class LoginResultBean implements Serializable {
     private BigDecimal vipmemberSaveAmount;
     
     private String vipmemberImgUrl;
+    
+    /**vip是否优惠过*/
+    private int vipmemberDiscounted;
+    /**vip随机优惠百分比*/
+    private BigDecimal vipmemberDiscountRate;
 
     public String getAddress() {
         return address;
@@ -698,6 +703,21 @@ public class LoginResultBean implements Serializable {
 	public void setVipmemberImgUrl(String vipmemberImgUrl) {
 		this.vipmemberImgUrl = vipmemberImgUrl;
 	}
-	
+
+	public int getVipmemberDiscounted() {
+		return vipmemberDiscounted;
+	}
+
+	public void setVipmemberDiscounted(int vipmemberDiscounted) {
+		this.vipmemberDiscounted = vipmemberDiscounted;
+	}
+
+	public BigDecimal getVipmemberDiscountRate() {
+		return vipmemberDiscountRate;
+	}
+
+	public void setVipmemberDiscountRate(BigDecimal vipmemberDiscountRate) {
+		this.vipmemberDiscountRate = vipmemberDiscountRate;
+	}
 	
 }

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

@@ -255,6 +255,11 @@ public class UserBean implements Serializable {
     /**vip标志小图标*/
     private String vipmemberImgUrl;
     
+    /**vip是否优惠过*/
+    private int vipmemberDiscounted;
+    /**vip随机优惠百分比*/
+    private BigDecimal vipmemberDiscountRate;
+    
     /**tee*/
     private Integer tee;
     
@@ -805,6 +810,22 @@ public class UserBean implements Serializable {
 	public void setVipmemberImgUrl(String vipmemberImgUrl) {
 		this.vipmemberImgUrl = vipmemberImgUrl;
 	}
+	
+	public int getVipmemberDiscounted() {
+		return vipmemberDiscounted;
+	}
+
+	public void setVipmemberDiscounted(int vipmemberDiscounted) {
+		this.vipmemberDiscounted = vipmemberDiscounted;
+	}
+
+	public BigDecimal getVipmemberDiscountRate() {
+		return vipmemberDiscountRate;
+	}
+
+	public void setVipmemberDiscountRate(BigDecimal vipmemberDiscountRate) {
+		this.vipmemberDiscountRate = vipmemberDiscountRate;
+	}
 
 	public Integer getTee() {
 		return tee;

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

@@ -112,6 +112,12 @@ public class WeChatUserResultBean implements Serializable {
      * 玩家俱乐部会员等级图标
      */
     private String vipGradeImgUrl;
+    
+    /**vip是否优惠过*/
+    private int vipmemberDiscounted;
+    /**vip随机优惠百分比*/
+    private BigDecimal vipmemberDiscountRate;
+    
     /**
      * 用户积分
      */
@@ -351,7 +357,20 @@ public class WeChatUserResultBean implements Serializable {
     public void setVipGradeImgUrl(String vipGradeImgUrl) {
         this.vipGradeImgUrl = vipGradeImgUrl;
     }
-    public int getIntegral() {
+    
+    public int getVipmemberDiscounted() {
+		return vipmemberDiscounted;
+	}
+	public void setVipmemberDiscounted(int vipmemberDiscounted) {
+		this.vipmemberDiscounted = vipmemberDiscounted;
+	}
+	public BigDecimal getVipmemberDiscountRate() {
+		return vipmemberDiscountRate;
+	}
+	public void setVipmemberDiscountRate(BigDecimal vipmemberDiscountRate) {
+		this.vipmemberDiscountRate = vipmemberDiscountRate;
+	}
+	public int getIntegral() {
         return integral;
     }