1

app/Model/OrderOperation.php

@@ -35,8 +35,8 @@ class OrderOperation extends Model
     const twenty = 20;
 
     public static $type = [
-        self::one => '指派销售',
-        self::two => '指派总社或分社',
+        self::one => '线上派单',
+        self::two => '门店派单',
         self::three => '合同确认',
         self::four => '合同弃审',
         self::five => '合同公司完结',

app/Service/CheckService.php

@@ -617,7 +617,12 @@ class CheckService extends Service
         if($model->state != SalesOrder::State_one) return [false, '请确认合同状态，操作失败'];
 
         if($data['type'] == self::TYPE_ONE){
-            $model->state = SalesOrder::State_two;
+            $state = SalesOrder::State_three;
+            if($model->model_type != SalesOrder::Model_type_four){
+                //线上订单
+                $state = SalesOrder::State_two;
+            }
+            $model->state = $state;
             $model->save();
         }else{
             $model->state = SalesOrder::State_zero;
@@ -718,7 +723,14 @@ class CheckService extends Service
             ->first();
         if(empty($model)) return [false, '合同不存在或已被删除'];
         //安装件
-        if($model->state != SalesOrder::State_two) return [false, '请确认合同状态，操作失败'];
+
+        if($model->model_type == SalesOrder::Model_type_four){
+            //线上订单
+            if($model->state != SalesOrder::State_two) return [false, '请确认合同状态，操作失败'];
+        }else{
+            //除线上订单之外
+            if($model->state != SalesOrder::State_three) return [false, '请确认合同状态，操作失败'];
+        }
 
         //未确认
         $model->state = SalesOrder::State_zero;

app/Service/SalesOrderService.php

@@ -835,18 +835,10 @@ class SalesOrderService extends Service
             DB::beginTransaction();
             $time = time();
 
-            if(empty($data['is_company'])){
-                SalesOrder::where('del_time',0)->where('id',$msg['id'])->update([
-                    'state' => SalesOrder::State_three,
-                    'dispatch_time_first' => $time,
-                ]);
-            }else{
-                SalesOrder::where('del_time',0)->where('id',$msg['id'])->update([
-                    'state' => SalesOrder::State_four,
-                    'dispatch_time_first' => $time,
-                    'dispatch_time_second' => $time,
-                ]);
-            }
+            SalesOrder::where('del_time',0)->where('id',$msg['id'])->update([
+                'state' => SalesOrder::State_three,
+                'dispatch_time_first' => $time,
+            ]);
 
             SeeRange::where('del_time',0)
                 ->where('data_id',$msg['id'])
@@ -882,18 +874,6 @@ class SalesOrderService extends Service
                 SeeRange::insert($insert);
             }
 
-            if(! empty($data['is_company'])){
-                $insert = [];
-                $insert[] = [
-                    'data_id' => $msg['id'],
-                    'data_type' => SeeRange::type_seven,
-                    'param_id' => $data['is_company'],
-                    'type' => SeeRange::data_three,
-                    'crt_time' => $time,
-                ];
-                SeeRange::insert($insert);
-            }
-
             (new OrderOperationService())->add([
                 'order_number' => $msg['order_number'],
                 'msg' => OrderOperation::$type[OrderOperation::one],
@@ -930,11 +910,6 @@ class SalesOrderService extends Service
         if(! $bool) return [false,'合同产品不能为空'];
         if(empty($data['dispatch_depart_one']) && empty($data['dispatch_employee'])) return [false, '请指派部门或人员'];
 
-        //如果是分社的合同 派销售以后直接 分社结束
-        $top_depart_id = $user['head'] ?? [];
-        $top_depart_id = $top_depart_id['id'] ?? 0;
-        if($top_depart_id != $sale['top_depart_id']) $data['is_company'] = $sale['top_depart_id'];
-
         return [true, $sale];
     }