Commit 32910072 by 杨树贤

修改接收地址

parent 3294f141
Showing with 21 additions and 11 deletions
...@@ -83,34 +83,45 @@ class SupplierAddressService ...@@ -83,34 +83,45 @@ class SupplierAddressService
])->first()->toArray(); ])->first()->toArray();
$oldSupplierAddress = $supplier['supplier_address']; $oldSupplierAddress = $supplier['supplier_address'];
//收发货地址 //收发货地址
$addressData = SupplierAddressModel::where('supplier_id', $supplierId)->pluck('address', 'address_type')->toArray(); $addressData = SupplierAddressModel::where('supplier_id', $supplierId)->select(['info_id', 'address', 'address_type', 'supplier_id'])
//发货地址 ->get()->toArray();
$oldShippingAddress = array_get($addressData, 1); $oldShippingAddress = $oldReturnAddress = '';
//退货地址 $oldReturnAddressSourceId = $oldShippingAddressSourceId = '';
$oldReturnAddress = array_get($addressData, 2); foreach ($addressData as $item) {
if ($item['address_type'] == 1) {
//发货地址
$oldShippingAddress = $item['address'];
$oldShippingAddressSourceId = $supplierId . '_' . $item['info_id'];
}else{
//退货地址
$oldReturnAddress = $item['address'];
$oldReturnAddressSourceId = $supplierId . '_' . $item['info_id'];
}
}
//比较,如果有变化,则请求一体化接口 //比较,如果有变化,则请求一体化接口
$changedAddress = []; $changedAddress = [];
if ($oldSupplierAddress != $supplierAddress) { if ($oldSupplierAddress != $supplierAddress) {
$changedAddress[] = [ $changedAddress[] = [
'source_id' => $supplierId, 'source_id' => $supplierId,
'source_code' => $supplier['supplier_code'], 'source_code' => $supplier['supplier_code'],
'address_type' => '供应商地址', 'address_type' => '注册地址',
'address' => $supplierAddress, 'address' => $supplierAddress,
]; ];
} }
if ($oldShippingAddress != $shippingAddress) { if ($oldShippingAddress != $shippingAddress) {
$changedAddress[] = [ $changedAddress[] = [
'source_id' => $supplierId, 'source_id' => $oldShippingAddressSourceId,
'source_code' => $supplier['supplier_code'], 'source_code' => $supplier['supplier_code'],
'address_type' => '供应商收货地址', 'address_type' => '收货地址',
'address' => $shippingAddress, 'address' => $shippingAddress,
]; ];
} }
if ($oldReturnAddress != $returnAddress) { if ($oldReturnAddress != $returnAddress) {
$changedAddress[] = [ $changedAddress[] = [
'source_id' => $supplierId, 'source_id' => $oldReturnAddressSourceId,
'source_code' => $supplier['supplier_code'], 'source_code' => $supplier['supplier_code'],
'address_type' => '供应商退货地址', 'address_type' => '退货地址',
'address' => $returnAddress, 'address' => $returnAddress,
]; ];
} }
...@@ -126,7 +137,6 @@ class SupplierAddressService ...@@ -126,7 +137,6 @@ class SupplierAddressService
]; ];
$url = config('website.UnitedDataDomain') . '/sync/Address/updateAddress'; $url = config('website.UnitedDataDomain') . '/sync/Address/updateAddress';
//dd($params);
$result = curl($url, $params); $result = curl($url, $params);
$result = json_decode($result, true); $result = json_decode($result, true);
\Log::error($result); \Log::error($result);
......
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