1.用户会员到期日期更改

src/main/java/com/ctrip/fun/admin/controller/system/UserController.java

@@ -208,17 +208,26 @@ public class UserController {
     	Date date = new Date();
     	Calendar cal = Calendar.getInstance();
     	cal.setTime(date);//设置起时间
-    	if(form.getAddDateType() != null && form.getAddDateType() == 0){
+    	if(form.getAddDateType() != null && form.getAddDateType() == 1){
         	cal.add(Calendar.MONTH, 1);//增加一个月  
     		userExtBean.setCommuneAgainTime(cal.getTime());
-    	} else if(form.getAddDateType() != null && form.getAddDateType() == 0){
+    	} else if(form.getAddDateType() != null && form.getAddDateType() == 2){
     		cal.add(Calendar.YEAR, 1);//增加一年
     		userExtBean.setCommuneAgainTime(cal.getTime());
     	} else if(form.getCommuneAgainTime() != null){
     		userExtBean.setCommuneAgainTime(form.getCommuneAgainTime());
     	}
-    	boolean result = userService.editVipDate(form);
-        return "system/UserEditForm";
+    	boolean result = userService.editVipDate(userExtBean);
+        return "redirect:/system/user/" + form.getUid() + "/detailByUid";
+    }
+    
+    @RequestMapping(value = "/deleteVip", method = RequestMethod.GET)
+    public String deleteVip(@ModelAttribute("form") UserQueryForm form,HttpServletRequest request,ModelMap model) {
+    	
+    	UserExtBean userExtBean = new UserExtBean();
+    	userExtBean.setUid(form.getUid());
+    	boolean result = userService.deleteVip(userExtBean);
+        return "redirect:/system/user/" + form.getUid() + "/detailByUid";
     }
 
     

src/main/java/com/ctrip/fun/admin/service/system/UserService.java

@@ -547,9 +547,9 @@ public class UserService extends BaseService {
         return pageResponseBean;
     }
 
-	public boolean editVipDate(UserQueryForm form) {
-		Request<UserQueryForm> request = new Request<UserQueryForm>("",form);
-        HttpEntity<Request<UserQueryForm>> entity = new HttpEntity<Request<UserQueryForm>>(request);
+	public boolean editVipDate(UserExtBean userExtBean) {
+		Request<UserExtBean> request = new Request<UserExtBean>("",userExtBean);
+        HttpEntity<Request<UserExtBean>> entity = new HttpEntity<Request<UserExtBean>>(request);
         Response<Boolean> response = super.exchange(
                 this.getServiceUri("uri.User.editVipDate"), HttpMethod.POST, entity,
                 new ParameterizedTypeReference<Response<Boolean>>() {
@@ -559,7 +559,26 @@ public class UserService extends BaseService {
         } else {
             Map<String, String> tags = new HashMap<>();
             logger.error(
-                    "editVipDatePost异常",
+                    "editVipDate异常",
+                    String.format("status: %d, msg: %s", response.getStatus(),
+                            response.getMessage()), tags);
+        }
+        return response.getBody();
+	}
+
+	public boolean deleteVip(UserExtBean userExtBean) {
+		Request<UserExtBean> request = new Request<UserExtBean>("",userExtBean);
+        HttpEntity<Request<UserExtBean>> entity = new HttpEntity<Request<UserExtBean>>(request);
+        Response<Boolean> response = super.exchange(
+                this.getServiceUri("uri.User.deleteVip"), HttpMethod.POST, entity,
+                new ParameterizedTypeReference<Response<Boolean>>() {
+                }).getBody();
+        if (response == null || response.getBody() == null || response.getStatus() != 0) {
+            return false;
+        } else {
+            Map<String, String> tags = new HashMap<>();
+            logger.error(
+                    "deleteVip异常",
                     String.format("status: %d, msg: %s", response.getStatus(),
                             response.getMessage()), tags);
         }

src/main/resources/properties/service.properties

@@ -16,6 +16,7 @@ uri.User.getOutsideUser=/fun-golf-service/user/getOutsideUserByUsername
 uri.User.transferAmt=/fun-golf-service/user/transferOutsideUserAmt
 uri.user.prepayCardLogs=/fun-golf-service/prepayCardLogs
 uri.User.editVipDate=/fun-golf-service/userext/editVipDate
+uri.User.deleteVip=/fun-golf-service/userext/deleteVip
 #Voucher
 uri.Voucher.QueryVoucherList=/fun-golf-service/Voucher/QueryVoucherList
 uri.Voucher.queryUnusedListForOp=/fun-golf-service/Voucher/queryUnusedListForOp

src/main/webapp/WEB-INF/templates/system/UserEditForm.ftl

@@ -4,30 +4,37 @@
        		 $("#communeAgainTime").iCalendar({
 	            placeholder: $("#communeAgainTime").val() ? $("#communeAgainTime").val() : "blank"
 	         });
-	         $("#submitAddMonth").onclick({
-	         	$("#addDateType").val(1);
+	         $('#submitAddMonth').click(function () {
+	         	$("#addDateType").val("1");
 	            $("#searchUserListForm").submit();
 	         });
+	         $('#submitAddYear').click(function () {
+	         	$("#addDateType").val("2");
+	            $("#searchUserListForm").submit();
+	         });
+	         $("#deleteVip").click(function (){
+ 		       window.location.href ="/system/user/deleteVip?uid=${uid}"
+	         });
            })
        </script>
 </#assign>
 
-<@com.layout title="用户创建" module="system" current="admin_user_create" pageJs=pageJsContent>
+<@com.layout title="用户创建" module="system" current="" pageJs=pageJsContent>
 <form id="searchUserListForm" class="form-inline search-box" action="/system/user/editVipDate" method="post">
     <div id="course_container">
         <div class="row-fluid show-grid">
             <@form.textInput "form.communeAgainTime" "class=\"input-medium\" required" "社员到期日期"/>
             <!--<@form.hidden "form.addDateType"/>-->
             <@form.hidden "form.uid"/>
-        	<input type="hidden" id="addDateType" name="form.addDateType">
+        	<input type="hidden" id="addDateType" name="addDateType">
             <div class="control-group">
                 <div class="controls">
                     <button type="submit" class="btn btn-primary">提交</button>
                     &nbsp;
-                    <button id="submitAddMonth" class="btn btn-primary">增加一个月</button>
-                    <button id="submitAddYear" class="btn btn-primary">增加一年</button>
+                    <button type="button" id="submitAddMonth" class="btn btn-primary">增加一个月</button>
+                    <button type="button" id="submitAddYear" class="btn btn-primary">增加一年</button>
                     </br></br>
-                    <button id="" class="btn btn-primary">注销社员</button>
+                    <button type="button" id="deleteVip" class="btn btn-primary">注销社员</button>
                 </div>
             </div>
         </div>