debug the func of change teetime

src/main/java/com/ctrip/fun/admin/controller/order/OpEventActivityOrderController.java

@@ -14,6 +14,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
@@ -23,6 +24,8 @@ import org.springframework.web.bind.annotation.PathVariable;
 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.bind.annotation.ResponseStatus;
 
 import com.ctrip.fun.admin.form.PaginationForm;
 import com.ctrip.fun.admin.form.order.EventActivityOrderQueryForm;
@@ -35,6 +38,7 @@ import com.ctrip.fun.common.core.util.BeanConverter;
 import com.ctrip.fun.common.core.util.DateUtil;
 import com.ctrip.fun.common.core.util.StringUtils;
 import com.ctrip.fun.common.vo.PagedResponseBean;
+import com.ctrip.fun.common.vo.Response;
 import com.ctrip.fun.common.vo.basic.VoucherBean;
 import com.ctrip.fun.common.vo.order.EventActivityOrderListBean;
 import com.ctrip.fun.common.vo.order.EventActivityOrderListExcelBean;
@@ -325,32 +329,29 @@ public class OpEventActivityOrderController extends AbstractOpOrderController<Ev
      * add by caosy: modify the teetime
      * */
     @RequestMapping(value = "/confirmEventActivityOrderResourceTeeTime", method = RequestMethod.POST)
-    public String confirmEventActivityOrderResourceTeeTime(HttpServletRequest request, @RequestParam(value = "orderId", required = true) int orderId,
+    @ResponseStatus(HttpStatus.OK)
+    @ResponseBody
+    public Response confirmEventActivityOrderResourceTeeTime(HttpServletRequest request, @RequestParam(value = "orderId", required = true) int orderId,
     		@RequestParam(value = "operator", required = true) String operator, @RequestParam(value = "isMsg", required = true) int isMsg,
-    		@RequestParam(value = "orderStatus") String orderStatus, @RequestParam(value = "formatTeeTime", required = true) String teeTime, ModelMap map) {
-    	String result = null;
+    		@RequestParam(value = "formatTeeTime", required = true) String teeTime) {
+    	Response response = new Response();
     	OpEventActivityOrderBean orderBean = opEventActivityOrderService.getDetail("", orderId);
-    	result = "redirect:/eventActivityOrder/detail?orderId="+orderId +"&current=" + OrderUtil.getEventActivityListPageByStatus(orderStatus);
-    	if (orderBean.getOrderStatus().equals(orderStatus)) {
-    		EventActivityOrderProcessBean processBean = new EventActivityOrderProcessBean();
-    		processBean.setOperateTime(new Date());
-    		processBean.setAni("021-123");
-    		processBean.setOperator(operator);
-    		processBean.setOrderId(orderId);
-    		processBean.setProcessDesc("");
-    		processBean.setTeeTime(teeTime);
-    		processBean.setUcid("123456");
-    		//add by caosy
-    	    processBean.setProductId(orderBean.getProductId());
-    		processBean.setSendMsg(isMsg == 1 ? true : false);
-    		processBean.setOperateType(OrderProcessEnum.CONFIRM_RESOURCE.getOperationCode()); // 确认资源
-    		opEventActivityOrderService.confirmEventActivityOrderResourceTeeTime("", processBean);
-    	} else {
-    		//map.put("changedStatus", OrderStatusEnum.getOrderStatusEnum(orderBean.getOrderStatus()).getShowStatusName());
-    		//result = "redirect:/eventActivityOrder/orderList/" + OrderUtil.getEventActivityListPageByStatus(orderStatus) + "?changedStatus=" + orderBean.getOrderStatus();
-    	}
+    	//result = "redirect:/eventActivityOrder/detail?orderId="+orderId +"&current=" + OrderUtil.getEventActivityListPageByStatus(orderStatus);
     	
-    	return result;
+    	EventActivityOrderProcessBean processBean = new EventActivityOrderProcessBean();
+    	processBean.setOperateTime(new Date());
+    	processBean.setAni("021-123");
+    	processBean.setOperator(operator);
+    	processBean.setOrderId(orderId);
+    	processBean.setProcessDesc("");
+    	processBean.setTeeTime(teeTime);
+    	processBean.setUcid("123456");
+    	//add by caosy
+    	processBean.setProductId(orderBean.getProductId());
+    	processBean.setSendMsg(isMsg == 1 ? true : false);
+    	processBean.setOperateType(OrderProcessEnum.CONFIRM_RESOURCE.getOperationCode()); // 确认资源
+    	response = opEventActivityOrderService.confirmEventActivityOrderResourceTeeTime("", processBean);
+    	return response;
     }
 
     @Override

src/main/java/com/ctrip/fun/admin/service/order/OpEventActivityOrderService.java

 package com.ctrip.fun.admin.service.order;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 
 import org.slf4j.Logger;
@@ -105,17 +106,13 @@ public class OpEventActivityOrderService extends AbstractOpOrderService<EventAct
         }
     }
     
-    public void confirmEventActivityOrderResourceTeeTime(String userId, EventActivityOrderProcessBean processBean) {
+    public Response<Serializable> confirmEventActivityOrderResourceTeeTime(String userId, EventActivityOrderProcessBean processBean) {
     	String uri = super.getServiceUri("uri.eventActivityOrder.confirmEventActivityOrderResourceTeeTime");
-    	
     	Request<EventActivityOrderProcessBean> request = new Request<EventActivityOrderProcessBean>(userId, processBean);
     	HttpEntity<Request<EventActivityOrderProcessBean>> entity = new HttpEntity<Request<EventActivityOrderProcessBean>>(request);
-    	Response<Integer> response = super.exchange(uri, HttpMethod.POST, entity, new ParameterizedTypeReference<Response<Integer>>() {
+    	Response<Serializable> response = super.exchange(uri, HttpMethod.POST, entity, new ParameterizedTypeReference<Response<Serializable>>() {
     	}).getBody();
-    	if (response.getStatus() == 0) {
-    	} else {
-    		logger.error(String.format("[确认资源] status: %d, msg: %s", response.getStatus(), response.getMessage()));
-    	}
+    	return response;
     }
 
 }

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

@@ -24,7 +24,7 @@
 		<sec:intercept-url pattern="/order/detail" access="ROLE_CTRIP_PAY,ROLE_OP,ROLE_DEV,ROLE_PROD,ROLE_RISK,ROLE_ASSIST" />
 		<sec:intercept-url pattern="/order/**" access="ROLE_OP,ROLE_DEV,ROLE_PROD,ROLE_RISK,ROLE_ASSIST" />
 		<sec:intercept-url pattern="/communeOrder/**" access="ROLE_OP,ROLE_DEV,ROLE_PROD,ROLE_RISK,ROLE_ASSIST,ROLE_COMMUNE" />
-		<sec:intercept-url pattern="/eventActivityOrder/**" access="ROLE_OP,ROLE_DEV,ROLE_PROD,ROLE_RISK,ROLE_ASSIST" />
+		<sec:intercept-url pattern="/eventActivityOrder/**" access="ROLE_OP,ROLE_DEV,ROLE_PROD,ROLE_RISK,ROLE_ASSIST,ROLE_ACTIVITY_ORDER" />
 		<sec:intercept-url pattern="/rechargeOrder/**" access="ROLE_OP,ROLE_DEV,ROLE_PROD,ROLE_RISK,ROLE_ASSIST" />
 		<sec:intercept-url pattern="/accounting/**" access="ROLE_OP,ROLE_FINANCE,ROLE_DEV,ROLE_PROD,ROLE_ASSIST" />
 		<sec:intercept-url pattern="/basic/prepaycard/create" access="ROLE_IWCARD" />

src/main/webapp/WEB-INF/templates/eventActivityOrder/common/orderDetailTeeTime.ftl

@@ -46,10 +46,10 @@
             <td>
                 <input type="time" id="realpaytime" name="formatTeeTime" value="${orderBean.teeTime}" placeholder="TeeTime" class="input-medium" 
                 style="display:inline; width:50%;">
-                <form id="form" action = "/eventActivityOrder/confirmEventActivityOrderResourceTeeTime" method="post" style="display:none;" >
+                <form id="form_eventactivity" action = "" method="post" style="display:none;" >
 				    <#include "../common/orderPayInfoEdit.ftl">
 				</form>
-				    <a href="javascript:;" onclick="submitEventActivityOrderWithMsg($(this))" class="btn btn-primary btn-small" style="display:inline; margin-left:10px;vertical-align:5px;">修改</a>
+				    <a href="javascript:;" onclick="changeEventActivityResourceTeeTime($(this))" class="btn btn-primary btn-small" style="display:inline; margin-left:10px;vertical-align:5px;">修改</a>
              
             </td>
         </tr>

src/main/webapp/resource/js/app/op.js

@@ -266,7 +266,41 @@
 			$("#form").append($("#realpaytime")).submit();
 		}
 	}
+	function changeEventActivityResourceTeeTime(_SelfJQ){
+		  if(!isBtnValid(_SelfJQ)){
+	            return false;
+	        }
+	        //invalidBtn(_SelfJQ);
+	        if(validateRealPlayTime()){
+	            validBtn(_SelfJQ);
+	            return false;
+	        }else{
+	    		jQuery.ajax({
+	        		type:"POST",
+	        		contentType:"application/x-www-form-urlencoded",
+	        		url:"/eventActivityOrder/confirmEventActivityOrderResourceTeeTime",
+	        		data:{
+	        				orderId:$("input[name='orderId']").val(),
+	        			    isMsg:$("input[name='isMsg']").val(),
+			    			operator:$("input[name='operator']").val(),
+			    			formatTeeTime:$("input[name='formatTeeTime']").val()
+	        		},
+	        		success:function(data){
+	        			data = eval(data);
+	        			if(data.status == 0){
+	        				alert("修改成功！");
+	        				location.reload();
+	        			}else{
+	        				alert("修改失败！" + data.message);
+	        			}
+	        		},
+	        		error:function(){
+	        			alert("修改失败！");
+	        		}
+	        	});
+	        }
 
+	}
 	function submitChargeWithOutMsg(_SelfJQ){
 		if(!isBtnValid(_SelfJQ)){
 			return false;