diff --git a/admin/controllers/receiver/orderv2/Orders.php b/admin/controllers/receiver/orderv2/Orders.php index 4fb474e7..b74f00bc 100644 --- a/admin/controllers/receiver/orderv2/Orders.php +++ b/admin/controllers/receiver/orderv2/Orders.php @@ -606,7 +606,7 @@ class Orders extends HD_Controller ]; $logs = $this->order_oplogs_model->select($where,'id desc',1,30,'uname,log,c_time'); $row['is_admin'] = $this->role==SUPER_ADMIN ? true : false; - $row['is_admin'] = true; // 2023-06-19 开放 + # $row['is_admin'] = true; // 2023-06-19 开放 $info = $row; $this->data['info'] = $info; @@ -1379,12 +1379,17 @@ class Orders extends HD_Controller if (!$money || !$row || !$wx_mchid) { return $this->show_json(SYS_CODE_FAIL, '参数错误'); } + $company_id = 0; $notify = true; # 0614 防止修改唯一已支付记录时,重发订单通知 if($order_row["id"]){ //修改订单更新旧订单为无效订单 $this->app_liche_orders_model->update(['status'=>-1],['id'=>$order_row['id']]); if ($order_row['pay_price'] >= 100 || $order_row['descrip']==1 && $order_row['descrip']=='零首付'){ $notify = false; } + # 修改时此3项保持一致 + $company_id = $order_row['company_id']; + $pay_time = $order_row['pay_time']; + $type = $order_row['type']; } $p_row = $this->app_liche_orders_model->get(['pid'=>0,'o_id'=>$row['id']]); $last_p_row = $this->app_liche_orders_model->get(['o_id'=>$row['id'],'type'=>3,'pid'=>$p_row['id'],'status>='=>0]); //尾款父订单 @@ -1426,6 +1431,7 @@ class Orders extends HD_Controller 'v_id' => $row['v_id'], 'cor_id' => $row['cor_id'], 'incor_id' => $row['incor_id'], + 'company_id' => $company_id, 'total_price' => $money, 'pay_price' => $money, 'type' => $type,