modify the return inventory

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

@@ -1253,20 +1253,20 @@ public class EventActivityOrderService extends
         } else {
         	//返还库存
         	//继续预订的情况下，前台只占了一个库存， 但是job是开了很多， 所以job会返多次库存， 所以继续预订只需要返一次就行, 这种情况只针对非实时teetime， 因为实时teetime前台不是走的继续预订
+        	if(eventCustomerInfoService.isValidEventCustomer(orderId, order.getUid())){
+        		//只有在这个单子对应的库存真正被占用了，才返还库存，否则无效的占位是不会多返的
+        		this.returnInventory(order, false);
+        	}
         	
-        	EventActivityOrderItem eventActivityOrderItem  = getEventActivityOrderItem(order);
+        	/*EventActivityOrderItem eventActivityOrderItem  = getEventActivityOrderItem(order);
         	Integer realTimeTeeTimeType = ResourceRealTimeTeeTimeTypeEnum.NORMAL.getValue();
         	if(eventActivityOrderItem != null){
         		realTimeTeeTimeType = eventActivityOrderItem.getRealTimeTeeTimeType();
-        	}
-        	 if(realTimeTeeTimeType == ResourceRealTimeTeeTimeTypeEnum.NORMAL.getValue()){
-        		 if(eventCustomerInfoService.isValidEventCustomer(orderId, order.getUid())){
-        			//只有在这个单子对应的库存真正被占用了，才返还库存，否则无效的占位是不会多返的
-             		this.returnInventory(order, false);
-        		 }
+        	}*/
+        	/* if(realTimeTeeTimeType == ResourceRealTimeTeeTimeTypeEnum.NORMAL.getValue()){
         	 }else{
         		 this.returnInventory(order, false);
-        	 }
+        	 }*/
             int processStatus = order.getProcessStatus();
             processStatus |= OrderStatusBitEnum.CANCELING.getValue();
             processStatus |= OrderStatusBitEnum.CANCELED.getValue();

src/main/resources/debug/payment.properties

@@ -2,7 +2,7 @@
 payment.createPayOrderPath=http://localhost:8080/fun-common-soa/payment/createPayOrder
 payment.payOrderOperatePath=http://localhost:8080/fun-common-soa/payment/payOrderOperate
 payment.queryPayStatusPath=http://localhost:8080/fun-common-soa/payment/queryPayStatus
-payment.merchantId=99
+payment.merchantId=3000003
 #payment.merchantId=3000003
 payment.courseBaseNotifyUrl=http://112.65.124.86:18081/fun-common-soa/notify/courseOrder
 payment.tourBaseNotifyUrl=http://112.65.124.86:18081/fun-common-soa/notify/tourOrder