From 8a439b935bd2442cf9bb65588fa7f27cc59c9c1d Mon Sep 17 00:00:00 2001
From: zhaocheng <578322713@qq.com>
Date: Thu, 24 Nov 2022 18:44:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E8=BD=A6=E6=9E=B6=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E5=85=88=E6=9B=BF=E6=8D=A2=E5=86=8D=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E7=94=B5=E8=AF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/service/CarInfoHandle.php | 34 +++++++++++++++++---------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/extend/service/CarInfoHandle.php b/extend/service/CarInfoHandle.php
index 7b7ec08..2c71d92 100644
--- a/extend/service/CarInfoHandle.php
+++ b/extend/service/CarInfoHandle.php
@@ -336,6 +336,24 @@ class CarInfoHandle
                         $car_phone_valid = preg_match('/^1[3-9][0-9]{9}/', $source['car_phone']);
                         // 当不是标准有效对比无效的情况下，要进行数据对比替换
                         if (!($car_phone_a_valid && !$car_phone_valid)) {
+                            if (!$car_phone_a_valid && $car_phone_valid) { // 标准无效，对比有效
+                                list($source_a, $source) = [$source, $source_a];
+                            } else if (trim($source_a['insurer1_date']) != trim($source['insurer1_date']) && (trim($source_a['insurer1_date']) == '' || $source_a['insurer1_date'] < $source['insurer1_date'])) {
+                                list($source_a, $source) = [$source, $source_a];
+                            } else if (trim($source_a['insurer2_date']) != trim($source['insurer2_date']) && (trim($source_a['insurer2_date']) == '' || $source_a['insurer2_date'] < $source['insurer2_date'])) {
+                                list($source_a, $source) = [$source, $source_a];
+                            } else if ($source_a['is_export_bmc'] == 0 && $source['is_export_bmc'] > 0) {
+                                list($source_a, $source) = [$source, $source_a];
+                            } else if ($source_a['is_update_bhx'] == 0 && $source['is_update_bhx'] > 0) {
+                                list($source_a, $source) = [$source, $source_a];
+                            } else if ($source_a['is_export_bhx'] == 0 && $source['is_export_bhx'] > 0) {
+                                list($source_a, $source) = [$source, $source_a];
+                            } else if ($source_a['car_no'] != $source['car_no'] && (trim($source_a['car_no']) == '' || !in_array(mb_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];
+                            }
+
                             if ($car_phone_a_valid && $car_phone_valid) { // 都有效更新电话
                                 $phones = [$source['car_phone']];
                                 $phones_a = [$source_a['car_phone']];
@@ -359,22 +377,6 @@ class CarInfoHandle
                                     }
                                     CarInfoT::where('id', $source_a['id'])->update($source_a);
                                 }
-                            } else if (!$car_phone_a_valid && $car_phone_valid) { // 标准无效，对比有效
-                                list($source_a, $source) = [$source, $source_a];
-                            } else if (trim($source_a['insurer1_date']) != trim($source['insurer1_date']) && (trim($source_a['insurer1_date']) == '' || $source_a['insurer1_date'] < $source['insurer1_date'])) {
-                                list($source_a, $source) = [$source, $source_a];
-                            } else if (trim($source_a['insurer2_date']) != trim($source['insurer2_date']) && (trim($source_a['insurer2_date']) == '' || $source_a['insurer2_date'] < $source['insurer2_date'])) {
-                                list($source_a, $source) = [$source, $source_a];
-                            } else if ($source_a['is_export_bmc'] == 0 && $source['is_export_bmc'] > 0) {
-                                list($source_a, $source) = [$source, $source_a];
-                            } else if ($source_a['is_update_bhx'] == 0 && $source['is_update_bhx'] > 0) {
-                                list($source_a, $source) = [$source, $source_a];
-                            } else if ($source_a['is_export_bhx'] == 0 && $source['is_export_bhx'] > 0) {
-                                list($source_a, $source) = [$source, $source_a];
-                            } else if ($source_a['car_no'] != $source['car_no'] && (trim($source_a['car_no']) == '' || !in_array(mb_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];
                             }
                         }
                         $this->repeatDataHandle($source, $id, 'frame');