Merge branch 'test6.8.6' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.6

@@ -426,7 +426,7 @@ public class SellerOrderCancelService {
          * 此时此刻卖家不感知买家下单，不买了的入参是卖家订单号
          * 根据codeType判断即可
          */
-        if (OrderCodeType.getSellerTypes().contains(codeType)){
+        if (codeType!=null && OrderCodeType.getSellerTypes().contains(codeType.getType())){
             logger.warn("cancelAfterPayExistBuyAction seller cancel self-order_code , seller [uid:{} orderCode:{}],buyer [uid:{} orderCode:{}] codeType {} buyerOrderStatus {}",
                     sellerUid, sellerOrderCode, buyerUid, buyerOrderCode, codeType, buyerOrderStatus);
             String errorMsg = "您的商品已经被购买，不能下架该商品！";