赛事活动-分组 社员、非社员识别

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

@@ -363,7 +363,7 @@ public class EventCustomerInfoDao extends GenericHibernateDao<EventCustomerInfo,
         sql.append("   e.resourceId, ");
         sql.append("   e.groupNum, ");
         sql.append("   e.uid, ");
-        sql.append("   CASE WHEN u.vipGrade is null THEN '嘉宾' WHEN (u.vipGrade=2 or u.vipGrade=3) THEN '社员' else '非社员' end `userGrade`, ");
+        sql.append("   CASE WHEN u.vipGrade is null THEN '嘉宾' WHEN ((u.vipGrade=2 or u.vipGrade=3) and date_add(u.communeAgainTime,INTERVAL '1' YEAR)>CURRENT_DATE() ) THEN '社员' else '非社员' end `userGrade`, ");
         sql.append("   CASE WHEN o.courseProductId=0 OR o.courseProductId IS NULL THEN ol.productId ELSE o.courseProductId END `productId`,");
         sql.append("   CASE WHEN o.productName IS NULL THEN ol.productName ELSE o.productName END `productName`, ");
         sql.append("   CASE WHEN o.playDate IS NULL THEN ol.priceDate ELSE o.playDate END `playDate`, ");
@@ -376,7 +376,7 @@ public class EventCustomerInfoDao extends GenericHibernateDao<EventCustomerInfo,
         sql.append("   LEFT JOIN event_customerinfo_offline_log ol  ");
         sql.append("     ON ol.eventCustomerInfoId=e.eventCustomerId ");
         sql.append("   LEFT JOIN ord_order oo ON e.orderId=oo.OrderId ");
-        sql.append("   LEFT JOIN bsc_userext u on u.UID=e.uid AND (e.mobilePhone=u.mobilePhone OR e.mobilePhone=u.BindedMobilePhone) ");
+        sql.append("   LEFT JOIN bsc_userext u on  (e.mobilePhone=u.mobilePhone OR e.mobilePhone=u.BindedMobilePhone) ");
         sql.append("   WHERE 1=1 ");
         sql.append("   AND ((e.type=1 AND e.validFlag=1 AND (o.realTimeTeeTimeType=1 OR (o.realTimeTeeTimeType=2 AND o.teeTime IS NOT NULL)))  ");
         sql.append("   OR (e.type=2 AND e.confirmStatus=1)) ");