dev

packages/bydauto/routes/api.php

@@ -6,10 +6,6 @@
 $prefix = '/pkg/bydauto';
 
 Route::group(['prefix' => $prefix, 'middleware' => ['api']], function () {
-    Route::get('vehicle', [BYDAutoController::class, 'vehicle']);
-    Route::get('dealer', [BYDAutoController::class, 'dealer']);
-    Route::get('province', [BYDAutoController::class, 'province']);
-    Route::get('city', [BYDAutoController::class, 'city']);
     Route::post('testdrive', [BYDAutoController::class, 'testdrive']);
     Route::post('isaas', [BYDAutoController::class, 'isaas']);
     Route::post('cluepackage', [BYDAutoController::class, 'cluepackage']);

packages/bydauto/src/Commands/BYDAutoCommand.php

@@ -27,6 +27,9 @@ public function handle()
         }
     }
 
+    // public function action_contact()
+    // {}
+
     public function action_mail_test()
     {
         $users = Contact::query()->get();
@@ -112,11 +115,33 @@ public function action_push2contact()
             $contact = $contacts->firstWhere('id', $contactId);
             $this->info("发送试驾数据给联系人 {$contact->id} 总数 " . count($items));
             info("发送试驾数据给联系人 {$contact->id} 总数 " . count($items));
-            $contact->notify(new TestdirveNotification($items));
+            // $contact->notify(new TestdirveNotification($items));
         }
         return Command::SUCCESS;
     }
 
+    public function action_map_activity_testdirve()
+    {
+        $activities = Activity::query()
+            ->orderBy('id')
+            ->get();
+
+        foreach ($activities as $activity) {
+            $testdriveId = $activity->content['testdrive'] ?? null;
+            if ($testdriveId) {
+                $testdrive = Testdrive::query()->find($testdriveId);
+                if ($testdrive) {
+                    $testdrive->update([
+                        'contact_id' => $activity->related_id,
+                        'contact_info' => $activity->related->toArray(),
+                    ]);
+                }
+            }
+        }
+        $this->info('Map activity testdrive done');
+        return Command::SUCCESS;
+    }
+
     public function action_testdrive()
     {
         $items = Testdrive::query()->orderBy('id', 'desc')->get();
@@ -127,7 +152,7 @@ public function action_testdrive()
 
     public function action_contact()
     {
-        $items = Contact::all();
+        $items = Contact::query()->orderBy('id')->get();
         $this->table(['id', 'email', 'remark', 'status'], $items->map(function (Contact $v) {
             return [$v->id, $v->email, $v->remark, $v->status];
         }));

packages/bydauto/src/Models/Activity.php

@@ -22,4 +22,9 @@ class Activity extends Model
     protected $fillable = ['name', 'content', 'related_id', 'related_type'];
 
     protected $casts = ['content' => 'json'];
+
+    public function related()
+    {
+        return $this->morphTo('related');
+    }
 }

packages/bydauto/src/Models/Testdrive.php

@@ -6,6 +6,7 @@
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Attributes\ObservedBy;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Validation\ValidationException;
 
 /**
  * 销售线索.
@@ -34,8 +35,17 @@ class Testdrive extends Model
     protected $table = 'bydauto_testdrive';
 
     protected $fillable = [
-        'status', 'name', 'mobile', 'platform', 'source', 'meta',
+        'status',
-        'rawdata', 'request_id', 'external_id', 'contact_id', 'contact_info'
+        'name',
+        'mobile',
+        'platform',
+        'source',
+        'meta',
+        'rawdata',
+        'request_id',
+        'external_id',
+        'contact_id',
+        'contact_info'
     ];
 
     protected $casts = ['meta' => 'json', 'rawdata' => 'json', 'contact_info' => 'json'];
@@ -109,8 +119,9 @@ public static function cluepackage($data)
         //     "utc_timestamp": "1724681530",
         //     "user_mobile_no": "15318418738"
         // }
-
+        info('===== Testdrive:cluepackage', $data);
-        // $externalId = $data['id'];
+        $externalId = $data['id'] ?? null;
+        throw_if($externalId === null, ValidationException::withMessages(['id' => 'MISSING_ID']));
         // $model = static::query()->where('external_id', $externalId)->first();
         // if ($model) {
         //     info('===== cluepackage exists', $data);