短信模板打球时间

src/main/java/com/ctrip/fun/golf/service/basic/OperationMessageService.java

@@ -100,7 +100,7 @@ public class OperationMessageService extends GenericService<OperationMessageDao,
 	    		if(voucher.getVoucherType() == 2){
             		message = message.replace("[realName]", voucher.getRealName() + "").replace("[idCard]", voucher.getIdCard() + "").replace("[mobilePhone]", voucher.getMobilePhone() + "");
             		message = message.replace("[PlayDate]", DateUtil.getDateStrC(orderItems.get(0).getPlayDate()));
-            		message = message.replace("[PlayTime]", orderItems.get(0).getStartTime());
+            		message = message.replace("[PlayTime]", orderItems.get(0).getTeeTime());
     				message = message.replace("[ProductName]", orderItems.get(0).getProductName());
     				System.out.println("message ================>"+ message);
             	} 

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

@@ -788,6 +788,11 @@ public class EventCustomerInfoService extends
             eventCustomerInfoOfflineLogDao.save(eventCustomerInfoOfflineLog);
             startCancelOfflineEventCustomerInfoJob(eventCustomerInfoId);
         }
+        int existNum = eventCustomerInfoDao.queryCustomerNumInSameGroup(groupNum,
+                resourceId, priceDate);
+        if (existNum + customerInfos.size() > intTotalInventory) {
+            throw new EventActivityException(-104, "没有足够的库存");
+        }
         this.getCourseResourceService().minusInventory(resourceInventoryQuery, customerInfos.size());
     }