亲密度增加了修改用户姓名和按名字推荐打球人功能

src/main/java/com/ctrip/fun/admin/controller/JsonController.java

@@ -2310,8 +2310,8 @@ public class JsonController {
         		if(eventGamePlayerForm.getMobilePhone()!=null&&!"".equals(eventGamePlayerForm.getMobilePhone())){
         			temp.setMobilePhone(eventGamePlayerForm.getMobilePhone());
         		}
-        		if(eventGamePlayerForm.getUid()!=null&&!"".equals(eventGamePlayerForm.getUid())){
-        			temp.setUid(eventGamePlayerForm.getUid());
+        		if(eventGamePlayerForm.getPlayerName()!=null&&!"".equals(eventGamePlayerForm.getPlayerName())){
+        			temp.setPlayerName(eventGamePlayerForm.getPlayerName());
         		}        		
             	eventGamePlayerService.update("", temp);
         	}

src/main/java/com/ctrip/fun/admin/controller/market/EventGameController.java

@@ -230,18 +230,27 @@ public class EventGameController {
     @RequestMapping(value = "/recommendPlayerGet", method = RequestMethod.GET)
     public String recommendPlayerGet(ModelMap model) {
     	model.put("list", new ArrayList<EventGamePlayerBean>());
+        model.put("recommendType", "0");
+        model.put("recommendContent", "");
         return "market/recommendPlayer";
     } 
     
     @RequestMapping(value = "/recommendPlayerPost", method = RequestMethod.POST)
-    public String recommendPlayerPost(HttpServletRequest request, @RequestParam(value = "playerPhone", required = false) String playerPhone, ModelMap model) {
-        PagedResponseBean<EventGamePlayerBean> list = eventGamePlayerService.recommendPlayer("",playerPhone);
+    public String recommendPlayerPost(HttpServletRequest request, @RequestParam(value = "recommendType", required = false) String recommendType,@RequestParam(value = "recommendContent", required = false) String recommendContent, ModelMap model) {
+    	PagedResponseBean<EventGamePlayerBean> list = null;
+    	if(recommendType.equals("1")){
+        	list = eventGamePlayerService.recommendPlayerByName("",recommendContent);
+        }else{
+        	list = eventGamePlayerService.recommendPlayerByPhone("",recommendContent);
+        }
+    	
         if(list.getResult()==null){
         	model.put("list", new ArrayList<EventGamePlayerBean>());
         }else{
         	model.put("list", list.getResult());
         }
-        model.put("playerPhone", playerPhone);
+        model.put("recommendType", recommendType);
+        model.put("recommendContent", recommendContent);
         return "market/recommendPlayer";
     } 
     

src/main/java/com/ctrip/fun/admin/form/market/EventGamePlayerForm.java

@@ -3,6 +3,7 @@ package com.ctrip.fun.admin.form.market;
 public class EventGamePlayerForm {
 	private Integer id;//id
 	private String mobilePhone;//手机号
+	private String playerName;//打球人姓名
 	private String uid;// 打球人uid
 	private String sex;//性别
 	private Integer candicate;//差点
@@ -58,4 +59,12 @@ public class EventGamePlayerForm {
 		this.remark = remark;
 	}
 
+	public String getPlayerName() {
+		return playerName;
+	}
+
+	public void setPlayerName(String playerName) {
+		this.playerName = playerName;
+	}
+
 }

src/main/java/com/ctrip/fun/admin/service/market/EventGamePlayerService.java

@@ -173,11 +173,36 @@ public class EventGamePlayerService extends BaseService{
         return responseBean;
     }
 
-	public PagedResponseBean<EventGamePlayerBean> recommendPlayer(String string, String playerPhone) {
+	public PagedResponseBean<EventGamePlayerBean> recommendPlayerByName(String string, String name) {
         PagedResponseBean<EventGamePlayerBean> responseBean = null;
-        String uri = super.getServiceUri("uri.eventGamePlayer.recommendPlayer");
+        String uri = super.getServiceUri("uri.eventGamePlayer.recommendPlayerByName");
 
-        Request<String> request = new Request<String>("", playerPhone);
+        Request<String> request = new Request<String>("", name);
+
+        HttpEntity<Request<String>> entity = new HttpEntity<Request<String>>(request);
+
+        Response<PagedResponseBean<EventGamePlayerBean>> response = super.exchange(uri,
+                HttpMethod.POST,
+                entity,
+                new ParameterizedTypeReference<Response<PagedResponseBean<EventGamePlayerBean>>>() {
+                }
+        ).getBody();
+
+        if (null != response) {
+            if (response.getStatus() == 0) {
+                responseBean = response.getBody();
+            } else {
+                logger.error(String.format("[list] status: %d, msg: %s", response.getStatus(), response.getMessage()));
+            }
+        }
+        return responseBean;
+	}
+	
+	public PagedResponseBean<EventGamePlayerBean> recommendPlayerByPhone(String string, String phone) {
+        PagedResponseBean<EventGamePlayerBean> responseBean = null;
+        String uri = super.getServiceUri("uri.eventGamePlayer.recommendPlayerByPhone");
+
+        Request<String> request = new Request<String>("", phone);
 
         HttpEntity<Request<String>> entity = new HttpEntity<Request<String>>(request);
 

src/main/resources/properties/service.properties

@@ -463,8 +463,8 @@ uri.eventGamePlayer.get=/fun-golf-service/eventGamePlayer/get
 uri.eventGamePlayer.list=/fun-golf-service/eventGamePlayer/list
 uri.eventGamePlayer.update=/fun-golf-service/eventGamePlayer/update
 uri.eventGamePlayer.playerInfoList=/fun-golf-service/eventGamePlayer/playerInfoList
-uri.eventGamePlayer.recommendPlayer=/fun-golf-service/eventGamePlayer/recommendPlayer
-
+uri.eventGamePlayer.recommendPlayerByName=/fun-golf-service/eventGamePlayer/recommendPlayerByName
+uri.eventGamePlayer.recommendPlayerByPhone=/fun-golf-service/eventGamePlayer/recommendPlayerByPhone
 #communeExt
 uri.communeExt.list=/fun-golf-service/communeExt/list
 uri.communeExt.get=/fun-golf-service/communeExt/get

src/main/webapp/WEB-INF/templates/market/createGroup.ftl

@@ -122,32 +122,40 @@
        thisTrChildren = $(this).parents("tr")[0].children;
        var id = thisTrChildren[0].value;
        var name;
+       var phone;
        if(thisTrChildren.length==6){
           name=thisTrChildren[2].innerHTML;
+          phone=thisTrChildren[3].innerHTML;
        }else{
           name=thisTrChildren[1].innerHTML;
+          phone=thisTrChildren[2].innerHTML;
        }
        $("#editPlayerTr").empty();
-       $("#editPlayerTr").append("<td>用户名：&nbsp;"+name+"<p> </P> 手机号： <input type='text' name='mobilePhone' style='height: 17px;margin-bottom:1px;'/> <input type='hidden'  value='"+id+"'/> </td> <td style='text-align:center;vertical-align:middle'>  <input type='button' id='editPlayerButton' value='确定'/> </td>");
+       $("#editPlayerTr").append("<td>用户名： <input type='text' name='userName' value='"+name+"' style='height: 17px;margin-bottom:1px;'/>  <p> </P> 手机号： <input type='text' name='mobilePhone' value='"+phone+"' style='height: 17px;margin-bottom:1px;'/> <input type='hidden'  value='"+id+"'/> </td> <td style='text-align:center;vertical-align:middle'>  <input type='button' id='editPlayerButton' value='确定'/> </td>");
        $("#editPlayerModal").modal('show');
 	});
 		
     $("#editPlayerTr").on("click", "#editPlayerButton", function () {
          $('#editPlayerModal').modal('hide');
-         var  mobilePhone= $(this).parents("tr")[0].children[0].children[1].value;
-         var id = $(this).parents("tr")[0].children[0].children[2].value;
+         var  playerName= $(this).parents("tr")[0].children[0].children[0].value;
+         var  mobilePhone= $(this).parents("tr")[0].children[0].children[2].value;
+  
+         var id = $(this).parents("tr")[0].children[0].children[3].value;
          $.ajax({
             url: "/j/updatePlayer",
             type: "get",
             data: {
               id:id,
+              playerName:playerName,
               mobilePhone:mobilePhone
             },
             success: function (obj) {
   			   alert("修改成功"); 
   			   if(thisTrChildren.length==6){
+  			     thisTrChildren[2].innerHTML=playerName;
 	             thisTrChildren[3].innerHTML=mobilePhone;
 	           }else{
+	              thisTrChildren[1].innerHTML=playerName;
 	              thisTrChildren[2].innerHTML=mobilePhone;
 	           }  
             }

src/main/webapp/WEB-INF/templates/market/recommendPlayer.ftl

 <#assign pageJsContent>
 <script type="text/javascript">
+    
 
+    
+$("#recommendSubmitButton").click(function(){ 
+    var recommendType  = $("#recommendType option:selected").val(); 
+    var recommendContent = $("input[name='recommendContent']").val();
+    if(recommendType=="0"){
+        alert("请选择推荐类型");
+        return;
+    }
+    if(recommendContent==""){
+        alert("请输入推荐内容");
+        return;
+    }
+    $("#recommendform").submit();
+});    
+    
+     
 </script>
 </#assign>
 
 <@com.layout title="资源编辑" module="communeAdm" current="userOrderBehaviour_recommendPlayer" pageJs=pageJsContent>
-	<form action='/market/eventGame/recommendPlayerPost' method="post">
-		已报名客户手机号：<input type="text" name="playerPhone" value='${playerPhone!}'/>
-		<input type=submit name="submit1" value="推荐" style='margin-bottom: 10px;'>
+	<form action='/market/eventGame/recommendPlayerPost' method="post" id="recommendform">
+	         推荐类型
+	    <select id='recommendType' name='recommendType'>
+	      <option value ="0" <#if recommendType == '0'>selected</#if>>请选择</option>
+		  <option value ="1" <#if recommendType == '1'>selected</#if>  >姓名推荐</option>
+		  <option value ="2" <#if recommendType == '2'>selected</#if>  >手机号推荐</option>
+		</select>
+		推荐内容：<input type="text" name="recommendContent" value='${recommendContent!}'/>
+		<input type='button' id='recommendSubmitButton' value="推荐" style='margin-bottom: 10px;'>
 	</form> 
 	
 	<table class="table table-bordered table-striped">