销售订单

app/Model/SalesOrder.php

@@ -12,7 +12,7 @@ class SalesOrder extends Model
     protected $dateFormat = 'U';
     const Model_type_one = 1; // 线下订单合同
     const Model_type_two = 2; // 分社订货合同
-    const Model_type_three = 3; // 二手车精品家装
+    const Model_type_three = 3; // 二手车精品加装合同
     public static $model_type = [
         self::Model_type_one,
         self::Model_type_two,
@@ -20,7 +20,7 @@ class SalesOrder extends Model
     ];
 
     public static $prefix = [
-        self::Model_type_one => 'T9xS.',
+        self::Model_type_one => 'T9XS.',
         self::Model_type_two => 'T9SO.',
         self::Model_type_three => 'T9XS.'
     ];

app/Service/SalesOrderService.php

@@ -270,7 +270,6 @@ class SalesOrderService extends Service
             $sales['pay_way'],
             $sales['send_state'],
             $sales['logistics_company'],
-            $sales['state_type'],
         ];
         $basic_map = BasicType::whereIn('id',$array)
             ->pluck('title','id')
@@ -284,7 +283,6 @@ class SalesOrderService extends Service
             $sales[$key]['pay_way_title'] = $basic_map[$value['pay_way']] ?? '';
             $sales[$key]['send_state_title'] = $basic_map[$value['send_state']] ?? '';
             $sales[$key]['logistics_company_title'] = $basic_map[$value['logistics_company']] ?? '';
-            $sales[$key]['state_type_title'] = $basic_map[$value['state_type']] ?? '';
         }
         $sales = $sales[0];
 
@@ -422,7 +420,7 @@ class SalesOrderService extends Service
     public function fillData($data){
         if(empty($data['data'])) return $data;
 
-        $array = array_unique(array_merge_recursive(array_column($data['data'],'order_type'),array_column($data['data'],'deal_type'),array_column($data['data'],'contract_state'),array_column($data['data'],'car_type'),array_column($data['data'],'pay_way'),array_column($data['data'],'logistics_company'),array_column($data['data'],'state_type'),array_column($data['data'],'send_state')));
+        $array = array_unique(array_merge_recursive(array_column($data['data'],'order_type'),array_column($data['data'],'deal_type'),array_column($data['data'],'contract_state'),array_column($data['data'],'car_type'),array_column($data['data'],'pay_way'),array_column($data['data'],'logistics_company'),array_column($data['data'],'send_state')));
         $basic_map = BasicType::whereIn('id',$array)
             ->pluck('title','id')
             ->toArray();
@@ -441,7 +439,6 @@ class SalesOrderService extends Service
             $data['data'][$key]['pay_way_title'] = $basic_map[$value['pay_way']] ?? '';
             $data['data'][$key]['send_state_title'] = $basic_map[$value['send_state']] ?? '';
             $data['data'][$key]['logistics_company_title'] = $basic_map[$value['logistics_company']] ?? '';
-            $data['data'][$key]['state_type_title'] = $basic_map[$value['state_type']] ?? '';
             $data['data'][$key]['customer_title'] = $customer[$value['customer_id']] ?? '';
             $data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d H:i:s',$value['crt_time']) : '';
             $data['data'][$key]['crt_name'] = $emp[$value['crt_id']] ?? '';
@@ -457,6 +454,6 @@ class SalesOrderService extends Service
         $order_number = OrderNoService::createSalesOrderNumber($prefix);
         if(! $order_number) return [false,'合同编号生成失败！'];
 
-        return [false,$order_number];
+        return [true, ['order_number' => $order_number]];
     }
 }