optimize the logic of flashsale background cancel order

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

 package com.ctrip.fun.golf.service.product;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -49,13 +50,8 @@ public class FlashSaleService {
         List<FlashSale> flashSaleList = flashSaleDao.getByUid(uid, resourceId, 1, min, priceDate);
         if (flashSaleList == null || flashSaleList.size() == 0)
             return;
-        flashSaleDao.updateByUid(uid, resourceId, 2, priceDate);
-        
-/*        FlashSale fs = flashSaleList.get(0);
-        fs.setStatus(2);
-        flashSaleDao.update(fs);*/
-        
         boolean isSuccessOrder = false;
+        List<Order> orderlist = new ArrayList<Order>();
         for (FlashSale flashSale : flashSaleList) {
         	if(flashSale.getOrderId() != null){
         		Order order = orderDao.findById(flashSale.getOrderId());
@@ -63,17 +59,27 @@ public class FlashSaleService {
         		if(order.isPaied()){
         			isSuccessOrder = true;
         		}
-        		if (order.isNotPay() || order.getOrderStatusEnum() == OrderStatusEnum.CHARGING) {
-        			logger.info("backgroundCanceOrder, orderId = " + order.getOrderId());
-        			orderService.backgroundCanceOrder(order.getOrderId(), false, true);
-        		}
+        		orderlist.add(order);
         	}
-        }
-		if(!isSuccessOrder){
-			//查找该资源的所有订单， 如果没有成功的，就返回库存一次，只会执行一次，返回一次库存，不会多返
-			 logger.info("add inventory, resourceId = " + resourceId + ", uid = " + uid);
-	         addInventory(uid, resourceId, priceDate);
 		}
+        if(!isSuccessOrder){
+        	//查找该资源的所有订单， 如果没有成功的，就返回库存一次，只会执行一次，返回一次库存，不会多返
+        	logger.info("add inventory, resourceId = " + resourceId + ", uid = " + uid);
+        	addInventory(uid, resourceId, priceDate);
+        }
+        
+        flashSaleDao.updateByUid(uid, resourceId, 2, priceDate);
+        
+/*        FlashSale fs = flashSaleList.get(0);
+        fs.setStatus(2);
+        flashSaleDao.update(fs);*/
+        
+        for (Order order : orderlist) {
+    		if (order.isNotPay() || order.getOrderStatusEnum() == OrderStatusEnum.CHARGING) {
+    			logger.info("backgroundCanceOrder, orderId = " + order.getOrderId());
+    			orderService.backgroundCanceOrder(order.getOrderId(), false, true);
+    		}
+        }
         
       /*  if (fs.getOrderId() == null) {
             logger.info("add inventory, resourceId = " + resourceId + ", uid = " + uid);