Merge branch 'f-6.6.4' of 192.168.10.6:caosy/fun-admin into f-6.6.4

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

@@ -333,7 +333,7 @@ public class OpEventActivityOrderController extends AbstractOpOrderController<Ev
     @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 = "formatTeeTime", required = true) String teeTime) {
+    		@RequestParam(value = "formatTeeTime", required = true) String teeTime, @RequestParam(value = "orderStatus") String orderStatus) {
     	Response response = new Response();
     	OpEventActivityOrderBean orderBean = opEventActivityOrderService.getDetail("", orderId);
     	//result = "redirect:/eventActivityOrder/detail?orderId="+orderId +"&current=" + OrderUtil.getEventActivityListPageByStatus(orderStatus);
@@ -348,7 +348,13 @@ public class OpEventActivityOrderController extends AbstractOpOrderController<Ev
     	processBean.setUcid("123456");
     	//add by caosy
     	processBean.setProductId(orderBean.getProductId());
-    	processBean.setSendMsg(isMsg == 1 ? true : false);
+    	String resultStatus = OrderUtil.getEventActivityListPageByStatus(orderStatus);
+    	if("list_processing".equals(resultStatus)){
+    		//待处理的，这个地方不需要发短信
+    		processBean.setSendMsg(false);
+    	}else{
+    		processBean.setSendMsg(true);
+    	}
     	processBean.setOperateType(OrderProcessEnum.CONFIRM_RESOURCE.getOperationCode()); // 确认资源
     	response = opEventActivityOrderService.confirmEventActivityOrderResourceTeeTime("", processBean);
     	return response;

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

@@ -271,19 +271,29 @@
 	            return false;
 	        }
 	        //invalidBtn(_SelfJQ);
+		   
+		  
 	        if(validateRealPlayTime()){
 	            validBtn(_SelfJQ);
 	            return false;
 	        }else{
+	        	/*var bool = window.confirm("即将修改teetime，是否需要短信通知客户？"); 
+	        	var isMsg = 0;
+	        	if(bool){
+	        		isMsg = 1;
+	        	}else{
+	        		isMsg = 0;
+	        	}*/
 	    		jQuery.ajax({
 	        		type:"POST",
 	        		contentType:"application/x-www-form-urlencoded",
 	        		url:"/eventActivityOrder/confirmEventActivityOrderResourceTeeTime",
 	        		data:{
 	        				orderId:$("input[name='orderId']").val(),
-	        			    isMsg:$("input[name='isMsg']").val(),
+	        			    isMsg:1,
 			    			operator:$("input[name='operator']").val(),
-			    			formatTeeTime:$("input[name='formatTeeTime']").val()
+			    			formatTeeTime:$("input[name='formatTeeTime']").val(),
+			    			orderStatus:$("input[name='orderStatus']").val()
 	        		},
 	        		success:function(data){
 	        			data = eval(data);