Merge branch 'hotfix-store-20190226' into test6.8.6

@@ -167,11 +167,6 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService {
 
 
     @Override
     @Override
     public void processAfterPay(OrderInfo orderInfo) {
     public void processAfterPay(OrderInfo orderInfo) {
-        if(BuyerOrderUtils.isOrderDone(orderInfo)) {
-            logger.info("order status is Done, orderCode: {}, uid: {}", orderInfo.getOrderCode(), orderInfo.getUid());
-            return;
-        }
-
         Integer uid = orderInfo.getUid();
         Integer uid = orderInfo.getUid();
         Integer sellerUid = orderInfo.getSellerUid();
         Integer sellerUid = orderInfo.getSellerUid();
         long orderCode = orderInfo.getOrderCode();
         long orderCode = orderInfo.getOrderCode();
@@ -189,13 +184,15 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService {
             case ADVANCE_SALE:
             case ADVANCE_SALE:
                 processPreSaleOrder(orderInfo, sellerOrderGoods);
                 processPreSaleOrder(orderInfo, sellerOrderGoods);
                 break;
                 break;
+            case OFFLINE:
+                //门店ufo订单这里啥都不干
+                break;
             default:
             default:
                 processInStockOrder(orderInfo, buyerOrderGoods, sellerOrderGoods);
                 processInStockOrder(orderInfo, buyerOrderGoods, sellerOrderGoods);
                 break;
                 break;
         }
         }
 
 
 
 
-
         cacheCleaner.delete(Arrays.asList(CacheKeyBuilder.orderListKey(sellerUid, TabType.SELL.getValue()),
         cacheCleaner.delete(Arrays.asList(CacheKeyBuilder.orderListKey(sellerUid, TabType.SELL.getValue()),
                 CacheKeyBuilder.orderListKey(uid, TabType.BUY.getValue()),
                 CacheKeyBuilder.orderListKey(uid, TabType.BUY.getValue()),
                 CacheKeyBuilder.sellerOrderDetailKey(sellerOrderGoods),
                 CacheKeyBuilder.sellerOrderDetailKey(sellerOrderGoods),