小程序：赛事订单过滤功能；赛事订单显示teeTime

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

@@ -1769,7 +1769,7 @@ public class OrderDao extends GenericHibernateDao<Order, Integer> {
     @SuppressWarnings("unchecked")
     @SuppressWarnings("unchecked")
     public PagedEntityBean<EventActivityOrderListItemBean> queryEventActivityOrders(OrderQuery queryBean) {
     public PagedEntityBean<EventActivityOrderListItemBean> queryEventActivityOrders(OrderQuery queryBean) {
         PagedEntityBean<EventActivityOrderListItemBean> pagedEntityBean = new PagedEntityBean<EventActivityOrderListItemBean>();
         PagedEntityBean<EventActivityOrderListItemBean> pagedEntityBean = new PagedEntityBean<EventActivityOrderListItemBean>();
-        String sel = "select SQL_CALC_FOUND_ROWS a.OrderID ,a.confirmType ,a.isThird, a.OrderType , a.TempOrderNo , a.OrderNo , DATE_FORMAT(a.OrderDate, '%Y-%m-%d %H:%i:%s') as OrderDate , a.OrderName , a.ProcessStatus , a.OrderUserStatus , a.PayMode ,b.resourceId, b.CourseProductID , b.ProductName , DATE_FORMAT(b.PlayDate, '%Y-%m-%d %H:%i:%s') as PlayDate , b.startTime , a.Uid , a.Amount , a.TotalAmount , a.Remark from ord_order a inner JOIN ORD_EventActivityOrderItem b on a.OrderID=b.OrderID where 1=1  and a.`enable` = true ";
+        String sel = "select SQL_CALC_FOUND_ROWS a.OrderID ,a.confirmType ,a.isThird, a.OrderType , a.TempOrderNo , a.OrderNo , DATE_FORMAT(a.OrderDate, '%Y-%m-%d %H:%i:%s') as OrderDate , a.OrderName , a.ProcessStatus , a.OrderUserStatus , a.PayMode ,b.resourceId, b.CourseProductID , b.ProductName , DATE_FORMAT(b.PlayDate, '%Y-%m-%d %H:%i:%s') as PlayDate , b.startTime , a.Uid , a.Amount , a.TotalAmount , a.Remark ,b.teeTime from ord_order a inner JOIN ORD_EventActivityOrderItem b on a.OrderID=b.OrderID where 1=1  and a.`enable` = true ";
         String cond = "";
         String cond = "";
 
 
         if (null != queryBean.getUid() && !"".equals(queryBean.getUid())) {
         if (null != queryBean.getUid() && !"".equals(queryBean.getUid())) {
@@ -1778,6 +1778,17 @@ public class OrderDao extends GenericHibernateDao<Order, Integer> {
         if (queryBean.getOrderCategory() != 0) {
         if (queryBean.getOrderCategory() != 0) {
             cond += " and a.OrderCategory=" + StringUtils.escapeSql(queryBean.getOrderCategory().toString());
             cond += " and a.OrderCategory=" + StringUtils.escapeSql(queryBean.getOrderCategory().toString());
         }
         }
+        
+        if(queryBean.getOrderStatusToUser()!=null){
+            if(queryBean.getOrderStatusToUser()==1){
+            	cond += " and (a.orderType=0 and a.processStatus & (268435520)=0)";
+            }else if(queryBean.getOrderStatusToUser()==2){
+            	cond += " and ((a.payMode IN ('P', 'M', 'G') AND a.orderType = 1 AND (a.processStatus & 303198715 = 16 OR a.processStatus & 303198715 = 4496 OR a.processStatus & 303198715 = 4368)) or (a.payMode IN ('P', 'M', 'G') AND a.orderType = 1 AND a.processStatus & 310394835 = 19))";
+            }else if(queryBean.getOrderStatusToUser()==3){
+            	cond += " and (a.payMode IN ('P', 'M') AND a.orderType = 1 AND a.processStatus & 268448832=268444672)";
+            }          	
+        }
+        
         if (queryBean.getOrderType() == 1) {
         if (queryBean.getOrderType() == 1) {
             cond += " and DATE_FORMAT(b.PlayDate, '%Y-%m-%d %H:%i') > DATE_FORMAT(now(), '%Y-%m-%d %H:%i') ";
             cond += " and DATE_FORMAT(b.PlayDate, '%Y-%m-%d %H:%i') > DATE_FORMAT(now(), '%Y-%m-%d %H:%i') ";
         } else if (queryBean.getOrderType() == 2) {
         } else if (queryBean.getOrderType() == 2) {
@@ -1821,6 +1832,7 @@ public class OrderDao extends GenericHibernateDao<Order, Integer> {
                 item.setConfirmType((Integer) map.get("confirmType"));
                 item.setConfirmType((Integer) map.get("confirmType"));
                 item.setIsThird((Integer) map.get("isThird"));
                 item.setIsThird((Integer) map.get("isThird"));
                 item.setResourceId((Integer) map.get("resourceId"));
                 item.setResourceId((Integer) map.get("resourceId"));
+                item.setTeeTime(map.get("teeTime")==null?"":map.get("teeTime").toString());
                 orderListItems.add(item);
                 orderListItems.add(item);
             }
             }