add the productName to asmcourseresource

src/main/java/com/ctrip/fun/golf/domain/assemble/AsmCourseresource.java

@@ -42,6 +42,7 @@ public class AsmCourseresource implements java.io.Serializable {
     private Integer courseId;
     private Integer courseId;
     private String courseName;
     private String courseName;
     private Integer productId;
     private Integer productId;
+    private String productName;
     private Integer resourceId;
     private Integer resourceId;
     private Integer priceId;
     private Integer priceId;
     private String name;
     private String name;
@@ -182,6 +183,14 @@ public class AsmCourseresource implements java.io.Serializable {
     public void setProductId(Integer productId) {
     public void setProductId(Integer productId) {
         this.productId = productId;
         this.productId = productId;
     }
     }
+    @Column(name = "productName")
+    public String getProductName() {
+		return productName;
+	}
+
+	public void setProductName(String productName) {
+		this.productName = productName;
+	}
 
 
 	@Column(name = "ResourceId")
 	@Column(name = "ResourceId")
     public Integer getResourceId() {
     public Integer getResourceId() {

src/main/java/com/ctrip/fun/golf/service/assemble/AsmCourseResourceService.java

@@ -1127,7 +1127,8 @@ public class AsmCourseResourceService {
             bean.setCancelTips(model.getCancelTips());
             bean.setCancelTips(model.getCancelTips());
             bean.setPaymentType(model.getPaymentType());
             bean.setPaymentType(model.getPaymentType());
             bean.setResourceName(model.getResourceName());
             bean.setResourceName(model.getResourceName());
-            bean.setProductName(model.getName()); // db中无ProductName，取name
+//            bean.setProductName(model.getName()); // db中无ProductName，取name
+            bean.setProductName(model.getProductName()); 
             map.put(bean.getResourceId(), bean);
             map.put(bean.getResourceId(), bean);
         }
         }
         return map;
         return map;

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

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