Authored by wujiexiang

Merge branch 'dev-seller-order-stat-6.9.10' into test6.9.10

@@ -3,9 +3,7 @@ package com.yohoufo.order.service.handler; @@ -3,9 +3,7 @@ package com.yohoufo.order.service.handler;
3 import com.google.common.eventbus.Subscribe; 3 import com.google.common.eventbus.Subscribe;
4 import com.yoho.core.dal.datasource.annotation.Database; 4 import com.yoho.core.dal.datasource.annotation.Database;
5 import com.yohobuy.ufo.model.order.common.EntrySellerType; 5 import com.yohobuy.ufo.model.order.common.EntrySellerType;
6 -import com.yohoufo.common.alarm.EventBusPublisher;  
7 import com.yohoufo.common.alarm.IEventHandler; 6 import com.yohoufo.common.alarm.IEventHandler;
8 -import com.yohoufo.common.alarm.SmsAlarmEvent;  
9 import com.yohoufo.common.utils.DateUtil; 7 import com.yohoufo.common.utils.DateUtil;
10 import com.yohoufo.dal.order.model.SellerOrderStatsResult; 8 import com.yohoufo.dal.order.model.SellerOrderStatsResult;
11 import com.yohoufo.order.event.SellerEnterTypeChangeEvent; 9 import com.yohoufo.order.event.SellerEnterTypeChangeEvent;
@@ -66,7 +64,7 @@ public class SellerEnterTypeChangeEventHandler implements IEventHandler<SellerEn @@ -66,7 +64,7 @@ public class SellerEnterTypeChangeEventHandler implements IEventHandler<SellerEn
66 case QUIT: 64 case QUIT:
67 if (storedSellerService.isStoredSeller(sellerUid)) { 65 if (storedSellerService.isStoredSeller(sellerUid)) {
68 logger.warn("[{}] is stored seller yet,can't handle quit event", sellerUid); 66 logger.warn("[{}] is stored seller yet,can't handle quit event", sellerUid);
69 - EventBusPublisher.publishEvent(new SmsAlarmEvent("seller.enterQuitEvent", "handle_exception", "seller(" + sellerUid +") is stored seller yet")); 67 + return false;
70 } else { 68 } else {
71 //退出入驻,需要更新当前周期,以及下个周期的统计数据 69 //退出入驻,需要更新当前周期,以及下个周期的统计数据
72 handleQuitEvent(sellerUid, entrySellerType); 70 handleQuitEvent(sellerUid, entrySellerType);