打球人查询

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

@@ -1901,8 +1901,10 @@ public class OrderDao extends GenericHibernateDao<Order, Integer> {
     public PagedResponseBean<EventActivityOrderListBean> queryEventActivityOrderList(OpOrderQuery orderQuery) {
         StringBuilder sb = new StringBuilder(300);
 
-        sb.append(" select SQL_CALC_FOUND_ROWS od.uid,od.orderType,od.confirmType,invo.invoiceId,od.processStatus,od.orderId,od.orderNo,od.orderName,od.payMode,od.actualAmount,od.orderDate,od.payDate,od.orderSource,od.orderStatus,od.notifyFlag,od.onlineOrderFlag,od.amount,od.totalAmount,od.PrePayAmount,od.outTradeId,od.isConfirm ,case when user.BindedMobilePhone !='' then user.BindedMobilePhone else user.MobilePhone end as mobilePhone,user.userName,orderitem.quantity,orderitem.teeTime,orderitem.playDate");
+        sb.append(" select SQL_CALC_FOUND_ROWS od.uid,od.orderType,od.confirmType,invo.invoiceId,od.processStatus,od.orderId,od.orderNo,od.orderName,od.payMode,od.actualAmount,od.orderDate,od.payDate,od.orderSource,od.orderStatus,od.notifyFlag,od.onlineOrderFlag,od.amount,od.totalAmount,od.PrePayAmount,od.outTradeId,od.isConfirm ,case when user.BindedMobilePhone !='' then user.BindedMobilePhone else user.MobilePhone end as mobilePhone,user.userName,orderitem.quantity,orderitem.teeTime,orderitem.playDate,GROUP_CONCAT(ec.cName)cName");
         sb.append(" from ord_order od " + "join ord_eventactivityorderitem orderitem on (od.OrderID=orderitem.orderId) ");
+        //关联赛事打球人信息
+        sb.append(" left join event_customerinfo ec on (od.OrderID = ec.OrderID)");
         sb.append(" left join bsc_userext user on od.uid=user.uid ");
         sb.append(" left join ord_invoiceinfo invo ON (od.OrderID = invo.OrderId)");
         sb.append(" JOIN prd_course cs ON orderitem.courseId = cs.id ");
@@ -1954,6 +1956,11 @@ public class OrderDao extends GenericHibernateDao<Order, Integer> {
             sb.append(" and orderitem.playDate<=:playEndDate ");
             parameters.put("playEndDate", orderQuery.getPlayEndDate());
         }
+        //关联赛事打球人
+        if (orderQuery.getcName()!=null){
+        	sb.append(" and ec.cName like :cName");
+        	parameters.put("cName", "%" + orderQuery.getcName() + "%");
+        }
         // 订单来源，0:全部 1:线上，2:线下
         if (orderQuery.getOrderSourceCategory() == OrderSourceCategoryEnum.ONLINE.getValue()) {
             sb.append(" and od.onlineOrderFlag = true ");
@@ -1979,7 +1986,7 @@ public class OrderDao extends GenericHibernateDao<Order, Integer> {
             }
             sb.append(")");
         }
-
+        sb.append(" group by od.orderNo");
         sb.append(" order by " + StringUtils.escapeSql(orderQuery.getSortField()));
         if (SortDirectionEnum.DESC.equals(orderQuery.getSortDirection())) {
             sb.append(" desc ");

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

@@ -706,7 +706,7 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
         if(orderStatusEnum == OrderStatusEnum.WAITING_DEAL || orderStatusEnum == OrderStatusEnum.WAITING_DEAL_CASH){
         	if(order.getIsConfirm() == 1){
             	order.setIsConfirm(2);
-            	
+            	order.setPayDate(new Date());
             	getOrderDao().update(order);
           
             }else{