1

app/Http/Controllers/Api/WxController.php

@@ -47,7 +47,7 @@ class WxController extends BaseController
     public function saleOrderList(Request $request){
         $service = new SalesOrderService();
         $userData = $request->userData->toArray();
-        list($status,$data) = $service->salesOrderList($request->all(),$userData);
+        list($status,$data) = $service->salesOrderWxList($request->all(),$userData);
 
         if($status){
             return $this->json_return(200,'',$data);

app/Model/SalesOrderInfo.php

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

app/Service/CheckService.php

@@ -17,6 +17,7 @@ use App\Model\PurchaseOrderSpecialInfo;
 use App\Model\ReturnExchangeOrder;
 use App\Model\ReturnExchangeOrderProductInfo;
 use App\Model\SalesOrder;
+use App\Model\SalesOrderInfo;
 use App\Model\SalesOrderOtherFee;
 use App\Model\SalesOrderProductInfo;
 use App\Model\SeeRange;
@@ -522,11 +523,18 @@ class CheckService extends Service
             ->where('del_time',0)
             ->first();
         if(empty($model)) return [false, '合同不存在或已被删除'];
+        if(empty($data['img'])) return [false,'图片不能为空'];
         //安装件
         if($model->state != SalesOrder::State_seven) return [false, '请确认合同状态，操作失败'];
 
         SalesOrder::where('del_time',0)->where('order_number',$data['order_number'])
             ->update(['state' => SalesOrder::State_eight]);
+        SalesOrderInfo::insert([
+            'sales_order_id' => $model->id,
+            'type' => SalesOrderInfo::type_five,
+            'file' => $data['img'],
+            'crt_time' => time(),
+        ]);
 
         return [true, $model->toArray()];
     }

app/Service/SalesOrderService.php

@@ -6,6 +6,7 @@ use App\Model\BasicType;
 use App\Model\BookingList;
 use App\Model\Construction;
 use App\Model\Customer;
+use App\Model\CustomerInfo;
 use App\Model\Employee;
 use App\Model\Product;
 use App\Model\SalesOrder;
@@ -15,6 +16,7 @@ use App\Model\SalesOrderProductInfo;
 use App\Model\SeeRange;
 use App\Model\SportsBag;
 use App\Model\SportsBagProductInfo;
+use App\Model\WxEmployee;
 use Illuminate\Support\Facades\DB;
 
 /**
@@ -911,4 +913,27 @@ class SalesOrderService extends Service
 
         return [true, $sale];
     }
+
+    public function salesOrderListsalesOrderWxList($data,$user){
+        $model = SalesOrder::where('del_time',0)
+            ->select('title','id','sales_order_type','model_type','order_number','selling_price','vin_no','car_type','order_type','deal_type','customer_id','sign_time','contract_state','crt_id','crt_time','mark','product_total','rate','construction_time','handover_time','expire_time','other_fee','discount_fee','contract_fee','contract_type','pay_way','send_state','logistics_company','logistics_number','car_type','year','mileage','color','original_set','processing','state')
+            ->orderby('id', 'desc');
+
+        if(! empty($data['openid'])){
+            $mobile = WxEmployee::where('openid',$data['openid'])->select('mobile')->get()->toArray();
+            $mobile = array_column($mobile,'mobile');
+            $customer_id = CustomerInfo::where('del_time',0)
+                ->where('type',CustomerInfo::type_one)
+                ->whereIn('contact_info',$mobile)
+                ->select('customer_id')
+                ->get()->toArray();
+            $customer_id = array_column($customer_id,'customer_id');
+            $model->whereIn('customer_id',$customer_id);
+        }
+
+        $list = $this->limit($model,'',$data);
+        $list = $this->fillData($list,$data);
+
+        return [true, $list];
+    }
 }

app/Service/Wx/WxEmployeeService.php

@@ -38,10 +38,10 @@ class WxEmployeeService extends Service
             $state = 0;
         }else{
             $state = 1;
-            if(empty($user->mobile) || empty($user->employee_id)) $state = 0;
+            if(empty($user->mobile)) $state = 0;
         }
 
-        return [true,['openid'=>$openid,'state'=> $state ]];
+        return [true,['openid'=>$openid, 'state'=> $state]];
     }
 
 
@@ -55,7 +55,7 @@ class WxEmployeeService extends Service
         if(!$status) return [false,$mobile];
 
         $user = WxEmployee::where('openid',$openid)->first();
-        if(empty($user))  return [false,'请先登陆'];
+        if(empty($user))  return [false,'openID在系统中暂无记录'];
 
         $user->mobile = $mobile;
         $user->save();

routes/wx.php

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