Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
杨树贤
/
liexin_supplier
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
9e715a74
authored
Jul 23, 2025
by
杨树贤
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix
parent
eb037eab
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
5 deletions
app/Http/Controllers/Sync/SupplierSyncController.php
app/Http/Services/SyncSupplierService.php
app/Http/Controllers/Sync/SupplierSyncController.php
View file @
9e715a74
...
...
@@ -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'
]))
{
...
...
app/Http/Services/SyncSupplierService.php
View file @
9e715a74
...
...
@@ -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'
];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment