add the circle background cancel order

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

@@ -521,7 +521,7 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
      * @param orderId
      */
     public void backgroundCanceOrder(Integer orderId) {
-    	backgroundCanceOrder(orderId, true);
+    	backgroundCanceOrder(orderId, true, false);
     	
     }
     /**
@@ -529,11 +529,12 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
      * 
      * @param orderId
      */
-    public void backgroundCanceOrder(Integer orderId, boolean returnInventory) {
+    public void backgroundCanceOrder(Integer orderId, boolean returnInventory, boolean isMultiOrder) {
         Order order = this.getOrderDao().findById(orderId);
         OrderStatusEnum orderStatusEnum = OrderStatusEnum.getOrderStatus(order.getOrderType(), order.getPayMode(), order.getConfirmType(), order.getProcessStatus(), false);
         if (order.isPaied() || orderStatusEnum == OrderStatusEnum.DEAL_FINISHED) {
-            throw new OrderException(-1, "该订单不能取消");
+        	if(!isMultiOrder)//只针对一个单子才抛异常
+        		throw new OrderException(-1, "该订单不能取消");
         } else {
         	if(returnInventory){
         		this.returnInventory(order, false);

src/main/java/com/ctrip/fun/golf/service/product/FlashSaleService.java

@@ -59,14 +59,14 @@ public class FlashSaleService {
         for (FlashSale flashSale : flashSaleList) {
         	if(flashSale.getOrderId() != null){
         		Order order = orderDao.findById(flashSale.getOrderId());
-        		if (order.isNotPay() || order.getOrderStatusEnum() == OrderStatusEnum.CHARGING) {
-        			logger.info("backgroundCanceOrder, orderId = " + order.getOrderId());
-        			orderService.backgroundCanceOrder(order.getOrderId(), false);
-        		}
         		//记录一次下单成功的标记
         		if(order.isPaied()){
         			isSuccessOrder = true;
         		}
+        		if (order.isNotPay() || order.getOrderStatusEnum() == OrderStatusEnum.CHARGING) {
+        			logger.info("backgroundCanceOrder, orderId = " + order.getOrderId());
+        			orderService.backgroundCanceOrder(order.getOrderId(), false, true);
+        		}
         	}
         }
 		if(!isSuccessOrder){