旅游订单批量接管功能

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

@@ -42,9 +42,11 @@ import com.ctrip.fun.common.vo.order.EventActivityOrderProcessBean;
 import com.ctrip.fun.common.vo.order.OpEventActivityOrderBean;
 import com.ctrip.fun.common.vo.order.OpOrderQuery;
 import com.ctrip.fun.common.vo.order.OpTourOrderBean;
+import com.ctrip.fun.common.vo.order.OrderAssignmentBean;
 import com.ctrip.fun.common.vo.order.OrderNotifyEnum;
 import com.ctrip.fun.common.vo.order.OrderPayinfoBean;
 import com.ctrip.fun.common.vo.order.OrderProcessEnum;
+import com.ctrip.fun.common.vo.order.OrderProcessLogBean;
 import com.ctrip.fun.common.vo.order.OrderQuery;
 import com.ctrip.fun.common.vo.order.OrderSourceEnum;
 import com.ctrip.fun.common.vo.order.OrderStatusEnum;
@@ -828,6 +830,45 @@ public class OpTourOrderController extends AbstractOpOrderController<TourOrderQu
     	}*/
 //    	return 1;
     }
+ 
+    
+    
+    
+    /**
+     * TODO: 套餐 批量处理完成
+     * 批量确认处理完成
+     * Add by lyhuang
+     */
+    @ResponseBody
+    @RequestMapping(value = "/batchReceive", method = RequestMethod.POST)
+    public Integer batchReceive(HttpServletRequest request, @RequestParam(value = "orderIds", required = true) String orderIds,ModelMap map) {
+    	String operator =  SpringSecurityUtil.getCurrentUserName();
+    	String orderStrArr[] = orderIds.split(",");
+    	int[] orderIntArr = new int[orderStrArr.length];
+		for (int i = 0; i < orderStrArr.length; i++) {
+			orderIntArr[i] = Integer.parseInt(orderStrArr[i]);
+			OpTourOrderBean orderBean = opTourOrderService.getDetail("",orderIntArr[i]);
+			orderBean.setPayMode(ProductPaymentTypeEnum.nameOf(orderBean.getPayMode()).getMsg());
+			orderBean.setOrderSourceString(OrderSourceEnum.valueOf(orderBean.getOrderSource()));
+			orderBean.setOrderStatusString(OrderStatusEnum.getOrderStatusEnum(orderBean.getOrderStatus()).getShowStatusName());
+			OrderAssignmentBean bean = new OrderAssignmentBean();
+			bean.setOrderId(orderIntArr[i]);
+			bean.setEid(operator);
+			bean.setAssignmentTime(new Date());
+			getOpOrderService().receive("", bean);
+			
+			OrderProcessLogBean logBean = new OrderProcessLogBean();
+			logBean.setOperator(operator);
+			logBean.setOrderId(orderIntArr[i]);
+			logBean.setProcessDesc(operator + "接管订单");
+			logBean.setUcid("123456");
+			logBean.setAni("021-123");
+			getOpOrderService().addLog("", logBean);
+		}
+        return 1;
+    }
+    
+    
     
     /*
      * 交易完成并解冻

src/main/webapp/WEB-INF/templates/tourOrder/list/tourOrderListProcessing.ftl

@@ -45,6 +45,12 @@
     	batchDeal(1);
     });
     
+    $('#batchReserve').click(function () {
+    	batchDeal(2);
+    });
+    
+    
+    
     function batchDeal(msg){
     	var checkboxes = $('[name="datacheck"]:checked');
         if (checkboxes.length == 0) {
@@ -60,12 +66,22 @@
 	
 //	        $("#orderIds").val(chgids);
 	        
-	        $.post("/tourOrder/confirmTourOrderResourceBatch",{"orderIds":chgids,"isMsg":msg},function(data){
-	        	if(data==1){
-	        		alert("处理完成, 重新加载页面！");
-	        		window.location.reload();
-	        	}
-	        });
+	        if(msg==0||msg==0){
+	        	$.post("/tourOrder/confirmTourOrderResourceBatch",{"orderIds":chgids,"isMsg":msg},function(data){
+		        	if(data==1){
+		        		alert("处理完成, 重新加载页面！");
+		        		window.location.reload();
+		        	}
+	        	});
+	         }else{
+	        	$.post("/tourOrder/batchReceive",{"orderIds":chgids},function(data){
+		        	if(data==1){
+		        		alert("处理完成, 重新加载页面！");
+		        		window.location.reload();
+		        	}
+	        	});
+	         }
+
 
         }
     }
@@ -77,6 +93,7 @@
 
 <button type="button" class="btn btn-default"  data-toggle="button" id="chgbtn">处理完成</button>
 <button type="button" class="btn btn-default"  data-toggle="button" id="chgbtnAndMsg">完成并发送短信</button>
+<button type="button" class="btn btn-default"  data-toggle="button" id="batchReserve">批量接管</button>
 <table class="table table-bordered table-striped table-font">
 <thead>  
     <tr>