Commit 9e715a74 by 杨树贤

fix

parent eb037eab
......@@ -55,7 +55,6 @@ class SupplierSyncController extends BaseSyncController
{
$resultData = $request->all();
Log::error(json_encode($resultData));
//$resultData['result_map'] = !empty($resultData['result_map']) ? json_decode($resultData['result_map'], true) : [];
//$resultData['tag_list'] = !empty($resultData['tag_list']) ? json_decode($resultData['tag_list'], true) : [];
if (is_array($resultData['result_map'])) {
......
......@@ -298,9 +298,7 @@ class SyncSupplierService
Log::error('供应商不存在');
return true;
}
foreach ($suppliers as $supplier) {
//判断是否是同名多供应商,如果是的话,如果是之前已经禁用的,则直接跳过
if (count($suppliers) > 1) {
if ($supplier['status'] == SupplierChannelModel::STATUS_DISABLE && ($supplier['is_entity'] != SupplierChannelModel::IS_ENTITY_NEED_CONFIRM && $supplier['is_entity'] != SupplierChannelModel::IS_ENTITY_TRUE)) {
......@@ -308,14 +306,12 @@ class SyncSupplierService
continue;
}
}
//判断是否是人工禁用的,是的话,也跳过
//线上数据,实体名单状态为普通,且供应商状态为禁止交易的,全部为手动禁用;
if ((strpos($supplier['disable_reason'], '人工禁用') !== false && $supplier['status'] == SupplierChannelModel::STATUS_DISABLE) || ($supplier['status'] == SupplierChannelModel::STATUS_DISABLE && $supplier['is_entity'] == SupplierChannelModel::IS_ENTITY_FALSE)) {
Log::warning("检测到供应商并且属于禁用(人工禁用)状态,跳过,供应商id为 : " . $supplier['supplier_id']);
continue;
}
$originIsEntity = $supplier['is_entity'];
//$supplier = $supplier->toArray();
$supplierId = $supplier['supplier_id'];
......
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