修改接收地址

app/Http/Services/SupplierAddressService.php

@@ -83,34 +83,45 @@ class SupplierAddressService
         ])->first()->toArray();
         $oldSupplierAddress = $supplier['supplier_address'];
         //收发货地址
-        $addressData = SupplierAddressModel::where('supplier_id', $supplierId)->pluck('address', 'address_type')->toArray();
-        //发货地址
-        $oldShippingAddress = array_get($addressData, 1);
-        //退货地址
-        $oldReturnAddress = array_get($addressData, 2);
+        $addressData = SupplierAddressModel::where('supplier_id', $supplierId)->select(['info_id', 'address', 'address_type', 'supplier_id'])
+            ->get()->toArray();
+        $oldShippingAddress = $oldReturnAddress = '';
+        $oldReturnAddressSourceId = $oldShippingAddressSourceId = '';
+        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 = [];
         if ($oldSupplierAddress != $supplierAddress) {
             $changedAddress[] = [
                 'source_id' => $supplierId,
                 'source_code' => $supplier['supplier_code'],
-                'address_type' => '供应商地址',
+                'address_type' => '注册地址',
                 'address' => $supplierAddress,
             ];
         }
         if ($oldShippingAddress != $shippingAddress) {
             $changedAddress[] = [
-                'source_id' => $supplierId,
+                'source_id' => $oldShippingAddressSourceId,
                 'source_code' => $supplier['supplier_code'],
-                'address_type' => '供应商收货地址',
+                'address_type' => '收货地址',
                 'address' => $shippingAddress,
             ];
         }
         if ($oldReturnAddress != $returnAddress) {
             $changedAddress[] = [
-                'source_id' => $supplierId,
+                'source_id' => $oldReturnAddressSourceId,
                 'source_code' => $supplier['supplier_code'],
-                'address_type' => '供应商退货地址',
+                'address_type' => '退货地址',
                 'address' => $returnAddress,
             ];
         }
@@ -126,7 +137,6 @@ class SupplierAddressService
         ];
 
         $url = config('website.UnitedDataDomain') . '/sync/Address/updateAddress';
-        //dd($params);
         $result = curl($url, $params);
         $result = json_decode($result, true);
         \Log::error($result);