Skip to content

杨树贤 / liexin_supplier

Go to a project
Commit 9606ad6c by 杨树贤
Options

fix

parent 972bb128
Inline Side-by-side
Showing with 55 additions and 12 deletions
app/Console/Commands/RefreshHistoryPurchaseUser.php
...@@ -56,20 +56,54 @@ class RefreshHistoryPurchaseUser extends Command ...@@ -56,20 +56,54 @@ class RefreshHistoryPurchaseUser extends Command
$this->info('跳过: ' . $result['skipped']); $this->info('跳过: ' . $result['skipped']);
$this->info('========================================'); $this->info('========================================');
// 如果有失败记录，打印详情 // 只打印有数据变更的公司（成功的）
if (!empty($result['details'])) {
$this->info('');
$this->info('数据变更详情(' . count($result['details']) . '条):');
foreach ($result['details'] as $detail) {
$supplierId = $detail['supplier_id'];
$supplierCode = isset($detail['supplier_code']) ? $detail['supplier_code'] : '';
$supplierName = isset($detail['supplier_name']) ? $detail['supplier_name'] : '';
$action = isset($detail['action']) ? $detail['action'] : '';
// 获取分配的采购员信息
$assignInfo = '';
if (isset($detail['assign_code_ids']) && !empty($detail['assign_code_ids'])) {
$assignInfo = ' 分配采购员codeId: ' . implode(',', $detail['assign_code_ids']);
}
$this->info(sprintf(
' [ID:%d %s] %s - %s%s',
$supplierId,
$supplierCode,
$supplierName,
$action,
$assignInfo
));
}
}
// 打印失败的记录
if (!empty($result['debug_info'])) { if (!empty($result['debug_info'])) {
$this->info(''); $this->info('');
$this->warn('失败/跳过详情:'); $this->warn('失败详情(' . count($result['debug_info']) . '条):');
foreach ($result['debug_info'] as $info) { foreach ($result['debug_info'] as $info) {
$failReason = isset($info['fail_reason']) ? $info['fail_reason'] : ''; $failReason = isset($info['fail_reason']) ? $info['fail_reason'] : '';
$skipReason = isset($info['skip_reason']) ? $info['skip_reason'] : ''; $skipReason = isset($info['skip_reason']) ? $info['skip_reason'] : '';
$supplierName = isset($info['supplier_name']) ? $info['supplier_name'] : ''; $supplierName = isset($info['supplier_name']) ? $info['supplier_name'] : '';
$this->warn(sprintf( $supplierCode = isset($info['supplier_code']) ? $info['supplier_code'] : '';
' [ID:%d] %s - %s', $reason = $failReason ? $failReason : $skipReason;
$info['supplier_id'],
$supplierName, // 只打印失败的，跳过的不再打印
$failReason ? $failReason : $skipReason if ($failReason) {
)); $this->warn(sprintf(
' [ID:%d %s] %s - %s',
$info['supplier_id'],
$supplierCode,
$supplierName,
$reason
));
}
} }
} }
...@@ -86,8 +120,13 @@ class RefreshHistoryPurchaseUser extends Command ...@@ -86,8 +120,13 @@ class RefreshHistoryPurchaseUser extends Command
$action = isset($progress['action']) ? $progress['action'] : ''; $action = isset($progress['action']) ? $progress['action'] : '';
$status = isset($progress['status']) ? $progress['status'] : ''; $status = isset($progress['status']) ? $progress['status'] : '';
$statusIcon = $status === 'success' ? 'OK' : ($status === 'skip' ? '--' : 'XX'); // 只打印有变更的记录（成功和失败），跳过的不打印
$statusColor = $status === 'success' ? 'info' : ($status === 'skip' ? 'comment' : 'error'); if ($status === 'skip') {
return;
}
$statusIcon = $status === 'success' ? 'OK' : 'XX';
$statusColor = $status === 'success' ? 'info' : 'error';
$message = sprintf( $message = sprintf(
' [%s] ID:%d %s - %s', ' [%s] ID:%d %s - %s',
...@@ -99,8 +138,6 @@ class RefreshHistoryPurchaseUser extends Command ...@@ -99,8 +138,6 @@ class RefreshHistoryPurchaseUser extends Command
if ($statusColor === 'info') { if ($statusColor === 'info') {
$this->info($message); $this->info($message);
} elseif ($statusColor === 'comment') {
$this->comment($message);
} else { } else {
$this->error($message); $this->error($message);
} }
......
app/Http/Services/SupplierService.php
...@@ -1327,17 +1327,20 @@ class SupplierService ...@@ -1327,17 +1327,20 @@ class SupplierService
'supplier_code' => $supplier->supplier_code, 'supplier_code' => $supplier->supplier_code,
'supplier_name' => $supplier->supplier_name, 'supplier_name' => $supplier->supplier_name,
'action' => '仅分配数据跟单员（基于现有猎芯采购）', 'action' => '仅分配数据跟单员（基于现有猎芯采购）',
'assign_code_ids' => $liexinPurchases,
]; ];
} else { } else {
// 无猎芯采购和数据跟单员：按规则同时分配 // 无猎芯采购和数据跟单员：按规则同时分配
$assignResult = $supplierService->autoAssignPurchaseUser($supplierId, $yunxinChannelUid, true); $assignResult = $supplierService->autoAssignPurchaseUser($supplierId, $yunxinChannelUid, true);
if ($assignResult['success']) { if ($assignResult['success']) {
$result['success']++; $result['success']++;
$assignCodeIds = isset($assignResult['debug_info']['assign_code_ids']) ? $assignResult['debug_info']['assign_code_ids'] : [];
$result['details'][] = [ $result['details'][] = [
'supplier_id' => $supplierId, 'supplier_id' => $supplierId,
'supplier_code' => $supplier->supplier_code, 'supplier_code' => $supplier->supplier_code,
'supplier_name' => $supplier->supplier_name, 'supplier_name' => $supplier->supplier_name,
'action' => '分配猎芯采购和数据跟单员', 'action' => '分配猎芯采购和数据跟单员',
'assign_code_ids' => $assignCodeIds,
]; ];
} else { } else {
$result['failed']++; $result['failed']++;
...@@ -1481,6 +1484,7 @@ class SupplierService ...@@ -1481,6 +1484,7 @@ class SupplierService
'supplier_code' => $supplier->supplier_code, 'supplier_code' => $supplier->supplier_code,
'supplier_name' => $supplier->supplier_name, 'supplier_name' => $supplier->supplier_name,
'action' => '仅分配数据跟单员（基于现有猎芯采购）', 'action' => '仅分配数据跟单员（基于现有猎芯采购）',
'assign_code_ids' => $liexinPurchases,
]; ];
// 回调进度 // 回调进度
...@@ -1497,11 +1501,13 @@ class SupplierService ...@@ -1497,11 +1501,13 @@ class SupplierService
$assignResult = $supplierService->autoAssignPurchaseUser($supplierId, $yunxinChannelUid, true); $assignResult = $supplierService->autoAssignPurchaseUser($supplierId, $yunxinChannelUid, true);
if ($assignResult['success']) { if ($assignResult['success']) {
$result['success']++; $result['success']++;
$assignCodeIds = isset($assignResult['debug_info']['assign_code_ids']) ? $assignResult['debug_info']['assign_code_ids'] : [];
$result['details'][] = [ $result['details'][] = [
'supplier_id' => $supplierId, 'supplier_id' => $supplierId,
'supplier_code' => $supplier->supplier_code, 'supplier_code' => $supplier->supplier_code,
'supplier_name' => $supplier->supplier_name, 'supplier_name' => $supplier->supplier_name,
'action' => '分配猎芯采购和数据跟单员', 'action' => '分配猎芯采购和数据跟单员',
'assign_code_ids' => $assignCodeIds,
]; ];
// 回调进度 // 回调进度
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment