modify the logic of backgroundcancelorder

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

@@ -1259,12 +1259,14 @@ public class EventActivityOrderService extends
         	if(eventActivityOrderItem != null){
         	if(eventActivityOrderItem != null){
         		realTimeTeeTimeType = eventActivityOrderItem.getRealTimeTeeTimeType();
         		realTimeTeeTimeType = eventActivityOrderItem.getRealTimeTeeTimeType();
         	}
         	}
-        	 
-        	if(eventCustomerInfoService.isValidEventCustomer(orderId, order.getUid()) 
-        			&& realTimeTeeTimeType == ResourceRealTimeTeeTimeTypeEnum.NORMAL.getValue()){
-        		//只有在这个单子对应的库存真正被占用了，才返还库存，否则无效的占位是不会多返的
-        		this.returnInventory(order, false);
-        	}
+        	 if(realTimeTeeTimeType == ResourceRealTimeTeeTimeTypeEnum.NORMAL.getValue()){
+        		 if(eventCustomerInfoService.isValidEventCustomer(orderId, order.getUid())){
+        			//只有在这个单子对应的库存真正被占用了，才返还库存，否则无效的占位是不会多返的
+             		this.returnInventory(order, false);
+        		 }
+        	 }else{
+        		 this.returnInventory(order, false);
+        	 }
             int processStatus = order.getProcessStatus();
             int processStatus = order.getProcessStatus();
             processStatus |= OrderStatusBitEnum.CANCELING.getValue();
             processStatus |= OrderStatusBitEnum.CANCELING.getValue();
             processStatus |= OrderStatusBitEnum.CANCELED.getValue();
             processStatus |= OrderStatusBitEnum.CANCELED.getValue();