add the delay order

src/main/java/com/ctrip/fun/golf/dao/order/OrderDao.java

@@ -1436,6 +1436,9 @@ public class OrderDao extends GenericHibernateDao<Order, Integer> {
         } else if (orderQuery.getOrderSourceCategory() == OrderSourceCategoryEnum.OFFLINE.getValue()) {
         } else if (orderQuery.getOrderSourceCategory() == OrderSourceCategoryEnum.OFFLINE.getValue()) {
             sb.append(" and od.onlineOrderFlag = false ");
             sb.append(" and od.onlineOrderFlag = false ");
         }
         }
+        if(orderQuery.getDelayOrder() != null && orderQuery.getDelayOrder()){
+        	sb.append(" and od.channel1 = 'Off_D' and od.channel2='01'");
+        }
         if (orderQuery.getOrderStatuses() != null && orderQuery.getOrderStatuses().size() > 0) {
         if (orderQuery.getOrderStatuses() != null && orderQuery.getOrderStatuses().size() > 0) {
             sb.append(" and (");
             sb.append(" and (");
             int index = 0;
             int index = 0;

src/main/java/com/ctrip/fun/golf/dao/order/OrderExcelDao.java

@@ -55,6 +55,8 @@ public class OrderExcelDao extends GenericHibernateDao<OrderListExcel, Integer>
             + ",orderitem.quantity"
             + ",orderitem.quantity"
             + ",od.userType"
             + ",od.userType"
             + ",od.insuranceAmount"
             + ",od.insuranceAmount"
+            + ",od.channel1"
+            + ",od.channel2"
             +" from ord_order od join ord_orderitem orderitem on od.OrderID=orderitem.OrderID"
             +" from ord_order od join ord_orderitem orderitem on od.OrderID=orderitem.OrderID"
             +" join prd_course course on course.id=orderitem.courseId"
             +" join prd_course course on course.id=orderitem.courseId"
             +" left join prd_resourceprice prc on orderitem.PlayDate = prc.priceDate AND orderitem.ResourceID = prc.ResourceID"
             +" left join prd_resourceprice prc on orderitem.PlayDate = prc.priceDate AND orderitem.ResourceID = prc.ResourceID"
@@ -140,6 +142,11 @@ public class OrderExcelDao extends GenericHibernateDao<OrderListExcel, Integer>
         } else if (orderQuery.getOrderSourceCategory() == OrderSourceCategoryEnum.OFFLINE.getValue()) {
         } else if (orderQuery.getOrderSourceCategory() == OrderSourceCategoryEnum.OFFLINE.getValue()) {
             sb.append(" and od.onlineOrderFlag = false ");
             sb.append(" and od.onlineOrderFlag = false ");
         }
         }
+        
+        if(orderQuery.getDelayOrder() != null && orderQuery.getDelayOrder()){
+        	sb.append(" and od.channel1 = 'Off_D' and od.channel2='01'");
+        }
+        
         if (orderQuery.getOrderStatuses() != null && orderQuery.getOrderStatuses().size() > 0) {
         if (orderQuery.getOrderStatuses() != null && orderQuery.getOrderStatuses().size() > 0) {
             sb.append(" and (");
             sb.append(" and (");
             int index = 0;
             int index = 0;

src/main/java/com/ctrip/fun/golf/domain/order/OrderListExcel.java

@@ -168,6 +168,16 @@ public class OrderListExcel {
      * 保险金额
      * 保险金额
      * */
      * */
     private Double insuranceAmount;
     private Double insuranceAmount;
+    
+    /**
+    *后台下单渠道1
+    **/
+    private String channel1;
+    
+    /**
+     *后台下单渠道2
+     **/
+    private String channel2;
 
 
     public long getOrderNo() {
     public long getOrderNo() {
         return orderNo;
         return orderNo;
@@ -631,6 +641,23 @@ public class OrderListExcel {
 	public void setInsuranceAmount(Double insuranceAmount) {
 	public void setInsuranceAmount(Double insuranceAmount) {
 		this.insuranceAmount = insuranceAmount;
 		this.insuranceAmount = insuranceAmount;
 	}
 	}
+
+	public String getChannel1() {
+		return channel1;
+	}
+
+	public void setChannel1(String channel1) {
+		this.channel1 = channel1;
+	}
+
+	public String getChannel2() {
+		return channel2;
+	}
+
+	public void setChannel2(String channel2) {
+		this.channel2 = channel2;
+	}
+
     
     
     
     
 
 

src/main/java/com/ctrip/fun/golf/service/order/OpCourseOrderService.java

@@ -1073,6 +1073,12 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
         }
         }
         //增加保险  add by caosy
         //增加保险  add by caosy
         bean.setInsuranceAmount(xsl.getInsuranceAmount());
         bean.setInsuranceAmount(xsl.getInsuranceAmount());
+        //add by caosy for delay order
+        if("Off_D".equals(xsl.getChannel1())&& "01".equals(xsl.getChannel2())){
+        	bean.setDelayOrder(true);
+        }else{
+        	bean.setDelayOrder(false);
+        }
         return bean;
         return bean;
     }
     }