fix

app/Http/Services/LogService.php

@@ -120,6 +120,7 @@ class LogService
                     $result[] = $content;
                     $result[] = $content;
                 }
                 }
                 if ($key == 'extra_fee') {
                 if ($key == 'extra_fee') {
+                    if (!empty($oldSupplier['extra_fee'])) {
                         $oldFee = json_decode($oldSupplier['extra_fee'], true);
                         $oldFee = json_decode($oldSupplier['extra_fee'], true);
                         $newFee = json_decode($newSupplier['extra_fee'], true);
                         $newFee = json_decode($newSupplier['extra_fee'], true);
                         $content = "采购附加费由 [商品总价不满" . $oldFee['cn']['max'] . "元,收取" . $oldFee['cn']['price'] . "元;商品总价不满" .
                         $content = "采购附加费由 [商品总价不满" . $oldFee['cn']['max'] . "元,收取" . $oldFee['cn']['price'] . "元;商品总价不满" .
@@ -129,6 +130,7 @@ class LogService
                         $result[] = $content;
                         $result[] = $content;
                     }
                     }
                 }
                 }
+            }
             $result = array_unique($result);
             $result = array_unique($result);
         }
         }
         return $result;
         return $result;

app/Http/Services/SupplierContactService.php

@@ -75,10 +75,13 @@ class SupplierContactService
         if ($result) {
         if ($result) {
             //修改供应商为审核状态
             //修改供应商为审核状态
             $supplierModel = new SupplierChannelModel();
             $supplierModel = new SupplierChannelModel();
+            $supplierStatus = $supplierModel->where('supplier_id', $contact['supplier_id'])->value('status');
             $supplierModel->where('supplier_id', $contact['supplier_id'])->update([
             $supplierModel->where('supplier_id', $contact['supplier_id'])->update([
                 'update_time' => time(),
                 'update_time' => time(),
                 'status' => 1,
                 'status' => 1,
             ]);
             ]);
+            //待审核(没有完善过联系人的,不需要记录日志,让其继续保持一条日志,就叫新增供应商)
+            if ($supplierStatus != -1) {
                 $logService = new LogService();
                 $logService = new LogService();
                 $content = !empty($contact['contact_id'])?'修改联系人':'添加联系人';
                 $content = !empty($contact['contact_id'])?'修改联系人':'添加联系人';
                 $remark = json_encode([
                 $remark = json_encode([
@@ -87,6 +90,7 @@ class SupplierContactService
                 ]);
                 ]);
                 $logService->AddLog($contact['supplier_id'], LogModel::UPDATE_OPERATE, '修改供应商基本资料', $content, $remark);
                 $logService->AddLog($contact['supplier_id'], LogModel::UPDATE_OPERATE, '修改供应商基本资料', $content, $remark);
             }
             }
+        }
 
 
         return $result;
         return $result;
     }
     }

app/Http/Services/SupplierService.php

@@ -87,7 +87,6 @@ class SupplierService
 
 
         //走事务
         //走事务
         $dataResult = DB::connection('web')->transaction(function () use ($channel) {
         $dataResult = DB::connection('web')->transaction(function () use ($channel) {
-            $redis = new RedisModel();
             $model = new SupplierChannelModel();
             $model = new SupplierChannelModel();
             $extraFax = [
             $extraFax = [
                 'supplier_id' => $channel['supplier_id'],
                 'supplier_id' => $channel['supplier_id'],
@@ -128,6 +127,7 @@ class SupplierService
                 $supplierAddressService->saveAddress($address);
                 $supplierAddressService->saveAddress($address);
                 $extraFaxService = new SupplierExtraFeeService();
                 $extraFaxService = new SupplierExtraFeeService();
                 $extraFaxService->saveSupplierExtraFee($extraFax);
                 $extraFaxService->saveSupplierExtraFee($extraFax);
+
                 $this->saveRatioToRedis($supplierId);
                 $this->saveRatioToRedis($supplierId);
                 $this->saveSkuAuditRulerToRedis($supplierId, $channel['sku_audit_ruler']);
                 $this->saveSkuAuditRulerToRedis($supplierId, $channel['sku_audit_ruler']);
                 $this->saveSkuUploadRulerToRedis($supplierId, $channel['sku_upload_ruler']);
                 $this->saveSkuUploadRulerToRedis($supplierId, $channel['sku_upload_ruler']);

app/Http/Services/SupplierSkuAuditRulerService.php

@@ -59,7 +59,11 @@ class SupplierSkuAuditRulerService
             '3' => 1,
             '3' => 1,
             '4' => 1
             '4' => 1
         ];
         ];
-
+        if (empty($auditData)) {
+            $auditRuler['skip'] = 0;
+            $auditRuler['audit_ruler'] = $defaultRuler;
+            return json_encode($auditRuler);
+        }
         $rulers = [];
         $rulers = [];
         foreach ($defaultRuler as $key => $ruler) {
         foreach ($defaultRuler as $key => $ruler) {
             if (empty($auditData[$key])) {
             if (empty($auditData[$key])) {

resources/views/web/AuditSupplier.blade.php

@@ -25,6 +25,8 @@
                         @foreach($auditContent['content'] as $content)
                         @foreach($auditContent['content'] as $content)
                             {{$content}}
                             {{$content}}
                         @endforeach
                         @endforeach
+                    @else
+                        {{$auditContent['content']}}
                     @endif
                     @endif
                 </div>
                 </div>
             </div>
             </div>