Merge remote-tracking branch 'origin/master'

app/Model/SalesOrderInfo.php

@@ -14,7 +14,8 @@ class SalesOrderInfo extends Model
     const type_two = 2; // 负责人
     const type_three = 3; // 协同人
     const type_four = 4; // 文件
-    const type_five = 5; // 客户确认以后的图片
+    const type_five = 5; // 活动包
+    const type_six = 6; // 客户完结图片
     public static $type = [
         self::type_one,
         self::type_two,

app/Service/CheckService.php

@@ -77,8 +77,8 @@ class CheckService extends Service
     ];
 
     public static $finished = [
-        self::four => 'confirmSalesOrder', // 合同 安装件 合同公司完结
-        self::nine => 'confirmSalesOrder2', // 合同 安装件 合同客户完结
+        self::four => 'settleSalesOrder', // 合同 安装件 合同公司完结
+        self::nine => 'settleSalesOrderCustomer', // 合同 安装件 合同客户完结
     ];
 
     //单据操作
@@ -504,7 +504,7 @@ class CheckService extends Service
         return [true,''];
     }
 
-    public function confirmSalesOrder($data){
+    public function settleSalesOrder($data){
         $model = SalesOrder::where('order_number', $data['order_number'])
             ->where('del_time',0)
             ->first();
@@ -518,7 +518,7 @@ class CheckService extends Service
         return [true, $model->toArray()];
     }
 
-    public function confirmSalesOrder2($data){
+    public function settleSalesOrderCustomer($data){
         $model = SalesOrder::where('order_number', $data['order_number'])
             ->where('del_time',0)
             ->first();
@@ -531,7 +531,7 @@ class CheckService extends Service
             ->update(['state' => SalesOrder::State_eight]);
         SalesOrderInfo::insert([
             'sales_order_id' => $model->id,
-            'type' => SalesOrderInfo::type_five,
+            'type' => SalesOrderInfo::type_six,
             'file' => $data['img'],
             'crt_time' => time(),
         ]);
@@ -825,7 +825,7 @@ class CheckService extends Service
             DB::beginTransaction();
 
             if($function2) {
-                list($bool,$msg) = $this->$function($data);
+                list($bool,$msg) = $this->$function2($data);
                 if($bool) {
                     DB::commit();
                     return [true, ''];

app/Service/FileUploadService.php

@@ -21,6 +21,7 @@ class FileUploadService extends Service
     ];
 
     public function uploadFile($file){
+        if(empty($file)) return [false, '请上传文件'];
         // 获取文件相关信息
         $ext = $file->getClientOriginalExtension();     // 扩展名
         $realPath = $file->getRealPath();   //临时文件的绝对路径

app/Service/SalesOrderService.php

@@ -930,6 +930,7 @@ class SalesOrderService extends Service
             $customer_id = array_column($customer_id,'customer_id');
             $model->whereIn('customer_id',$customer_id);
         }
+        if(! empty($data['title'])) $model->where('title', 'LIKE', '%'.$data['title'].'%');
 
         $list = $this->limit($model,'',$data);
         $list = $this->fillData($list,$data);

routes/wx.php

@@ -20,5 +20,5 @@ Route::group(['middleware'=> ['checkWx']],function ($route){
     //文件上传统一方法
     $route->any('uploadFile', 'Api\FileUploadController@uploadFile');
     $route->any('saleOrderList', 'Api\WxController@saleOrderList');
-    $route->any('checkAll', 'Api\checkController@checkAll');
+    $route->any('checkAll', 'Api\CheckController@checkAll');
 });