Commit 93f3aa5d by 杨树贤

修复忽略

parent 2faa9da0
Showing with 19 additions and 19 deletions
......@@ -180,25 +180,25 @@ class SyncSupplierService
$supplier = !empty($supplier) ? $supplier->toArray() : [];
$supplierId = $supplier['supplier_id'];
$supplier = SupplierChannelModel::where('supplier_id', $supplierId)->first()->toArray();
if ($companyCategory != '') {
//实体名单和黑名单都要拉黑,如果不属于黑名单,那么就要将状态改成审核中
if ($companyCategory == '黑名单供应商') {
$data['status'] = SupplierChannelModel::STATUS_BLOCK;
$data['block_reason'] = '一体化系统黑名单供应商';
} else if ($companyCategory == '实体名单供应商') {
$this->receiveEntityResult($supplier['supplier_name'], -1);
} else {
$preIsEntity = $supplier['is_entity'];
//判断原来是拉黑状态,才变成审核中,因为有可能不是修改公司类型,只是修改公司性质
if ($supplier['status'] == SupplierChannelModel::STATUS_BLOCK) {
$data['status'] = SupplierChannelModel::STATUS_IN_REVIEW;
}
//如果之前是禁用,并且是实体名单,那么就要恢复之前的状态
if ($supplier['status'] === SupplierChannelModel::STATUS_DISABLE && $preIsEntity == SupplierChannelModel::IS_ENTITY_TRUE) {
$this->receiveEntityResult($supplier['supplier_name'], 1);
}
}
}
//if ($companyCategory != '') {
// //实体名单和黑名单都要拉黑,如果不属于黑名单,那么就要将状态改成审核中
// if ($companyCategory == '黑名单供应商') {
// $data['status'] = SupplierChannelModel::STATUS_BLOCK;
// $data['block_reason'] = '一体化系统黑名单供应商';
// } else if ($companyCategory == '实体名单供应商') {
// $this->receiveEntityResult($supplier['supplier_name'], -1);
// } else {
// $preIsEntity = $supplier['is_entity'];
// //判断原来是拉黑状态,才变成审核中,因为有可能不是修改公司类型,只是修改公司性质
// if ($supplier['status'] == SupplierChannelModel::STATUS_BLOCK) {
// $data['status'] = SupplierChannelModel::STATUS_IN_REVIEW;
// }
// //如果之前是禁用,并且是实体名单,那么就要恢复之前的状态
// if ($supplier['status'] === SupplierChannelModel::STATUS_DISABLE && $preIsEntity == SupplierChannelModel::IS_ENTITY_TRUE) {
// $this->receiveEntityResult($supplier['supplier_name'], 1);
// }
// }
//}
$data['sync_united_status'] = SupplierChannelModel::SYNC_UNITED_STATUS_OK;
$data['group_code'] = $groupCode;
$data['company_nature'] = $syncResult['company_nature'];
......
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