From 05eb15d3fd954f6155bd940214577e8bfe741bfc Mon Sep 17 00:00:00 2001
From: zhaocheng <578322713@qq.com>
Date: Mon, 5 Sep 2022 13:17:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=87=8D=E5=A4=8D=E8=B0=83?=
 =?UTF-8?q?=E8=AF=95=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=BD=A6=E7=89=8C=E6=9C=89?=
 =?UTF-8?q?=E6=95=88=E6=A3=80=E6=B5=8B=EF=BC=8C=E5=A4=84=E7=90=86=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E5=86=99=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/service/CarInfoHandle.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/extend/service/CarInfoHandle.php b/extend/service/CarInfoHandle.php
index 7de4ec1..bbb8cb5 100644
--- a/extend/service/CarInfoHandle.php
+++ b/extend/service/CarInfoHandle.php
@@ -360,6 +360,12 @@ class CarInfoHandle
                             $delete_num ++;
                             unset($sources[$index]);
                         } else {
+                            if ($source_a['car_no'] != $source['car_no'] && (trim($source_a['car_no']) == '' || !in_array(strlen($source_a['car_no']), [7,8]))) {
+                                list($source_a, $source) = [$source, $source_a];
+                            } else if ($source_a['register_date'] != $source['register_date'] && (trim($source_a['register_date']) == '' || $source_a['register_date'] < $source['register_date'])) {
+                                list($source_a, $source) = [$source, $source_a];
+                            }
+
                             $phones = [$source['car_phone']];
                             $phones_a = [$source_a['car_phone']];
                             foreach (['id_phone', 'insured_phone', 'link_phone_1', 'link_phone_2', 'link_phone_3'] as $key) {
@@ -394,6 +400,7 @@ class CarInfoHandle
                 } catch (\Exception $e) {
                     $faild_num++;
                     Db::rollback();
+                    Log::record($e->getTraceAsString(), 'error');
                 }
                 $current++;
             }