后台客户占位显示客户的姓名和手机号

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

@@ -355,6 +355,7 @@ public class EventCustomerInfoDao extends GenericHibernateDao<EventCustomerInfo,
         StringBuffer sql = new StringBuffer();
         sql.append(" SELECT ");
         sql.append("   e.cName playerName, ");
+        sql.append("   e.gender gender, ");
         sql.append("   e.orderId, ");
         sql.append("   oo.orderNo, ");
         sql.append("   e.mobilePhone, ");

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

@@ -1632,9 +1632,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,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.outTradeId,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.outTradeId,case when user.BindedMobilePhone !='' then user.BindedMobilePhone else user.MobilePhone end as mobilePhone,user.userName,orderitem.quantity,orderitem.teeTime,orderitem.playDate");
         sb.append(" from ord_order od " + "join ord_eventactivityorderitem orderitem on (od.OrderID=orderitem.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 ");
         sb.append(" JOIN bsc_district district ON cs.districtId = district.id ");
         sb.append("where 1=1 ");

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

@@ -34,6 +34,7 @@ public class EventCustomerInfo implements java.io.Serializable {
     private Integer eventCustomerId;
     private String uid;
     private String mobilePhone;
+    private String gender;
     private Integer customerId;
     private String cName;
     private String invitedByUid;
@@ -83,8 +84,17 @@ public class EventCustomerInfo implements java.io.Serializable {
     public void setMobilePhone(String mobilePhone) {
         this.mobilePhone = mobilePhone;
     }
+    
+    @Column(name = "gender")
+    public String getGender() {
+		return gender;
+	}
+
+	public void setGender(String gender) {
+		this.gender = gender;
+	}
 
-    @Column(name = "customerId")
+	@Column(name = "customerId")
     public Integer getCustomerId() {
         return customerId;
     }

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

@@ -14,6 +14,7 @@ import com.ctrip.fun.common.core.util.BeanConverter;
 import com.ctrip.fun.common.core.util.DateUtil;
 import com.ctrip.fun.common.vo.PagedResponseBean;
 import com.ctrip.fun.common.vo.coursescore.ScoreAnalysisBean;
+import com.ctrip.fun.common.vo.order.CustomerBean;
 import com.ctrip.fun.common.vo.order.CustomerInfoBean;
 import com.ctrip.fun.common.vo.order.EventCustomerInfoBean;
 import com.ctrip.fun.common.vo.order.EventCustomerInfoConfirmStatusEnum;
@@ -669,7 +670,7 @@ public class EventCustomerInfoService extends
      */
     public void saveOfflineEventCustomerInfo(
             OfflineEventCustomerInfoBean offlineEventCustomerInfoBean) {
-        List<String> mobilePhones = offlineEventCustomerInfoBean.getMobilePhones();
+    	List<CustomerBean> customerInfos = offlineEventCustomerInfoBean.getCustomerInfos();
         int resourceId = offlineEventCustomerInfoBean.getResourceId();
         Date priceDate = offlineEventCustomerInfoBean.getPriceDate();
         CourseResource courseResource = courseResourceDao.findById(resourceId);
@@ -691,21 +692,21 @@ public class EventCustomerInfoService extends
                 resourceId, priceDate);
         // 暂时每组只能4个人
         if (// existCustomerNum + mobilePhones.size() > 4|| 
-                existCustomerNum + mobilePhones.size() > intTotalInventory) {
+                existCustomerNum + customerInfos.size() > intTotalInventory) {
             throw new EventActivityException(-104, "没有足够的库存");
         }
 
-        for (String mobilePhone : mobilePhones) {
+        for (CustomerBean customerBean : customerInfos) {
             EventCustomerInfoQuery eventCustomerInfoQuery = new EventCustomerInfoQuery();
-            eventCustomerInfoQuery.setMobilePhone(mobilePhone);
+            eventCustomerInfoQuery.setMobilePhone(customerBean.getMobileNo());
             eventCustomerInfoQuery.setPriceDate(priceDate);
             eventCustomerInfoQuery.setResourceId(resourceId);
             EventCustomerInfo existEventCustomerInfo = eventCustomerInfoDao
                     .GetEventCustomerInfoByPhone(eventCustomerInfoQuery);
             if (existEventCustomerInfo != null) {
-                throw new EventActivityException(-105, "用户：" + mobilePhone + "已经参加活动不能重复参加！");
+                throw new EventActivityException(-105, "用户：" + customerBean.getMobileNo() + "已经参加活动不能重复参加！");
             }
-            UserExt user = userExtDao.GetUserExtInfoByPhone(mobilePhone);
+            UserExt user = userExtDao.GetUserExtInfoByPhone(customerBean.getMobileNo());
 
             EventCustomerInfo eventCustomerInfo = new EventCustomerInfo();
             if (user != null) {
@@ -718,13 +719,15 @@ public class EventCustomerInfoService extends
                 eventCustomerInfo.setRank(999);
                 eventCustomerInfo.setRankFlag(false);
                 eventCustomerInfo.setGroupNum(groupNum);
-                eventCustomerInfo.setMobilePhone(mobilePhone);
+                eventCustomerInfo.setMobilePhone(customerBean.getMobileNo());
+                eventCustomerInfo.setGender(user.getGender());
                 eventCustomerInfo.setType(EventCustomerInfoTypeEnum.OFFLINE.getValue());
                 eventCustomerInfo.setConfirmStatus(EventCustomerInfoConfirmStatusEnum.NOT_CONFIRM
                         .getValue());
             } else {
-                eventCustomerInfo.setUid(mobilePhone);
-                eventCustomerInfo.setcName(mobilePhone);
+                eventCustomerInfo.setUid(customerBean.getMobileNo());
+                eventCustomerInfo.setcName(customerBean.getName());
+                eventCustomerInfo.setGender(customerBean.getGender());
                 eventCustomerInfo.setOneselfFlag(true);
                 eventCustomerInfo.setValidFlag(true);
                 eventCustomerInfo.setResourceId(resourceId);
@@ -732,7 +735,7 @@ public class EventCustomerInfoService extends
                 eventCustomerInfo.setRank(999);
                 eventCustomerInfo.setRankFlag(false);
                 eventCustomerInfo.setGroupNum(groupNum);
-                eventCustomerInfo.setMobilePhone(mobilePhone);
+                eventCustomerInfo.setMobilePhone(customerBean.getMobileNo());
                 eventCustomerInfo.setType(EventCustomerInfoTypeEnum.OFFLINE.getValue());
                 eventCustomerInfo.setConfirmStatus(EventCustomerInfoConfirmStatusEnum.NOT_CONFIRM
                         .getValue());
@@ -761,14 +764,14 @@ public class EventCustomerInfoService extends
             }
             eventCustomerInfoOfflineLog.setTeeTimeStr(teeTimeStr);
             eventCustomerInfoOfflineLog.setEventCustomerInfoId(eventCustomerInfoId);
-            eventCustomerInfoOfflineLog.setMobilePhone(mobilePhone);
+            eventCustomerInfoOfflineLog.setMobilePhone(customerBean.getMobileNo());
             eventCustomerInfoOfflineLog.setOperator(offlineEventCustomerInfoBean.getOperator());
             eventCustomerInfoOfflineLog.setCreatedTime(new Date());
             eventCustomerInfoOfflineLog.setProductId(product.getId());
             eventCustomerInfoOfflineLogDao.save(eventCustomerInfoOfflineLog);
             startCancelOfflineEventCustomerInfoJob(eventCustomerInfoId);
         }
-        this.getCourseResourceService().minusInventory(resourceInventoryQuery, mobilePhones.size());
+        this.getCourseResourceService().minusInventory(resourceInventoryQuery, customerInfos.size());
     }
 
     @SuppressWarnings("static-access")