修改格式

app/Http/Services/CrmService.php

@@ -45,32 +45,34 @@ class CrmService
     }
     }
 
 
     /**
     /**
-     * 回传CRM供应商转化确认结果（队列推送）
+     * 回传CRM供应商审核结果（队列推送）
+     * @param int $supplierId 供应商ID
      * @param string $supplierName 供应商名称
      * @param string $supplierName 供应商名称
      * @param string $approverName 审批人姓名
      * @param string $approverName 审批人姓名
-     * @param string $approveResult 审批结果：completed(通过)/purchase_rejected(采购驳回)
-     * @param string $remark 附加说明
+     * @param int $auditStatus 审核状态：1通过 -1拒绝驳回
+     * @param string $remark 审核备注
      * @return bool
      * @return bool
      */
      */
-    public static function confirmCrmSupplier($supplierName, $approverName, $approveResult, $remark = '')
+    public static function confirmCrmSupplier($supplierId, $supplierName, $approverName, $auditStatus, $remark = '')
     {
     {
         try {
         try {
             $data = [
             $data = [
+                'supplier_id' => (string)$supplierId,
+                'audit_status' => (string)$auditStatus,
+                'remark' => $remark,
                 'customer_name' => $supplierName,
                 'customer_name' => $supplierName,
                 'approver' => $approverName,
                 'approver' => $approverName,
-                'approve_result' => $approveResult,
-                'remark' => $remark,
             ];
             ];
             (new QueueDeliveryService())->setQueueName('lie_queue_crm')->push(
             (new QueueDeliveryService())->setQueueName('lie_queue_crm')->push(
-                QueueDeliveryService::PUSH_TYPE_QUEUE,
-                '/sync/synSuppAuditResultToCrm',
+                QueueDeliveryService::PUSH_TYPE_SYNC_HTTP,
+                '/sync/supplier/updateSupplierAuditResultToCrm',
                 $data,
                 $data,
-                (string)$supplierName
+                (string)$supplierId
             );
             );
-            \Illuminate\Support\Facades\Log::info('[CRM回传]回传审批结果已推送到队列', ['supplier_name' => $supplierName, 'approve_result' => $approveResult]);
+            \Illuminate\Support\Facades\Log::info('[CRM回传]回传审核结果已推送到队列', ['supplier_id' => $supplierId, 'audit_status' => $auditStatus]);
             return true;
             return true;
         } catch (\Exception $e) {
         } catch (\Exception $e) {
-            \Illuminate\Support\Facades\Log::error('[CRM回传]回传审批结果推送队列异常: ' . $e->getMessage(), ['supplier_name' => $supplierName]);
+            \Illuminate\Support\Facades\Log::error('[CRM回传]回传审核结果推送队列异常: ' . $e->getMessage(), ['supplier_id' => $supplierId]);
             return false;
             return false;
         }
         }
     }
     }
@@ -92,8 +94,8 @@ class CrmService
                 'remark' => $remark,
                 'remark' => $remark,
             ];
             ];
             (new QueueDeliveryService())->setQueueName('lie_queue_crm')->push(
             (new QueueDeliveryService())->setQueueName('lie_queue_crm')->push(
-                QueueDeliveryService::PUSH_TYPE_QUEUE,
-                '/sync/synSuppAuditResultToCrm',
+                QueueDeliveryService::PUSH_TYPE_SYNC_HTTP,
+                '/sync/supplier/updateSupplierAuditResultToCrm',
                 $data,
                 $data,
                 (string)$supplierName
                 (string)$supplierName
             );
             );

app/Http/Services/SupplierAuditService.php

@@ -666,7 +666,7 @@ class SupplierAuditService
                     ]);
                     ]);
                     // 回传CRM系统：转化供应商状态更新为完成
                     // 回传CRM系统：转化供应商状态更新为完成
                     $supplierName = SupplierChannelModel::where('supplier_id', $supplierId)->value('supplier_name');
                     $supplierName = SupplierChannelModel::where('supplier_id', $supplierId)->value('supplier_name');
-                    CrmService::confirmCrmSupplier($supplierName, $approverName, 'completed', $remark);
+                    CrmService::confirmCrmSupplier($supplierId, $supplierName, $approverName, 1, $remark);
 
 
                     // 记录审批日志
                     // 记录审批日志
                     $logContent = "确认客户转化供应商：审核通过";
                     $logContent = "确认客户转化供应商：审核通过";
@@ -694,7 +694,7 @@ class SupplierAuditService
 
 
                     // 回传CRM系统：转化供应商状态更新为采购驳回
                     // 回传CRM系统：转化供应商状态更新为采购驳回
                     $supplierName = SupplierChannelModel::where('supplier_id', $supplierId)->value('supplier_name');
                     $supplierName = SupplierChannelModel::where('supplier_id', $supplierId)->value('supplier_name');
-                    CrmService::confirmCrmSupplier($supplierName, $approverName, 'purchase_rejected', $remark);
+                    CrmService::confirmCrmSupplier($supplierId, $supplierName, $approverName, -1, $remark);
 
 
                     // 记录审批日志
                     // 记录审批日志
                     $logContent = "确认客户转化供应商：审核未通过";
                     $logContent = "确认客户转化供应商：审核未通过";