add the vipmember

fun-common-core/src/main/java/com/ctrip/fun/common/core/util/DateUtil.java

@@ -382,6 +382,25 @@ public class DateUtil {
         }
         }
         return dayCount;
         return dayCount;
     }
     }
+    static public long getDistinceDayFormat(Date beforedate, Date afterdate) {
+    	long dayCount = 0;
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        String beforedateStr = format.format(beforedate);
+        String afterdateStr = format.format(afterdate);
+        try {
+        	dayCount = getDistinceDay(beforedateStr, afterdateStr);
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+        return dayCount;
+    	/*try {
+    		dayCount = (afterdate.getTime() - beforedate.getTime()) / (24 * 60 * 60 * 1000);
+    		
+    	} catch (Exception e) {
+    		logger.error(e.getMessage(), e);
+    	}*/
+    }
 
 
     static public long getDistinceDay(java.sql.Date beforedate, java.sql.Date afterdate) throws ParseException {
     static public long getDistinceDay(java.sql.Date beforedate, java.sql.Date afterdate) throws ParseException {
         long dayCount = 0;
         long dayCount = 0;

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

@@ -22,7 +22,12 @@ public enum VipGradeEnum {
     /**
     /**
      * 公社会员
      * 公社会员
      */
      */
-    VIP2(2, "公社会员");
+    VIP2(2, "公社会员"),
+    /**
+     *  vip会员
+     */
+    VIP4(4, "vip会员");
+    
     private Integer key;
     private Integer key;
     private String value;
     private String value;
     private static Map<Integer, VipGradeEnum> map = new HashMap<Integer, VipGradeEnum>();
     private static Map<Integer, VipGradeEnum> map = new HashMap<Integer, VipGradeEnum>();

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

@@ -24,7 +24,9 @@ public enum OrderCategoryEnum {
 	
 	
     COMMUNE(13, "公社订单"),
     COMMUNE(13, "公社订单"),
 
 
-    GAME_ACTIVITY(14, "赛事活动订单");
+    GAME_ACTIVITY(14, "赛事活动订单"),
+	
+	VIPMEMBER(15, "vip会员");
 
 
 	/** The key. */
 	/** The key. */
 	private int key;
 	private int key;

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

+/**
+ * Copyright 2014 CTRIP Co.,Ltd. All rights reserved.
+ */
+package com.ctrip.fun.common.vo.order;
+
+/**
+ * 用户充值订单状态
+ */
+public enum UserVipMemberOrderStatusEnum {
+
+	NO_PAY(1, "未支付", new OrderStatusEnum[] { OrderStatusEnum.NOT_PAY }),
+
+	PAYING(2, "支付中", new OrderStatusEnum[] { OrderStatusEnum.CHARGING }),
+
+	PAY_FAIL(3, "扣款失败", new OrderStatusEnum[] { OrderStatusEnum.CHARGE_FAILED }),
+
+	PAY_SUCCESS(4, "已成交", new OrderStatusEnum[] { OrderStatusEnum.WAITING_DEAL, OrderStatusEnum.DEAL_FINISHED }),
+
+	CANCELED(5, "已取消", new OrderStatusEnum[] { OrderStatusEnum.CANCEL });
+
+	private int value;
+	private String name;
+	private OrderStatusEnum[] orderStatusEnums;
+
+	private UserVipMemberOrderStatusEnum(int value, String name, OrderStatusEnum[] orderStatusEnums) {
+		this.value = value;
+		this.name = name;
+		this.orderStatusEnums = orderStatusEnums;
+	}
+
+	public static UserVipMemberOrderStatusEnum getUserOrderStatusEnum(OrderStatusEnum orderStatusEnum) {
+		for (UserVipMemberOrderStatusEnum userOrderStatusEnum : UserVipMemberOrderStatusEnum.values()) {
+			if (userOrderStatusEnum.orderStatusEnums == null || isExist(orderStatusEnum, userOrderStatusEnum.orderStatusEnums)) {
+				return userOrderStatusEnum;
+			}
+		}
+		return null;
+	}
+
+	private static boolean isExist(OrderStatusEnum orderStatusEnum, OrderStatusEnum[] orderStatusEnumsArray) {
+		for (OrderStatusEnum orderStatus : orderStatusEnumsArray) {
+			if (orderStatus == orderStatusEnum) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public int getValue() {
+		return value;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setValue(int value) {
+		this.value = value;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public OrderStatusEnum[] getOrderStatusEnums() {
+		return orderStatusEnums;
+	}
+
+	public void setOrderStatusEnums(OrderStatusEnum[] orderStatusEnums) {
+		this.orderStatusEnums = orderStatusEnums;
+	}
+
+}

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

+/**
+ * Copyright 2014 CTRIP Co.,Ltd. All rights reserved.
+ */
+package com.ctrip.fun.common.vo.order;
+
+import java.util.List;
+
+
+/**
+ * @content
+ * @author caosy
+ * @date
+ */
+public class VipMemberOrderBean extends AbstractOrderBean<Object> {
+
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = -4279078077118739823L;
+	
+	private Integer vipmemberType;
+
+	@Override
+	public List<Object> getResourceList() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void setResourceList(List<Object> resourceList) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	public Integer getVipmemberType() {
+		return vipmemberType;
+	}
+
+	public void setVipmemberType(Integer vipmemberType) {
+		this.vipmemberType = vipmemberType;
+	}
+
+
+}

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/product/VipMemberTypeEnum.java

+package com.ctrip.fun.common.vo.product;
+
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by l_cheng on 2014/9/5.
+ */
+public enum VipMemberTypeEnum {
+    MONTHCARD(1, Calendar.MONTH,"vip月卡"),
+
+    YEARCARD(2, Calendar.YEAR, "vip年卡");
+    
+
+    private int value;
+    private int days;
+    private String msg;
+    private static Map<Integer, VipMemberTypeEnum> map = new HashMap<>();
+
+    static {
+        for (VipMemberTypeEnum it : VipMemberTypeEnum.values()) {
+            map.put(it.value, it);
+        }
+    }
+
+    VipMemberTypeEnum(int value, int days, String msg) {
+        this.value = value;
+        this.msg = msg;
+        this.days = days;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    public void setValue(int value) {
+        this.value = value;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public static VipMemberTypeEnum valueOf(int value) {
+        return map.get(value);
+    }
+
+	public int getDays() {
+		return days;
+	}
+
+	public void setDays(int days) {
+		this.days = days;
+	}
+    
+    
+}

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

@@ -235,7 +235,11 @@ public class LoginResultBean implements Serializable {
      */
      */
     private Date communeExpireTime;
     private Date communeExpireTime;
 
 
+    private Date vipmemberExpireTime;
     
     
+    private BigDecimal vipmemberSaveAmount;
+    
+    private String vipmemberImgUrl;
 
 
     public String getAddress() {
     public String getAddress() {
         return address;
         return address;
@@ -669,6 +673,31 @@ public class LoginResultBean implements Serializable {
 		this.communeExpireTime = communeExpireTime;
 		this.communeExpireTime = communeExpireTime;
 	}
 	}
 	
 	
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	public Date getVipmemberExpireTime() {
+		return vipmemberExpireTime;
+	}
+
+	public void setVipmemberExpireTime(Date vipmemberExpireTime) {
+		this.vipmemberExpireTime = vipmemberExpireTime;
+	}
+
+	public BigDecimal getVipmemberSaveAmount() {
+		return vipmemberSaveAmount;
+	}
+
+	public void setVipmemberSaveAmount(BigDecimal vipmemberSaveAmount) {
+		this.vipmemberSaveAmount = vipmemberSaveAmount;
+	}
+
+	public String getVipmemberImgUrl() {
+		return vipmemberImgUrl;
+	}
+
+	public void setVipmemberImgUrl(String vipmemberImgUrl) {
+		this.vipmemberImgUrl = vipmemberImgUrl;
+	}
 	
 	
 	
 	
 }
 }

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

@@ -246,11 +246,17 @@ public class UserBean implements Serializable {
     
     
     /**加入公社的年数*/
     /**加入公社的年数*/
     private Integer communeYears;
     private Integer communeYears;
-    /**加入公社的年数*/
-    private Integer tee;
     
     
+    /**vip会员到期时间*/
+    private Date vipmemberExpireTime;
     
     
+    /**vip会员节省金额*/
+    private BigDecimal vipmemberSaveAmount;
+    /**vip标志小图标*/
+    private String vipmemberImgUrl;
     
     
+    /**tee*/
+    private Integer tee;
     
     
     /** 姓氏 */
     /** 姓氏 */
     private String familyName;
     private String familyName;
@@ -774,6 +780,32 @@ public class UserBean implements Serializable {
 		this.communeExpireTime = communeExpireTime;
 		this.communeExpireTime = communeExpireTime;
 	}
 	}
 
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	public Date getVipmemberExpireTime() {
+		return vipmemberExpireTime;
+	}
+
+	public void setVipmemberExpireTime(Date vipmemberExpireTime) {
+		this.vipmemberExpireTime = vipmemberExpireTime;
+	}
+
+	public BigDecimal getVipmemberSaveAmount() {
+		return vipmemberSaveAmount;
+	}
+
+	public void setVipmemberSaveAmount(BigDecimal vipmemberSaveAmount) {
+		this.vipmemberSaveAmount = vipmemberSaveAmount;
+	}
+
+	public String getVipmemberImgUrl() {
+		return vipmemberImgUrl;
+	}
+
+	public void setVipmemberImgUrl(String vipmemberImgUrl) {
+		this.vipmemberImgUrl = vipmemberImgUrl;
+	}
+
 	public Integer getTee() {
 	public Integer getTee() {
 		return tee;
 		return tee;
 	}
 	}

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

@@ -157,6 +157,12 @@ public class WeChatUserResultBean implements Serializable {
     /**加入公社的年数*/
     /**加入公社的年数*/
     private Integer communeYears;
     private Integer communeYears;
     
     
+    private Date vipmemberExpireTime;
+    
+    private BigDecimal vipmemberSaveAmount;
+    
+    private String vipmemberImgUrl;
+    
 
 
     public int getReturnCode() {
     public int getReturnCode() {
         return returnCode;
         return returnCode;
@@ -443,6 +449,27 @@ public class WeChatUserResultBean implements Serializable {
 		this.communeYears = communeYears;
 		this.communeYears = communeYears;
 	}
 	}
 	
 	
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	public Date getVipmemberExpireTime() {
+		return vipmemberExpireTime;
+	}
+	public void setVipmemberExpireTime(Date vipmemberExpireTime) {
+		this.vipmemberExpireTime = vipmemberExpireTime;
+	}
+	public BigDecimal getVipmemberSaveAmount() {
+		return vipmemberSaveAmount;
+	}
+	public void setVipmemberSaveAmount(BigDecimal vipmemberSaveAmount) {
+		this.vipmemberSaveAmount = vipmemberSaveAmount;
+	}
+	public String getVipmemberImgUrl() {
+		return vipmemberImgUrl;
+	}
+	public void setVipmemberImgUrl(String vipmemberImgUrl) {
+		this.vipmemberImgUrl = vipmemberImgUrl;
+	}
+    
     
     
 
 
 }
 }