repair the inventory of flashsale

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

@@ -370,7 +370,11 @@ public class CourseOrderService extends AbstractOrderService<CourseOrderBean, Co
         if (flashSaleList == null || flashSaleList.size() == 0) {
             return;
         }
-        flashSaleDao.updateByOrderId(orderId, 2);
+        //flashSaleDao.updateByOrderId(orderId, 2);
+        //modify by caosy, update all falshsale record of this user;
+        FlashSale flashSale = flashSaleList.get(0);
+        flashSaleDao.updateByUid(flashSale.getUid(), flashSale.getResourceId(), 2, flashSale.getPriceDate());
+
         Order order = this.getOrderDao().findById(orderId);
         if (order.isNotPay() || order.getOrderStatusEnum() == OrderStatusEnum.CHARGING) {
             logger.info("backgroundCanceOrder, orderId = " + order.getOrderId());

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

@@ -63,6 +63,7 @@ import com.ctrip.fun.golf.dao.order.InvoiceinfoDao;
 import com.ctrip.fun.golf.dao.order.OrderExcelDao;
 import com.ctrip.fun.golf.dao.order.OrderItemDao;
 import com.ctrip.fun.golf.dao.product.CourseProductDao;
+import com.ctrip.fun.golf.dao.product.FlashSaleDao;
 import com.ctrip.fun.golf.dao.product.ResourcePriceDao;
 import com.ctrip.fun.golf.dao.user.UserExtDao;
 import com.ctrip.fun.golf.domain.advert.CampaignBill;
@@ -141,6 +142,8 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
     private ResourceOpInfoDao resourceOpInfoDao = null;
 
     private CourseProductDao courseProductDao = null;
+    
+    private FlashSaleDao flashSaleDao = null;
 
     public OrderItem getOrderItem(Integer orderId) {
         List<OrderItem> orderItems = this.orderItemDao.getOrderItemByOrderID(orderId);
@@ -690,9 +693,16 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
                 resourceInventoryQuery.setTheDate(orderItems.get(0).getPlayDate());
                 logger.info("addInventory orderNo=" + order.getOrderNo() + "ResourceId=" + orderItems.get(0).getResourceId());
                 this.courseResourceService.addInventory(resourceInventoryQuery, orderItems.get(0).getQuantity());
+                //更新抢购的信息
+                updateFlashSaleStatus(order.getUid(), orderItems.get(0).getResourceId(), orderItems.get(0).getPlayDate());
+
             }
         }
     }
+    
+    private void updateFlashSaleStatus(String uid, int resourceId, Date priceDate){
+    	getFlashSaleDao().updateByUid(uid, resourceId, 2, priceDate);
+    }
 
     @Override
     protected void deductPrepayAmt(CourseOrderProcessBean orderProcessBean) {
@@ -1312,8 +1322,18 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
     public void setCourseProductDao(CourseProductDao courseProductDao) {
         this.courseProductDao = courseProductDao;
     }
+    
+    
 
-    @Override
+    public FlashSaleDao getFlashSaleDao() {
+		return flashSaleDao;
+	}
+
+	public void setFlashSaleDao(FlashSaleDao flashSaleDao) {
+		this.flashSaleDao = flashSaleDao;
+	}
+
+	@Override
     protected void notPayMinusInventory(CourseOrderProcessBean orderProcessBean) {
         Order order = getOrderDao().findById(orderProcessBean.getOrderId());
 

src/main/java/com/ctrip/fun/golf/service/payment/CourseNotifyService.java

@@ -21,6 +21,7 @@ import com.ctrip.fun.golf.dao.advert.CampaignBillDao;
 import com.ctrip.fun.golf.dao.advert.CampaignDao;
 import com.ctrip.fun.golf.dao.advert.CampaignStatsDao;
 import com.ctrip.fun.golf.dao.order.OrderItemDao;
+import com.ctrip.fun.golf.dao.product.FlashSaleDao;
 import com.ctrip.fun.golf.domain.advert.CampaignBill;
 import com.ctrip.fun.golf.domain.order.Order;
 import com.ctrip.fun.golf.domain.order.OrderItem;
@@ -48,6 +49,8 @@ public class CourseNotifyService extends AbstractNotifyService {
 	private CampaignStatsDao campaignStatsDao = null;
 
 	private OperationMessageService operationMessageService;
+	
+	private FlashSaleDao flashSaleDao = null;
 
 	protected void doPayFail(Order order) {
 		List<OrderItem> orderItems = this.orderItemDao.getOrderItemByOrderID(order.getOrderId());
@@ -58,6 +61,9 @@ public class CourseNotifyService extends AbstractNotifyService {
 			resourceInventoryQuery.setTheDate(orderItems.get(0).getPlayDate());
 			logger.info("addInventory orderNo="+order.getOrderNo()+"ResourceId="+orderItems.get(0).getResourceId());
 			this.courseResourceService.addInventory(resourceInventoryQuery, orderItems.get(0).getQuantity());
+			//add by caosy for flashsale
+			updateFlashSaleStatus(order.getUid(), orderItems.get(0).getResourceId(), orderItems.get(0).getPlayDate());
+
 		}
 		if (orderItems != null && orderItems.size() > 0 && order.getCancelStatus() == 0 && order.getCampaignID() > 0) {
 			CampaignStatsDao campaignStatsDao = new CampaignStatsDao();
@@ -191,8 +197,18 @@ public class CourseNotifyService extends AbstractNotifyService {
 	public void setOperationMessageService(OperationMessageService operationMessageService) {
 		this.operationMessageService = operationMessageService;
 	}
+	
+	
+
+    public FlashSaleDao getFlashSaleDao() {
+		return flashSaleDao;
+	}
+
+	public void setFlashSaleDao(FlashSaleDao flashSaleDao) {
+		this.flashSaleDao = flashSaleDao;
+	}
 
-    /** 
+	/** 
      * @param order
      * @see com.ctrip.fun.golf.service.payment.AbstractNotifyService#failToSuccess(com.ctrip.fun.golf.domain.order.Order)
      */
@@ -211,5 +227,11 @@ public class CourseNotifyService extends AbstractNotifyService {
             }
         }
     }
+    
+    private void updateFlashSaleStatus(String uid, int resourceId,
+			Date priceDate) {
+		getFlashSaleDao().updateByUid(uid, resourceId, 2, priceDate);
+	}
+
 
 }

src/main/resources/order.spring.xml

@@ -258,6 +258,7 @@
 		<property name="asmCourseResourceDao" ref="asmCourseResourceDao"></property>
 		<property name="resourceOpInfoDao" ref="resourceOpInfoDao"></property>
 		<property name="courseProductDao" ref="courseProductDao"></property>
+		<property name="flashSaleDao" ref="flashSaleDao"></property>
 	</bean>
 
 	<bean name="opRechargeOrderService" class="com.ctrip.fun.golf.service.order.OpRechargeOrderService" parent="abstractOpOrderService">

src/main/resources/payment.spring.xml

@@ -45,6 +45,7 @@
         <property name="invoiceinfoDao" ref="invoiceinfoDao"></property>
         <property name="userMemberIntegralLogDao" ref="userMemberIntegralLogDao"></property>
 		<property name="orderProcessLogDao" ref="orderProcessLogDao"></property>
+		<property name="flashSaleDao" ref="flashSaleDao"></property>
 	</bean>
 
 	<bean name="tourNotifyService" class="com.ctrip.fun.golf.service.payment.TourNotifyService">