Authored by TANLING

Merge branch 'hotfix_0330_optimize_fastdelivery' into test6.9.24

@@ -4,6 +4,7 @@ import com.github.rholder.retry.Retryer; @@ -4,6 +4,7 @@ import com.github.rholder.retry.Retryer;
4 import com.github.rholder.retry.RetryerBuilder; 4 import com.github.rholder.retry.RetryerBuilder;
5 import com.github.rholder.retry.StopStrategies; 5 import com.github.rholder.retry.StopStrategies;
6 import com.github.rholder.retry.WaitStrategies; 6 import com.github.rholder.retry.WaitStrategies;
  7 +import com.google.common.eventbus.Subscribe;
7 import com.yohobuy.ufo.model.order.constants.DepotType; 8 import com.yohobuy.ufo.model.order.constants.DepotType;
8 import com.yohobuy.ufo.model.order.req.SellerDeliverToDepotReq; 9 import com.yohobuy.ufo.model.order.req.SellerDeliverToDepotReq;
9 import com.yohobuy.ufo.model.order.resp.FastDeliveryReq; 10 import com.yohobuy.ufo.model.order.resp.FastDeliveryReq;
@@ -40,6 +41,7 @@ public class FastDeliveryChangeHandler implements IEventHandler<FastDeliveryChan @@ -40,6 +41,7 @@ public class FastDeliveryChangeHandler implements IEventHandler<FastDeliveryChan
40 private IExpressInfoService expressInfoService; 41 private IExpressInfoService expressInfoService;
41 42
42 @Override 43 @Override
  44 + @Subscribe
43 public void handle(FastDeliveryChangeEvent event) { 45 public void handle(FastDeliveryChangeEvent event) {
44 46
45 if (event.getOpt() == null || event.getFastDeliveryReq()== null){ 47 if (event.getOpt() == null || event.getFastDeliveryReq()== null){