正在显示
1 个修改的文件
包含
5 行增加
和
15 行删除
@@ -437,10 +437,8 @@ class YuyueController extends UserBaseController | @@ -437,10 +437,8 @@ class YuyueController extends UserBaseController | ||
437 | $data = Db::name('yuyue') | 437 | $data = Db::name('yuyue') |
438 | ->alias('yy') | 438 | ->alias('yy') |
439 | ->join('qnb_user u', 'u.id=yy.uid') | 439 | ->join('qnb_user u', 'u.id=yy.uid') |
440 | - ->join('order o', 'o.uid=yy.uid') | ||
441 | - ->join('goods g', 'g.id=o.gid') | ||
442 | ->where(['teach_id' => $id]) | 440 | ->where(['teach_id' => $id]) |
443 | - ->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,g.name as gname') | 441 | + ->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,u.kemu as gname') |
444 | ->order('create_time desc') | 442 | ->order('create_time desc') |
445 | ->select() | 443 | ->select() |
446 | ->toArray(); | 444 | ->toArray(); |
@@ -450,44 +448,36 @@ class YuyueController extends UserBaseController | @@ -450,44 +448,36 @@ class YuyueController extends UserBaseController | ||
450 | $data1 = Db::name('yuyue') | 448 | $data1 = Db::name('yuyue') |
451 | ->alias('yy') | 449 | ->alias('yy') |
452 | ->join('qnb_user u', 'u.id=yy.uid') | 450 | ->join('qnb_user u', 'u.id=yy.uid') |
453 | - ->join('order o', 'o.uid=yy.uid') | ||
454 | - ->join('goods g', 'g.id=o.gid') | ||
455 | ->where(['teach_id' => $id]) | 451 | ->where(['teach_id' => $id]) |
456 | ->where(['yy.status' => '1']) | 452 | ->where(['yy.status' => '1']) |
457 | - ->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,g.name as gname') | 453 | + ->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,u.kemu as gname') |
458 | ->order('create_time desc') | 454 | ->order('create_time desc') |
459 | ->select() | 455 | ->select() |
460 | ->toArray(); | 456 | ->toArray(); |
461 | $data2 = Db::name('yuyue') | 457 | $data2 = Db::name('yuyue') |
462 | ->alias('yy') | 458 | ->alias('yy') |
463 | ->join('qnb_user u', 'u.id=yy.uid') | 459 | ->join('qnb_user u', 'u.id=yy.uid') |
464 | - ->join('order o', 'o.uid=yy.uid') | ||
465 | - ->join('goods g', 'g.id=o.gid') | ||
466 | ->where(['teach_id' => $id]) | 460 | ->where(['teach_id' => $id]) |
467 | ->where(['yy.status' => '4']) | 461 | ->where(['yy.status' => '4']) |
468 | - ->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,g.name as gname') | 462 | + ->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,u.kemu as gname') |
469 | ->order('create_time desc') | 463 | ->order('create_time desc') |
470 | ->select() | 464 | ->select() |
471 | ->toArray(); | 465 | ->toArray(); |
472 | $data3 = Db::name('yuyue') | 466 | $data3 = Db::name('yuyue') |
473 | ->alias('yy') | 467 | ->alias('yy') |
474 | ->join('qnb_user u', 'u.id=yy.uid') | 468 | ->join('qnb_user u', 'u.id=yy.uid') |
475 | - ->join('order o', 'o.uid=yy.uid') | ||
476 | - ->join('goods g', 'g.id=o.gid') | ||
477 | ->where(['teach_id' => $id]) | 469 | ->where(['teach_id' => $id]) |
478 | ->where(['yy.status' => '2']) | 470 | ->where(['yy.status' => '2']) |
479 | - ->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,g.name as gname') | 471 | + ->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,u.kemu as gname') |
480 | ->order('create_time desc') | 472 | ->order('create_time desc') |
481 | ->select() | 473 | ->select() |
482 | ->toArray(); | 474 | ->toArray(); |
483 | $data4 = Db::name('yuyue') | 475 | $data4 = Db::name('yuyue') |
484 | ->alias('yy') | 476 | ->alias('yy') |
485 | ->join('qnb_user u', 'u.id=yy.uid') | 477 | ->join('qnb_user u', 'u.id=yy.uid') |
486 | - ->join('order o', 'o.uid=yy.uid') | ||
487 | - ->join('goods g', 'g.id=o.gid') | ||
488 | ->where(['teach_id' => $id]) | 478 | ->where(['teach_id' => $id]) |
489 | ->where(['yy.status' => '3']) | 479 | ->where(['yy.status' => '3']) |
490 | - ->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,g.name as gname') | 480 | + ->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,u.kemu as gname') |
491 | ->order('create_time desc') | 481 | ->order('create_time desc') |
492 | ->select() | 482 | ->select() |
493 | ->toArray(); | 483 | ->toArray(); |
-
请 注册 或 登录 后发表评论