王晓刚 / market · 提交

转到一个项目

作者 耿培杰
提交 e8932d61109e21d31b2835d58c8eaa8c5ee91343 1 个父辈 2d35f37b

修改创建订单配送日期

内嵌 并排对比
正在显示 1 个修改的文件 包含 6 行增加 和 6 行删除
@@ -387,8 +387,8 @@ class Order extends Api @@ -387,8 +387,8 @@ class Order extends Api
387 'present_id' => !empty($param['present_id']) ? $param['present_id'] : '', 387 'present_id' => !empty($param['present_id']) ? $param['present_id'] : '',
388 'postage_total' => $postage, 388 'postage_total' => $postage,
389 'postage_type' => $param['postage_type'], 389 'postage_type' => $param['postage_type'],
390 - 'postage_date' => !empty($data['postage_date']) ? $data['postage_date'] : '',  
391 - 'postage_time' => !empty($data['postage_time']) ? $data['postage_time'] : '', 390 + 'postage_date' => !empty($param['postage_date']) ? $param['postage_date'] : '',
  391 + 'postage_time' => !empty($param['postage_time']) ? $param['postage_time'] : '',
392 'user_ticket_id' => !empty($data['user_ticket_id']) ? $data['user_ticket_id'] : '', 392 'user_ticket_id' => !empty($data['user_ticket_id']) ? $data['user_ticket_id'] : '',
393 'ticket_price' => !empty($data['ticket_discount_price']) ? $data['ticket_discount_price'] : '', 393 'ticket_price' => !empty($data['ticket_discount_price']) ? $data['ticket_discount_price'] : '',
394 'ticketcode_id' => !empty($data['ticketcode_id']) ? $data['ticketcode_id'] : '', 394 'ticketcode_id' => !empty($data['ticketcode_id']) ? $data['ticketcode_id'] : '',
@@ -769,8 +769,8 @@ class Order extends Api @@ -769,8 +769,8 @@ class Order extends Api
769 'present_id' => !empty($param['present_id']) ? $param['present_id'] : '', 769 'present_id' => !empty($param['present_id']) ? $param['present_id'] : '',
770 'postage_total' => $postage, 770 'postage_total' => $postage,
771 'postage_type' => $param['postage_type'], 771 'postage_type' => $param['postage_type'],
772 - 'postage_date' => !empty($data['postage_date']) ? $data['postage_date'] : '',  
773 - 'postage_time' => !empty($data['postage_time']) ? $data['postage_time'] : '', 772 + 'postage_date' => !empty($param['postage_date']) ? $param['postage_date'] : '',
  773 + 'postage_time' => !empty($param['postage_time']) ? $param['postage_time'] : '',
774 'user_ticket_id' => !empty($data['user_ticket_id']) ? $data['user_ticket_id'] : '', 774 'user_ticket_id' => !empty($data['user_ticket_id']) ? $data['user_ticket_id'] : '',
775 'ticket_price' => !empty($data['ticket_discount_price']) ? $data['ticket_discount_price'] : '', 775 'ticket_price' => !empty($data['ticket_discount_price']) ? $data['ticket_discount_price'] : '',
776 'ticketcode_id' => !empty($data['ticketcode_id']) ? $data['ticketcode_id'] : '', 776 'ticketcode_id' => !empty($data['ticketcode_id']) ? $data['ticketcode_id'] : '',
@@ -1081,8 +1081,8 @@ class Order extends Api @@ -1081,8 +1081,8 @@ class Order extends Api
1081 'team_group_status' => 1, 1081 'team_group_status' => 1,
1082 'postage_total' => $postage, 1082 'postage_total' => $postage,
1083 'postage_type' => $param['postage_type'], 1083 'postage_type' => $param['postage_type'],
1084 - 'postage_date' => !empty($data['postage_date']) ? $data['postage_date'] : '',  
1085 - 'postage_time' => !empty($data['postage_time']) ? $data['postage_time'] : '', 1084 + 'postage_date' => !empty($param['postage_date']) ? $param['postage_date'] : '',
  1085 + 'postage_time' => !empty($param['postage_time']) ? $param['postage_time'] : '',
1086 'user_ticket_id' => !empty($data['user_ticket_id']) ? $data['user_ticket_id'] : '', 1086 'user_ticket_id' => !empty($data['user_ticket_id']) ? $data['user_ticket_id'] : '',
1087 'ticket_price' => !empty($data['ticket_discount_price']) ? $data['ticket_discount_price'] : '', 1087 'ticket_price' => !empty($data['ticket_discount_price']) ? $data['ticket_discount_price'] : '',
1088 'ticketcode_id' => !empty($data['ticketcode_id']) ? $data['ticketcode_id'] : '', 1088 'ticketcode_id' => !empty($data['ticketcode_id']) ? $data['ticketcode_id'] : '',