modify the flashSale bug

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

@@ -380,12 +380,18 @@ public class CourseOrderService extends AbstractOrderService<CourseOrderBean, Co
         if (flashSaleList == null || flashSaleList.size() == 0) {
             return;
         }
-        flashSaleDao.updateByOrderId(orderId, 2);
+        FlashSale flashSale = flashSaleList.get(0);
+//        flashSaleDao.updateByOrderId(orderId, 2);
+        //modify by caosy, update all falshsale record of this user;
+        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());
             this.backgroundCanceOrder(order.getOrderId());
         }
+        
+        
     }
 
     /**

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

 package com.ctrip.fun.golf.service.order;
 
+import java.io.ObjectInputStream.GetField;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -64,6 +65,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;
@@ -143,6 +145,8 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
 
     private CourseProductDao courseProductDao = null;
     
+    private FlashSaleDao flashSaleDao = null;
+
     public OrderItem getOrderItem(Integer orderId) {
         List<OrderItem> orderItems = this.orderItemDao.getOrderItemByOrderID(orderId);
         if (orderItems != null && orderItems.size() > 0) {
@@ -647,6 +651,10 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
                 campaignBillDao.save(bill);
             }
         }
+        
+        //处理抢购的:
+//        flashSaleDao.updateByUid(uid, resourceId, 2, priceDate);//updateByOrderId
+        
     }
 
     private boolean isAllRefund(CourseOrderProcessBean orderProcessBean) {
@@ -691,10 +699,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) {
         OrderPayinfoBean orderpayInfo = orderProcessBean.getOrderPayinfoBean();
@@ -1387,5 +1401,13 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
 
     }
 
+	public FlashSaleDao getFlashSaleDao() {
+		return flashSaleDao;
+	}
+
+	public void setFlashSaleDao(FlashSaleDao flashSaleDao) {
+		this.flashSaleDao = flashSaleDao;
+	}
+    
 
 }

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;
@@ -49,6 +50,8 @@ public class CourseNotifyService extends AbstractNotifyService {
 
 	private OperationMessageService operationMessageService;
 	
+	private FlashSaleDao flashSaleDao = null;
+
 	protected void doPayFail(Order order) {
 		List<OrderItem> orderItems = this.orderItemDao.getOrderItemByOrderID(order.getOrderId());
 		if (orderItems != null && orderItems.size() > 0 && order.getConfirmType() == ResourceConfirmTypeEnum.AUTO.getValue() && order.getCancelStatus() == 0) {
@@ -58,6 +61,8 @@ 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();
@@ -201,6 +206,14 @@ public class CourseNotifyService extends AbstractNotifyService {
 		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)
@@ -221,4 +234,9 @@ public class CourseNotifyService extends AbstractNotifyService {
         }
     }
     
+	private void updateFlashSaleStatus(String uid, int resourceId,
+			Date priceDate) {
+		getFlashSaleDao().updateByUid(uid, resourceId, 2, priceDate);
+	}
+
 }

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

@@ -1469,4 +1469,5 @@ public class CourseResourceService extends
     public void setFlashSaleDao(FlashSaleDao flashSaleDao) {
         this.flashSaleDao = flashSaleDao;
     }
+    
 }

src/main/resources/order.spring.xml

@@ -273,6 +273,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">