modify the invinventory logic

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

@@ -387,7 +387,7 @@ public class EventActivityOrderService extends
         eventCustomerInfoQuery.setUid(eventActivityOrderBean.getUid());
         List<EventCustomerInfo> previousOrdersEventCustomerInfos = eventCustomerInfoDao
                 .getEventCustomerInfosInPreviousOrders(eventCustomerInfoQuery);
-        if (previousOrdersEventCustomerInfos != null) {
+        if (previousOrdersEventCustomerInfos != null && eventActivityOrderBean.getRealTimeTeeTimeType() != ResourceRealTimeTeeTimeTypeEnum.REALTIME.getValue()) {
             // 将之前订单中的占位信息清除
             for (EventCustomerInfo previousOrdersEventCustomerInfo : previousOrdersEventCustomerInfos) {
                 previousOrdersEventCustomerInfo.setValidFlag(false);

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

@@ -739,19 +739,22 @@ public class EventCustomerInfoService extends
         EventCustomerInfo eventCustomerInfo = eventCustomerInfoDao.findById(eventCustomerInfoId);
         if (eventCustomerInfo.getConfirmStatus() == EventCustomerInfoConfirmStatusEnum.NOT_CONFIRM
                 .getValue()) {
-            eventCustomerInfo
+            //清占位
+        	eventCustomerInfo
                     .setConfirmStatus(EventCustomerInfoConfirmStatusEnum.CANCEL.getValue());
             eventCustomerInfo.setValidFlag(false);
             eventCustomerInfoDao.update(eventCustomerInfo);
+            
+            //返库存
+            ResourceInventoryQuery resourceInventoryQuery = new ResourceInventoryQuery();
+            resourceInventoryQuery.setResourceCategory(ResourceCategoryEnum.COURSE.getValue());
+            resourceInventoryQuery.setResourceId(eventCustomerInfo.getResourceId());
+            resourceInventoryQuery.setTheDate(eventCustomerInfo.getPriceDate());
+            logger.info("time Out Cancel Event Customer Info : EventCustomerInfoId:"
+            		+ eventCustomerInfo.getEventCustomerId() + "ResourceId="
+            		+ eventCustomerInfo.getResourceId());
+            this.getCourseResourceService().addInventory(resourceInventoryQuery, 1);
         }
-        ResourceInventoryQuery resourceInventoryQuery = new ResourceInventoryQuery();
-        resourceInventoryQuery.setResourceCategory(ResourceCategoryEnum.COURSE.getValue());
-        resourceInventoryQuery.setResourceId(eventCustomerInfo.getResourceId());
-        resourceInventoryQuery.setTheDate(eventCustomerInfo.getPriceDate());
-        logger.info("time Out Cancel Event Customer Info : EventCustomerInfoId:"
-                + eventCustomerInfo.getEventCustomerId() + "ResourceId="
-                + eventCustomerInfo.getResourceId());
-        this.getCourseResourceService().addInventory(resourceInventoryQuery, 1);
 
     }
 

src/main/resources/email.properties

-smtp = webmail.ctrip.com
-from = zgsong111@ctrip.com
-to = AWYDZ@Ctrip.com
+smtp = smtp.ctripiwan.com
+from = caosy@ctripiwan.com
+to = iwan@ctripiwan.com
 subject = Job\u5F02\u5E38
 content = <h2>Exception Info:</h2></br>
-username = zgsong
-password = h3xP2d5oUbUh6xmwLKXa4Q==
\ No newline at end of file
+username = caosy
+password = 584CmXEcOO9cND7sLMzG4+0qqXGN4SIb
\ No newline at end of file