修改

app/Service/CustomerService.php

@@ -30,6 +30,18 @@ class CustomerService extends Service
         try {
             DB::beginTransaction();
 
+            //车型
+            if(empty($data['car_type']) && ! empty($data['car_type_title'])){
+                $model_2 = new BasicType();
+                $model_2->title = $data['car_type_title'];
+                $model_2->type = 10;
+                $model_2->depart_id = $data['depart_id'] ?? 0;
+                $model_2->top_depart_id = $data['top_depart_id'] ?? 0;
+                $model_2->crt_id = $user['id'];
+                $model_2->save();
+                $data['car_type'] = $model_2->id;
+            }
+
             $model = Customer::where('id',$data['id'])->first();
             $model->title = $data['title'];
             $model->code = $data['code'] ?? "";
@@ -170,6 +182,18 @@ class CustomerService extends Service
         try {
             DB::beginTransaction();
 
+            //车型
+            if(empty($data['car_type']) && ! empty($data['car_type_title'])){
+                $model_2 = new BasicType();
+                $model_2->title = $data['car_type_title'];
+                $model_2->type = 10;
+                $model_2->depart_id = $data['depart_id'] ?? 0;
+                $model_2->top_depart_id = $data['top_depart_id'] ?? 0;
+                $model_2->crt_id = $user['id'];
+                $model_2->save();
+                $data['car_type'] = $model_2->id;
+            }
+
             $model = new Customer();
             $model->title = $data['title'];
             $model->code = $data['code'] ?? "";
@@ -558,6 +582,16 @@ class CustomerService extends Service
 //            if(empty($data['customer_contact'])) return [false,'客户联系方式不能为空'];
         }
 
+
+        if(empty($data['car_type']) && ! empty($data['car_type_title'])){
+            $bool = BasicType::where('title',$data['car_type_title'])
+                ->where('top_depart_id',$data['top_depart_id'])
+                ->where('type',10)
+                ->where('del_time',0)
+                ->exists();
+            if($bool) return [false,'车型名称已存在'];
+        }
+
         if($is_add){
             $bool = Customer::where('del_time',0)
                 ->where('top_depart_id',$data['top_depart_id'])

app/Service/RangeService.php

@@ -411,6 +411,18 @@ class RangeService extends Service
         return $return;
     }
 
+    //指派门店
+    public function salesOrderZpSearch($data){
+        $return = SeeRange::where('del_time',0)
+            ->where('param_id',$data['zp'])
+            ->where('data_type',SeeRange::type_seven)
+            ->where('type',SeeRange::data_three)
+            ->select('data_id')
+            ->get()->toArray();
+
+        return array_column($return,'data_id');
+    }
+
     //收付款人搜索
     public function paymentReceiptSearch($data){
         $emp_id = Employee::where('del_time',0)

app/Service/SalesOrderService.php

@@ -753,6 +753,7 @@ class SalesOrderService extends Service
                 ->get()->toArray();
             $model->whereIn('customer_id',array_unique(array_column($customer,'id')));
         }
+        if(! empty($data['customer_id'])) $model->where('customer_id',$data['customer_id']);
         if(! empty($data['sign_time'][0]) && ! empty($data['sign_time'][1])){
             $return = $this->changeDateToTimeStampAboutRange($data['sign_time']);
             $model->where('sign_time','>=',$return[0]);
@@ -767,6 +768,11 @@ class SalesOrderService extends Service
             $sale_order_id = (new RangeService())->salesOrderSearch($data);
             $model->whereIn('id',$sale_order_id);
         }
+        if(! empty($data['zp'])){
+            $sale_order_id = (new RangeService())->salesOrderZpSearch($data);
+            $model->whereIn('id',$sale_order_id);
+        }
+        if(! empty($data['purchase_order_number'])) $model->where('contact_order_no','LIKE', '%'.$data['purchase_order_number'].'%');
 
         $list = $this->limit($model,'',$data);
         $list = $this->fillData($list,$data);

app/Service/U8ServerService.php

@@ -570,9 +570,15 @@ class U8ServerService extends Service
             $sub_map[$value['sales_order_id']][] = $value;
         }
         foreach ($main as $key => $value){
+            $plat_type = $code_map[$value['plat_type']] ?? "";
+            if($plat_type == "营销部"){
+                $ccusabbname = "营销部客户";
+            }else{
+                $ccusabbname = $customer_map[$value['customer_id']] ?? "";
+            }
             $main[$key]['cbustype'] = "普通销售"; //业务类型(本身就是中文)
             $main[$key]['cstname'] = SalesOrder::$model_type_title[$value['model_type']] ?? ""; //销售类型
-            $main[$key]['ccusabbname'] = $customer_map[$value['customer_id']] ?? "";//客户简称
+            $main[$key]['ccusabbname'] = $ccusabbname;//客户简称
 //            $main[$key]['cdepname'] = $depart[$value['top_depart_id']] ?? "";//部门名称
 //            $main[$key]['cpersoncode'] = $emp[$value['crt_id']] ?? "";//业务员
             $main[$key]['jobnumber'] = $emp[$value['crt_id']] ?? "";

app/Service/Wx/WxService.php

@@ -10,8 +10,13 @@ class WxService extends Service
 //    public $appid = 'wx4e1324c600df37a6';
 //    public $secret = '72f8c912d462b0f4ff46cbedac0c80bf';
 
-    public $appid = 'wx4e1324c600df37a6';
-    public $secret = 'cec65770bf168a57dc8e5a012d4c9537';
+    //测试
+//    public $appid = 'wx4e1324c600df37a6';
+//    public $secret = 'cec65770bf168a57dc8e5a012d4c9537';
+
+    //正式
+    public $appid = 'wxc0bc3dfc58b4e00e';
+    public $secret = 'ad37474f1a646281052438206b8aaed2';
 
     public function getOpenid($code){