xialei 1 год назад
Родитель
Сommit
fbbc980ef9
1 измененных файлов с 11 добавлено и 6 удалено
  1. 11 6
      app/common/repositories/store/order/StoreOrderRepository.php

+ 11 - 6
app/common/repositories/store/order/StoreOrderRepository.php

@@ -6698,25 +6698,29 @@ class StoreOrderRepository extends BaseRepository
6698 6698
                     }
6699 6699
                     $details = GongApiRequest::order_details($value['douhuomall_order_no']);
6700 6700
                     if (!$details) continue;
6701
-                    $data['supply_type'] = $details['supply_type'];
6701
+
6702
+                    $track = GongApiRequest::order_track($value['douhuomall_order_no']);
6703
+
6704
+                    $data['supply_type'] = $details['supply_type'] ?? 0;
6702 6705
                     $data['delivery_type'] = 1;
6703
-                    $data['delivery_name'] = $details['logistics_company'] ?? '';
6704
-                    $data['delivery_id'] = $details['logistics_number'][0] ?? '';
6706
+                    $data['delivery_name'] = $track['logistics'][0]['logistics_name'] ?? '';
6707
+                    $data['delivery_id'] = $track['logistics'][0]['logistics_code'] ?? '';
6705 6708
                     $data['douhuomall_status'] = $details['status'];
6706 6709
                     if ($data['douhuomall_status'] == 3 && $value['status'] < 2) {
6707 6710
 //                        Db::name('log')->insert(['data'=>'微唯宝订单信息确认收货'.$value['order_id'].json_encode($order)]);
6708 6711
                         $data['status'] = 1;
6712
+
6709 6713
                     } elseif ($data['douhuomall_status'] == 4 && ($value['status'] != 3 || $value['status'] != 4 || $value['status'] != 5)) {
6710 6714
                         //微唯宝订单状态已完成,并且平台状态不是已完成,申请退款,已退款
6711 6715
                         $data['status'] = 2;
6712 6716
                     } else {
6713 6717
                         $data['status'] = $value['status'];
6714
-                    }
6718
+                    }  
6715 6719
                     Db::name('store_order')->where('order_sn', $value['order_sn'])->update($data);
6716 6720
                     $s = [
6717 6721
                         'order_id' => $value['order_id'],
6718 6722
                         'douhuomall_order_no' => $value['douhuomall_order_no'],
6719
-                        'supply_type' => $details['supply_type'],
6723
+                        'supply_type' => $details['supply_type'] ?? 0,
6720 6724
                         'douhuomall_status' => $details['status']
6721 6725
                     ];
6722 6726
                     $this->douhuomall_order_s($value['douhuomall_order_no'], $s);
@@ -6754,9 +6758,10 @@ class StoreOrderRepository extends BaseRepository
6754 6758
 //            }
6755 6759
 //            $this -> dou_dc();
6756 6760
             Db::name('log')->insert(['data' => '微唯宝订单信息查询执行成功' . $i]);
6757
-
6761
+            echo '微唯宝订单信息查询执行成功';
6758 6762
         } catch (Exception $e) {
6759 6763
             Db::name('log')->insert(['data' => '供应链订单信息:' . $e->getFile() . ':' . $e->getLine() . '【' . $e->getMessage() . '】']);
6764
+            echo $e->getFile() . ':' . $e->getLine() . '【' . $e->getMessage() . '】';
6760 6765
         }
6761 6766
     }
6762 6767