no message

+package com.yohoufo.order.service.handler;
+
+import com.google.common.eventbus.Subscribe;
+import com.yoho.error.ServiceError;
+import com.yoho.error.exception.ServiceException;
+import com.yohoufo.common.alarm.IEventHandler;
+import com.yohoufo.order.event.PayConfirmEvent;
+import com.yohoufo.order.model.request.PaymentRequest;
+import com.yohoufo.order.service.IPaymentService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+
+@Component
+public class CleanGWOrderNumsEventHandler implements IEventHandler<PayConfirmEvent> {
+
+    final Logger logger = LoggerFactory.getLogger(getClass());
+
+
+    @Subscribe
+    @Override
+    public void handle(PayConfirmEvent event) {
+
+    	
+    }
+	
+}
\ No newline at end of file

@@ -46,11 +46,8 @@ import com.yohoufo.order.service.cache.OrderCacheService;
 import com.yohoufo.order.service.pay.AbstractPayService;
 import com.yohoufo.order.service.proxy.InBoxFacade;
 import com.yohoufo.order.service.proxy.ProductProxyService;
-<<<<<<< HEAD
 import com.yohoufo.order.utils.LoggerUtils;
-=======
 import org.apache.commons.collections.CollectionUtils;
->>>>>>> dev_1226_gatewaynums
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;