|
|
@@ -547,7 +547,7 @@ class OrderService
|
|
|
$insert_params = $this->getParamsByOrderHeader($orderHeaders,$owners_code_map,$logistics_code_map,$shop_name_map,$warehouses_code_map);
|
|
|
$update_params = $this->getUpdateParams($orderHeaders,$owners_code_map,$logistics_code_map,$shop_name_map,$warehouses_code_map);
|
|
|
if(count($insert_params)> 0){
|
|
|
- $this->create($insert_params);
|
|
|
+ $this->insert($insert_params);
|
|
|
}
|
|
|
if(count($update_params)>1){
|
|
|
$this->batchUpdate($update_params);
|
|
|
@@ -566,6 +566,7 @@ class OrderService
|
|
|
foreach ($orders as $order) {
|
|
|
$order_code_map[$order->code]= $order;
|
|
|
}
|
|
|
+ $date = Carbon::now()->format('Y-m-d H:i:s');
|
|
|
foreach ($orderHeaders_map as $orderHeader) {
|
|
|
if($order_code_map[$orderHeader->orderno] ?? false)continue;
|
|
|
$owner = $owners_code_map[$orderHeader->customerid] ?? null;
|
|
|
@@ -578,6 +579,7 @@ class OrderService
|
|
|
'owner_id' => $owner->id ?? null,
|
|
|
'wms_status' => $orderHeader->oracleBASCode ? $orderHeader->oracleBASCode->codename_c : null,
|
|
|
'created_at' => $orderHeader->addtime,
|
|
|
+ 'updated_at' =>$date,
|
|
|
'logistic_id' => $logistic->id ?? null,
|
|
|
'shop_id' => $shop->id ?? null,
|
|
|
'consignee_name' => $orderHeader->c_contact,
|
ajun