|
@@ -178,8 +178,8 @@ class OrderImport extends Base
|
|
|
'price',
|
|
|
'num',
|
|
|
'before_discount_all_price',
|
|
|
- 'activity_id',
|
|
|
- 'activity_name',
|
|
|
+ 'activity_id' => 0,
|
|
|
+ 'activity_name' => '',
|
|
|
'mode',
|
|
|
'order_remark',
|
|
|
'contactor',
|
|
@@ -261,7 +261,7 @@ class OrderImport extends Base
|
|
|
|
|
|
Db::rollback();
|
|
|
|
|
|
- return error_show(1004, $exception->getMessage().'|'.$exception->getFile().'|'.$exception->getLine());
|
|
|
+ return error_show(1004, $exception->getMessage() . '|' . $exception->getFile() . '|' . $exception->getLine());
|
|
|
}
|
|
|
|
|
|
}
|