Merge branch 'master' into development

app/Http/Controllers/SpecialController.php

@@ -143,12 +143,12 @@ class SpecialController extends Controller
 
 
             foreach ($excel as $k=>$v) {
             foreach ($excel as $k=>$v) {
                 // 1. 根据手机或邮箱查找客户最近的订单
                 // 1. 根据手机或邮箱查找客户最近的订单
-                $order_id = $this->getLastOrderId($v[0]);
+                $order_id = $this->getLastOrderId(trim($v[0]));
 
 
                 if ($order_id === false) continue;
                 if ($order_id === false) continue;
 
 
                 // 2. 根据企业邮箱查找sale_id
                 // 2. 根据企业邮箱查找sale_id
-                $sale_id = $this->getSaleId(strtolower($v[1]));
+                $sale_id = $this->getSaleId(trim(strtolower($v[1])));
 
 
                 if ($sale_id === false) continue;
                 if ($sale_id === false) continue;