优化黑名单

@@ -26,21 +26,14 @@ import com.yohoufo.order.charge.model.ChargeGoods;
 import com.yohoufo.order.charge.model.ChargeParam;
 import com.yohoufo.order.charge.model.ChargeResult;
 import com.yohoufo.order.charge.model.CouponMatchResult;
-<<<<<<< HEAD
 import com.yohoufo.order.constants.ActivityTypeEnum;
 import com.yohoufo.order.common.BlackTypeEnum;
-=======
->>>>>>> tmp_0529_localtest
 import com.yohoufo.order.event.BuyerCancelEvent;
 import com.yohoufo.order.event.ErpBuyerOrderEvent;
 import com.yohoufo.order.event.NotPaidNoticeEvent;
 import com.yohobuy.ufo.model.order.vo.AddressInfo;
-<<<<<<< HEAD
 import com.yohoufo.order.model.bo.ActivityBo;
 import com.yohoufo.order.charge.model.ActivityPrice;
-import com.yohoufo.order.interceptor.BlackUserInterceptor;
-=======
->>>>>>> tmp_0529_localtest
 import com.yohoufo.order.model.bo.CouponBo;
 import com.yohoufo.order.model.dto.BuyerOrderSubmitResult;
 import com.yohoufo.order.model.dto.OrderBuilder;

@@ -119,12 +119,8 @@ yoho.message.controller.url=http://message-controller.yohoops.org/yoho-message-c
 yoho.reviewed.controller.url=http://172.16.6.54:8063/reviewed
 
 #rabbit address for transaction compensate
-<<<<<<< HEAD
 #rabbit_host=192.168.104.199:30005
-rabbit_host=192.168.102.211:5672
-=======
 rabbit_host=192.168.102.45:5672
->>>>>>> tmp_0529_localtest
 rabbit_user=yoho
 rabbit_password=yoho