1.更改社员到期时间

src/main/java/com/ctrip/fun/golf/api/user/UserExtController.java

@@ -164,4 +164,18 @@ public class UserExtController extends GenericController<UserExtService, UserExt
         response.setBody(userExtService.editVipDate(userExt));
         response.setBody(userExtService.editVipDate(userExt));
         return response;
         return response;
     }
     }
+    
+    @ResponseBody
+    @RequestMapping(value = "/deleteVip", method = RequestMethod.POST)
+    @Log(action = "更新用户会员到期时间")
+    public Response<Integer> deleteVip(@RequestBody Request<UserExtBean> bean) {
+        Response<Integer> response = new Response<Integer>();
+        UserExtBean userExtBean = bean.getBody();
+        UserExt userExt=new UserExt();
+        userExt.setUid(userExtBean.getUid());          
+        response.setStatus(ResponseStatusEnum.SUCCESS.getValue());
+        response.setMessage(ResponseStatusEnum.SUCCESS.getMsg());
+        response.setBody(userExtService.deleteVip(userExt));
+        return response;
+    }
 }
 }

src/main/java/com/ctrip/fun/golf/dao/user/UserExtDao.java

@@ -1354,4 +1354,17 @@ public class UserExtDao extends GenericHibernateDao<UserExt, Integer> {
         query.setParameter("communeAgainTime", userExtInfo.getCommuneAgainTime());
         query.setParameter("communeAgainTime", userExtInfo.getCommuneAgainTime());
         return query.executeUpdate();
         return query.executeUpdate();
 	}
 	}
+
+	public Integer deleteVip(UserExt user) {
+		String sql = "update UserExt set communeAgainTime=:communeAgainTime,vipGrade=:vipGrade,communeTime=:communeTime,communeYears=:communeYears"
+                + " where uid=:uid";
+        Query query = getSession().createQuery(sql);
+        query.setParameter("uid", user.getUid());
+        query.setParameter("vipGrade", user.getVipGrade());
+        query.setParameter("communeTime", null);
+        query.setParameter("communeYears", null);
+        query.setParameter("communeAgainTime", null);
+
+        return query.executeUpdate();
+	}
 }
 }

src/main/java/com/ctrip/fun/golf/service/user/UserExtService.java

@@ -272,6 +272,11 @@ public class UserExtService extends GenericService<UserExtDao, UserExt, Integer,
 		this.userPhoneChangeLogDao = userPhoneChangeLogDao;
 		this.userPhoneChangeLogDao = userPhoneChangeLogDao;
 	}
 	}
 
 
+	/**
+	 * 更新社员过期时间
+	 * @param userExt
+	 * @return
+	 */
 	public Integer editVipDate(UserExt userExt) {
 	public Integer editVipDate(UserExt userExt) {
 		UserExt userExtInfo = userExtDao.getByUid(userExt.getUid());
 		UserExt userExtInfo = userExtDao.getByUid(userExt.getUid());
 		Calendar calendar = Calendar.getInstance();
 		Calendar calendar = Calendar.getInstance();
@@ -281,5 +286,16 @@ public class UserExtService extends GenericService<UserExtDao, UserExt, Integer,
 		return userExtDao.updateVipDate(userExtInfo);
 		return userExtDao.updateVipDate(userExtInfo);
 	}
 	}
 
 
+	/**
+	 * 删除用户社员身份
+	 * @param userExt
+	 * @return
+	 */
+	public Integer deleteVip(UserExt userExt) {
+		UserExt user = userExtDao.getByUid(userExt.getUid());
+		user.setVipGrade((user.getVipGrade() & ~VipGradeEnum.VIP2.getKey()));
+		return userExtDao.deleteVip(user);
+	}
+	
 	
 	
 }
 }