Merge branch 'zjl_iteration_20190723' into development

app/Http/Controllers/SpecialController.php

@@ -143,6 +143,8 @@ class SpecialController extends Controller
             $OrderModel = new OrderModel();
 
             foreach ($excel as $k=>$v) {
+                if (!$v[0] || !$v[1]) continue;
+
                 // 1. 根据手机或邮箱查找客户最近的订单
                 $order_id = $this->getLastOrderId(trim($v[0]));
 
@@ -186,7 +188,7 @@ class SpecialController extends Controller
         if (!$user) return false;
 
         // 查找最近的订单
-        $order = $OrderModel->where('user_id', $user['user_id'])->select('order_id')->orderBy('order_id', 'desc')->first();
+        $order = $OrderModel->where('user_id', $user['user_id'])->where('is_type', 0)->select('order_id')->orderBy('order_id', 'desc')->first();
 
         if (!$order) return false;