Merge branch 'f-6.7.0' of 192.168.10.6:caosy/fun-golf-service into f-6.7.0

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

@@ -433,7 +433,7 @@ public class EventCustomerInfoDao extends GenericHibernateDao<EventCustomerInfo,
             sql1.append(" AND ol.productId = "+productId+ " " );
             sql = new StringBuffer(sql).append(" union ").append(sql1);
         }
-        sql.append("   ORDER BY playDate DESC,teeTime ASC,resourceId ASC,orderId desc ");
+        sql.append("   ORDER BY groupNum ASC,playDate DESC,resourceId ASC,orderId desc ");
         Query query = this.getSession().createSQLQuery(sql.toString());
         query.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP);
         Set<String> orderNoSet = new HashSet<String>();

src/main/java/com/ctrip/fun/golf/dao/user/CommuneExtDao.java

@@ -126,6 +126,19 @@ public class CommuneExtDao extends GenericHibernateDao<CommuneExt, Integer> {
         return (CommuneExt) query.uniqueResult();
     }
 
+    public CommuneExt getByUid(CommuneExtQuery bean) {
+        StringBuilder hsql = new StringBuilder("from CommuneExt t where t.uid=:uid");
+        if (bean.getId() != null && bean.getId() != 0) {
+            hsql.append(" and t.id!=:id");
+        }
+        Query query = getSession().createQuery(hsql.toString());
+        query.setParameter("uid", bean.getUid());
+        if (bean.getId() != null && bean.getId() != 0) {
+            query.setParameter("id", bean.getId());
+        }
+        return (CommuneExt) query.uniqueResult();
+    }
+    
     public CommuneExt getByCommuneNo(CommuneExtQuery bean) {
         StringBuilder hsql = new StringBuilder("from CommuneExt t where t.communeNo=:communeNo");
         if (bean.getId() != null && bean.getId() != 0) {

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

@@ -10,6 +10,7 @@ import org.apache.commons.lang.StringUtils;
 import org.hibernate.Query;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import com.ctrip.fun.common.core.util.BeanConverter;
 import com.ctrip.fun.common.core.util.DateUtil;
@@ -32,10 +33,12 @@ import com.ctrip.fun.common.vo.order.OpEventCustomerInfoQuery;
 import com.ctrip.fun.common.vo.order.OrderPlayerBean;
 import com.ctrip.fun.common.vo.order.OrderPlayerQuery;
 import com.ctrip.fun.common.vo.order.RealTimeTeeTimeResourceInfoBean;
+import com.ctrip.fun.common.vo.order.UserCommuneOrderStatusEnum;
 import com.ctrip.fun.common.vo.product.ResourceCategoryEnum;
 import com.ctrip.fun.common.vo.product.ResourceInventoryQuery;
 import com.ctrip.fun.common.vo.product.ResourceInventoryTypeEnum;
 import com.ctrip.fun.common.vo.product.ResourceRealTimeTeeTimeTypeEnum;
+import com.ctrip.fun.common.vo.user.CommuneExtQuery;
 import com.ctrip.fun.common.vo.user.TokenTypeEnum;
 import com.ctrip.fun.golf.dao.assemble.AsmCourseResourceDao;
 import com.ctrip.fun.golf.dao.game.GameDao;
@@ -45,6 +48,7 @@ import com.ctrip.fun.golf.dao.order.EventCustomerInfoOfflineLogDao;
 import com.ctrip.fun.golf.dao.product.CourseProductDao;
 import com.ctrip.fun.golf.dao.product.CourseResourceDao;
 import com.ctrip.fun.golf.dao.product.ResourceInventoryDao;
+import com.ctrip.fun.golf.dao.user.CommuneExtDao;
 import com.ctrip.fun.golf.dao.user.UserExtDao;
 import com.ctrip.fun.golf.dao.user.UserTokenDao;
 import com.ctrip.fun.golf.domain.assemble.AsmCourseresource;
@@ -54,6 +58,7 @@ import com.ctrip.fun.golf.domain.order.EventCustomerInfoOfflineLog;
 import com.ctrip.fun.golf.domain.product.CourseProduct;
 import com.ctrip.fun.golf.domain.product.CourseResource;
 import com.ctrip.fun.golf.domain.product.ResourceInventory;
+import com.ctrip.fun.golf.domain.user.CommuneExt;
 import com.ctrip.fun.golf.domain.user.UserExt;
 import com.ctrip.fun.golf.domain.user.UserToken;
 import com.ctrip.fun.golf.exceptions.EventActivityException;
@@ -88,6 +93,8 @@ public class EventCustomerInfoService extends
     private UserTokenDao userTokenDao = null;
     private AsmCourseResourceDao asmCourseResourceDao = null;
     private CustomerInfoDao customerInfoDao = null;
+    @Autowired
+    private  CommuneExtDao communeExtDao= null;
     
 
     public void updateEventCustomerInfosByOrderId(Integer orderId, boolean validFlag) {
@@ -947,7 +954,16 @@ public class EventCustomerInfoService extends
      * 用于admin后台 查询订单分组与导出
      */
     public List<OrderPlayerBean> findOrderPlayers(OrderPlayerQuery orderPlayerQuery){
-        return eventCustomerInfoDao.findOrderPlayers(orderPlayerQuery);
+    	List<OrderPlayerBean> list = eventCustomerInfoDao.findOrderPlayers(orderPlayerQuery);
+    	for(OrderPlayerBean orderPlayerBean:list){
+    		CommuneExtQuery query = new CommuneExtQuery();
+    		query.setMobilePhone(orderPlayerBean.getMobilePhone());
+    		CommuneExt communeExt = communeExtDao.getByPhone(query);
+    		if(communeExt!=null){
+    			orderPlayerBean.setPlayerName(communeExt.getUserName());
+    		}
+    	}
+        return list;
     }