1.修改用户密码

2.修改社员到期时间
3.用户基本信息查询

src/main/java/com/ctrip/fun/admin/controller/basic/UserBasicInfoController.java

+package com.ctrip.fun.admin.controller.basic;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.ctrip.fun.admin.form.PaginationForm;
+import com.ctrip.fun.admin.service.basic.UserBasicInfoService;
+import com.ctrip.fun.admin.service.system.UserDetailsService;
+import com.ctrip.fun.admin.utility.SpringSecurityUtil;
+import com.ctrip.fun.common.vo.PagedResponseBean;
+import com.ctrip.fun.common.vo.basic.InvoiceRequestBean;
+import com.ctrip.fun.common.vo.basic.UserInvoiceTitleBean;
+import com.ctrip.fun.common.vo.basic.UserInvoiceTitleQuery;
+
+@Controller
+@RequestMapping("/userBasicInfo")
+public class UserBasicInfoController {
+
+	
+	@Autowired
+	private UserDetailsService userDetailsService;
+	
+	@Autowired
+	private UserBasicInfoService userBasicInfoService;
+	
+	/**
+     * 任务列表
+     */
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    public String queryUserInvoiceInfoList(HttpServletRequest request, @ModelAttribute("dto") UserInvoiceTitleQuery query,
+            ModelMap model) {
+        int currentPage = 0;
+        int pageSize;
+        int total;
+        int pageCount;
+        if (null != request.getParameter("page")) {
+            currentPage = Integer.parseInt(request.getParameter("page"));
+        }
+        query.setPagerOffset(currentPage * query.getPagerPerPage());
+        
+        String currentUserName = SpringSecurityUtil.getCurrentUserName();
+        boolean isFinance = false;
+        UserDetails userDetails = userDetailsService.loadUserByUsername(currentUserName);
+        Collection<? extends GrantedAuthority>  c = userDetails.getAuthorities();
+        for (GrantedAuthority g : c) {
+			if("ROLE_insuranceFinance".equals(g.getAuthority())){
+				isFinance = true;
+				break;
+			}
+        }
+        
+        
+        PagedResponseBean<UserInvoiceTitleBean> response = userBasicInfoService.queryUserInvoiceInfoList(currentUserName, query);
+        List<InvoiceRequestBean> list = new ArrayList<InvoiceRequestBean>();
+        list.add(null);
+        pageSize = query.getPagerPerPage();
+        total = response.getCount();
+        
+        pageCount = (0 == total % pageSize) ? (total / pageSize) : (total / pageSize + 1);
+        model.put("list",response.getResult());
+        model.put("paginationData", new PaginationForm(currentPage, pageSize, pageCount, total));
+        return "basic/invoiceRequest/invoiceRequestList";
+    }
+	
+}

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

@@ -7,6 +7,7 @@ package com.ctrip.fun.admin.controller.system;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collection;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -21,11 +22,13 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.ctrip.fun.admin.form.PaginationForm;
 import com.ctrip.fun.admin.form.system.UserQueryForm;
+import com.ctrip.fun.admin.form.userRole.UserRoleForm;
 import com.ctrip.fun.admin.service.system.UserService;
 import com.ctrip.fun.admin.template.FlashMessageDirective;
 import com.ctrip.fun.common.core.util.BeanConverter;
@@ -177,6 +180,48 @@ public class UserController {
     }
     
     
+    @RequestMapping(value = "/editVipDate", method = RequestMethod.GET)
+    public String editVipDateGet(@ModelAttribute("form") UserQueryForm form,HttpServletRequest request,  @RequestParam(value = "uid", required = true) String uid,
+            ModelMap model) {
+    	 UserExtBean bean = null;
+    	if (null != uid) {
+            // 获取用户基本信息
+            bean = userService.getDetailByUid("", uid);
+    	}
+    	if(bean != null){
+    		form.setUid(uid);
+    		form.setCommuneAgainTime(DateUtil.addDateField(bean.getCommuneAgainTime(), Calendar.YEAR, 1));
+    	}
+        model.put("uid", form.getUid());
+        return "system/UserEditForm";
+    }
+    
+    @RequestMapping(value = "/editVipDate", method = RequestMethod.POST)
+    public String editVipDatePost(@ModelAttribute("form") UserQueryForm form,HttpServletRequest request,ModelMap model) {
+    	
+    	if(form.getAddDateType() == null && form.getCommuneAgainTime() == null){
+    		return "system/UserEditForm";
+    	}
+    	UserExtBean userExtBean = new UserExtBean();
+    	userExtBean.setUid(form.getUid());
+    	//获取时间加一年或加一月或加一天
+    	Date date = new Date();
+    	Calendar cal = Calendar.getInstance();
+    	cal.setTime(date);//设置起时间
+    	if(form.getAddDateType() != null && form.getAddDateType() == 0){
+        	cal.add(Calendar.MONTH, 1);//增加一个月  
+    		userExtBean.setCommuneAgainTime(cal.getTime());
+    	} else if(form.getAddDateType() != null && form.getAddDateType() == 0){
+    		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";
+    }
+
+    
     
     /**
      * 获取兑换礼品列表

src/main/java/com/ctrip/fun/admin/controller/userRole/UserRoleController.java

@@ -207,4 +207,12 @@ public class UserRoleController {
     	userRoleService.deleteRole("", form.getId());
         return "redirect:roleList";
     }
+    
+    @RequestMapping(value = "/resetAdminUserPassword", method = RequestMethod.GET)
+    public String resetAdminUserPassword(HttpServletRequest request, @RequestParam(value = "id", required = true) int id, ModelMap model) {
+    	userRoleService.resetAdminUserPassword("", id);
+        return "redirect:list";
+    }
+    
+    
 }

src/main/java/com/ctrip/fun/admin/form/system/UserQueryForm.java

@@ -29,6 +29,9 @@ public class UserQueryForm {
     private Date communeAgainTimeStart;
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date communeAgainTimeEnd;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date communeAgainTime;
+    private Integer addDateType;
     
     public void trim() {
         this.uid = null == this.uid ? null : this.uid.trim();
@@ -145,4 +148,21 @@ public class UserQueryForm {
 		this.communeAgainTimeEnd = communeAgainTimeEnd;
 	}
 
+	public Date getCommuneAgainTime() {
+		return communeAgainTime;
+	}
+
+	public void setCommuneAgainTime(Date communeAgainTime) {
+		this.communeAgainTime = communeAgainTime;
+	}
+
+	public Integer getAddDateType() {
+		return addDateType;
+	}
+
+	public void setAddDateType(Integer addDateType) {
+		this.addDateType = addDateType;
+	}
+    
+
 }

src/main/java/com/ctrip/fun/admin/service/basic/UserBasicInfoService.java

+package com.ctrip.fun.admin.service.basic;
+
+import java.util.ArrayList;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.web.client.RestClientException;
+
+import com.ctrip.fun.admin.service.BaseService;
+import com.ctrip.fun.common.vo.PagedResponseBean;
+import com.ctrip.fun.common.vo.Request;
+import com.ctrip.fun.common.vo.Response;
+import com.ctrip.fun.common.vo.ResponseStatusEnum;
+import com.ctrip.fun.common.vo.basic.UserInvoiceTitleBean;
+import com.ctrip.fun.common.vo.basic.UserInvoiceTitleQuery;
+
+public class UserBasicInfoService extends BaseService {
+	
+	private static final Logger logger = LoggerFactory.getLogger(UserBasicInfoService.class);
+
+	public PagedResponseBean<UserInvoiceTitleBean> queryUserInvoiceInfoList(
+			String currentUserName, UserInvoiceTitleQuery query) {
+		PagedResponseBean<UserInvoiceTitleBean> responseBean = new PagedResponseBean<UserInvoiceTitleBean>(0,
+                new ArrayList<UserInvoiceTitleBean>());
+        String uri = super.getServiceUri("uri.userInvoiceInfo.queryList");
+        Request<UserInvoiceTitleQuery> request = new Request<UserInvoiceTitleQuery>("", query);
+        HttpEntity<Request<UserInvoiceTitleQuery>> entity = new HttpEntity<Request<UserInvoiceTitleQuery>>(request);
+        Response<PagedResponseBean<UserInvoiceTitleBean>> response = null;
+        try {
+            response = super.exchange(uri, HttpMethod.POST, entity,
+                    new ParameterizedTypeReference<Response<PagedResponseBean<UserInvoiceTitleBean>>>() {
+                    }).getBody();
+        } catch (RestClientException e) {
+            logger.error(e.getMessage());
+        }
+        if (null != response && response.getStatus() == ResponseStatusEnum.SUCCESS.getValue()) {
+            responseBean = response.getBody();
+        } else {
+            logger.error("{} status: {}, msg: {}", "获取用户常用发票列表异常", response.getStatus(),
+                    response.getMessage());
+        }
+        return responseBean;
+	}
+
+}

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

@@ -15,6 +15,7 @@ import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
 
+import com.ctrip.fun.admin.form.system.UserQueryForm;
 import com.ctrip.fun.admin.service.BaseService;
 import com.ctrip.fun.common.vo.PagedResponseBean;
 import com.ctrip.fun.common.vo.Request;
@@ -546,4 +547,23 @@ 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);
+        Response<Boolean> response = super.exchange(
+                this.getServiceUri("uri.User.editVipDate"), 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(
+                    "editVipDatePost异常",
+                    String.format("status: %d, msg: %s", response.getStatus(),
+                            response.getMessage()), tags);
+        }
+        return response.getBody();
+	}
+
 }

src/main/java/com/ctrip/fun/admin/service/userRole/UserRoleService.java

@@ -335,4 +335,30 @@ public class UserRoleService extends BaseService {
         return result;
 	}
 
+	public Integer resetAdminUserPassword(String userId, Integer id) {
+		String uri = super.getServiceUri("uri.adminUser.resetAdminUserPassword");
+		Integer result  = null;
+
+        Request<Integer> request = new Request<Integer>();
+        request.setUserId(userId);
+        request.setBody(id);
+        HttpEntity<Request<Integer>> httpEntity = new HttpEntity<Request<Integer>>(
+                request);
+        Response<Integer> response = super.exchange(uri, HttpMethod.POST,
+                httpEntity,
+                new ParameterizedTypeReference<Response<Integer>>() {
+                }).getBody();
+        if (response.getStatus() == ResponseStatusEnum.SUCCESS.getValue()) {
+        	result = response.getBody();
+        } else {
+            Map<String, String> tags = new HashMap<>();
+            tags.put("userId", userId);
+            logger.error(
+                    "用户list异常",
+                    String.format("status: %d, msg: %s", response.getStatus(),
+                            response.getMessage()), tags);
+        }
+        return result;
+	}
+    
 }

src/main/resources/config/spring-service.xml

@@ -391,5 +391,6 @@
 		<property name="proxyHost" value="${proxyHost}" />
 		<property name="proxyPort" value="${proxyPort}" />
 	</bean>
-
+	<bean name="userBasicInfoService" class="com.ctrip.fun.admin.service.basic.UserBasicInfoService"
+		parent="baseService" />
 </beans>

src/main/resources/properties/service.properties

@@ -15,6 +15,7 @@ uri.User.updateBlockFlag=/fun-golf-service/userext/updateBlockFlag
 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
 #Voucher
 uri.Voucher.QueryVoucherList=/fun-golf-service/Voucher/QueryVoucherList
 uri.Voucher.queryUnusedListForOp=/fun-golf-service/Voucher/queryUnusedListForOp
@@ -39,6 +40,7 @@ uri.adminUser.getUserRoleById=/fun-golf-service/adminUser/getUserRoleById
 uri.adminUser.updateAdminRole=/fun-golf-service/adminUser/updateAdminRole
 uri.adminUser.addResources=/fun-golf-service/adminUser/addResources
 uri.adminUser.deleteAdminRole=/fun-golf-service/adminUser/deleteAdminRole
+uri.adminUser.resetAdminUserPassword=/fun-golf-service/adminUser/resetAdminUserPassword
 # order
 uri.order.placeOrder=/fun-golf-service/{orderType}/placeOrder
 uri.order.list=/fun-golf-service/{orderType}/list
@@ -608,3 +610,4 @@ uri.invoiceRequest.batchUpdate=/fun-golf-service/invoiceRequest/batchUpdate
 uri.invoiceRequest.queryList=/fun-golf-service/invoiceRequest/list
 uri.invoiceRequest.excelList=/fun-golf-service/invoiceRequest/excelList
 
+uri.userInvoiceInfo.queryList=/fun-golf-service/userInvoiceInfo/list

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

+<#assign pageJsContent>
+      <script type="text/javascript">
+           $(function () {
+       		 $("#communeAgainTime").iCalendar({
+	            placeholder: $("#communeAgainTime").val() ? $("#communeAgainTime").val() : "blank"
+	         });
+	         $("#submitAddMonth").onclick({
+	         	$("#addDateType").val(1);
+	            $("#searchUserListForm").submit();
+	         });
+           })
+       </script>
+</#assign>
+
+<@com.layout title="用户创建" module="system" current="admin_user_create" 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">
+            <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>
+                    </br></br>
+                    <button id="" class="btn btn-primary">注销社员</button>
+                </div>
+            </div>
+        </div>
+    </div>
+</form>
+</@com.layout>
\ No newline at end of file

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

@@ -342,6 +342,8 @@ $(function() {
         <th colspan="4">用户信息&nbsp;&nbsp;
             <a href="/order/orderList/order?phone=${bean.mobilePhone!}&uname=${bean.userName!}&uid=${uid!}" >
             <div class="btn btn-primary">下单 </div></a>
+            <a href="/system/user/editVipDate?uid=${bean.uid!}" >
+            <div class="btn btn-primary">修改信息 </div></a>
             <div id="connent" style="float:right">
            		 <div style="color:red;font-weight:bold" id="blockFlaginfo"><#if bean.blockFlag??><a style="color:red;font-weight:bold" class="statusinfo">黑名单用户</a><#else><a style="color:red;font-weight:bold" class="statusinfo">正常用户</a></#if><a  class="btn btn-primary btn-mini">修改</a>
            		 <input type="hidden"  value="${bean.blockFlag!}" id="userstatus">

src/main/webapp/WEB-INF/templates/userRole/userListAll.ftl

@@ -33,7 +33,11 @@
             <td >${item.userName!}</td>
             <td >${item.roleDesc!}</td>
             <td >${item.enable?string("是","否")}</td>
-            <td><a title='' href="/userRole/adminUser/edit?id=${item.id}">编辑</a></td>
+            <td>
+            	<a title='' href="/userRole/adminUser/edit?id=${item.id}">编辑</a>
+            	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            	<a title='' href="/userRole/adminUser/resetAdminUserPassword?id=${item.id}">重置密码</a>
+            </td>
         </tr>
         </#list>
     </tbody>