郭文星 / wyc.tenyes.cn · 提交

转到一个项目

作者 郭文星
提交 e76f5f53847b0441667b5518cafa5dc17260aa04 1 个父辈 e9ea7853

1231231

内嵌 并排对比
正在显示 3 个修改的文件 包含 9 行增加 和 0 行删除
@@ -295,6 +295,9 @@ class Api extends Controller @@ -295,6 +295,9 @@ class Api extends Controller
295 { 295 {
296 $order=Db::name("order")->find($order_id); 296 $order=Db::name("order")->find($order_id);
297 if($order['driver_id']){ 297 if($order['driver_id']){
  298 + $order['start']=$order['starting_point'];
  299 + $order['to']=$order['end_point'];
  300 + $order['timeStr']=$order['reservation_time'];
298 $driver=Db::name("driver")->find($order['driver_id']); 301 $driver=Db::name("driver")->find($order['driver_id']);
299 $car=Db::name("car")->where("driver_id",$driver['id'])->find(); 302 $car=Db::name("car")->where("driver_id",$driver['id'])->find();
300 $user=Db::name("user")->find($driver['user_id']); 303 $user=Db::name("user")->find($driver['user_id']);
@@ -240,6 +240,9 @@ if (!function_exists('senWxmsgToDriverUser')) { @@ -240,6 +240,9 @@ if (!function_exists('senWxmsgToDriverUser')) {
240 { 240 {
241 $order=Db::name("order")->find($order_id); 241 $order=Db::name("order")->find($order_id);
242 if($order['driver_id']){ 242 if($order['driver_id']){
  243 + $order['start']=$order['starting_point'];
  244 + $order['to']=$order['end_point'];
  245 + $order['timeStr']=$order['reservation_time'];
243 $user=Db::name("user")->find($order['user_id']); 246 $user=Db::name("user")->find($order['user_id']);
244 $driver=Db::name("driver")->find($order['driver_id']); 247 $driver=Db::name("driver")->find($order['driver_id']);
245 $car=Db::name("car")->where("driver_id",$driver['id'])->find(); 248 $car=Db::name("car")->where("driver_id",$driver['id'])->find();
@@ -96,6 +96,9 @@ class Index extends Api @@ -96,6 +96,9 @@ class Index extends Api
96 { 96 {
97 $order=Db::name("order")->find($order_id); 97 $order=Db::name("order")->find($order_id);
98 if($order['user_id']){ 98 if($order['user_id']){
  99 + $order['start']=$order['starting_point'];
  100 + $order['to']=$order['end_point'];
  101 + $order['timeStr']=$order['reservation_time'];
99 $user=Db::name("user")->find($order['user_id']); 102 $user=Db::name("user")->find($order['user_id']);
100 $wct_user=Db::name("wct_user")->where("unionid",$user['unionid'])->find(); 103 $wct_user=Db::name("wct_user")->where("unionid",$user['unionid'])->find();
101 $wxopenid=$wct_user['wx_openid']; 104 $wxopenid=$wct_user['wx_openid'];