|
@@ -38,7 +38,7 @@ class Plantask extends Controller
|
|
|
];
|
|
|
|
|
|
$order_list = Db::name('lesson_order')->alias('order')
|
|
|
- ->field('lesson.name,lesson.name_en,user.firstname,user.lastname,user.email,user.lang,user.whatsapp')
|
|
|
+ ->field('lesson.name,lesson.name_en,user.firstname,user.lastname,user.email,user.whatsapp')
|
|
|
->join('user','order.user_id = user.id','LEFT')
|
|
|
->join('lesson','order.lesson_id = lesson.id','LEFT')
|
|
|
->where($map)->order('order.id asc')->select();
|
|
@@ -108,7 +108,7 @@ class Plantask extends Controller
|
|
|
];
|
|
|
|
|
|
$order_list = Db::name('lesson_order')->alias('order')
|
|
|
- ->field('lesson.name,lesson.name_en,user.firstname,user.lastname,user.email,user.lang,user.whatsapp')
|
|
|
+ ->field('lesson.name,lesson.name_en,user.firstname,user.lastname,user.email,user.whatsapp')
|
|
|
->join('user','order.user_id = user.id','LEFT')
|
|
|
->join('lesson','order.lesson_id = lesson.id','LEFT')
|
|
|
->where($map)->order('order.id asc')->select();
|
|
@@ -164,7 +164,7 @@ class Plantask extends Controller
|
|
|
'order.is_gift' => 0,
|
|
|
];
|
|
|
$task_list = Db::name('package_order')->alias('order')
|
|
|
- ->field('order.id,order.endtime,p.name,p.name_en,user.firstname,user.lastname,user.email,user.lang,user.whatsapp')
|
|
|
+ ->field('order.id,order.endtime,p.name,p.name_en,user.firstname,user.lastname,user.email,user.whatsapp')
|
|
|
->join('lesson_package p','order.package_id = p.id','LEFT')
|
|
|
->join('user','order.user_id = user.id','LEFT')
|
|
|
->where($map)->order('order.paytime asc')->limit(1)->select();
|
|
@@ -225,7 +225,7 @@ class Plantask extends Controller
|
|
|
];
|
|
|
|
|
|
$task_list = Db::name('package_order')->alias('order')
|
|
|
- ->field('order.id,order.endtime,p.name,p.name_en,user.firstname,user.lastname,user.email,user.lang,user.whatsapp')
|
|
|
+ ->field('order.id,order.endtime,p.name,p.name_en,user.firstname,user.lastname,user.email,user.whatsapp')
|
|
|
->join('lesson_package p','order.package_id = p.id','LEFT')
|
|
|
->join('user','order.user_id = user.id','LEFT')
|
|
|
->where($map)->order('endtime asc')->limit(1)->select();
|
|
@@ -284,7 +284,7 @@ class Plantask extends Controller
|
|
|
];
|
|
|
|
|
|
$task_list = Db::name('package_order')->alias('order')
|
|
|
- ->field('order.id,order.endtime,p.name,p.name_en,user.firstname,user.lastname,user.email,user.lang,user.whatsapp')
|
|
|
+ ->field('order.id,order.endtime,p.name,p.name_en,user.firstname,user.lastname,user.email,user.whatsapp')
|
|
|
->join('lesson_package p','order.package_id = p.id','LEFT')
|
|
|
->join('user','order.user_id = user.id','LEFT')
|
|
|
->where($map)->order('endtime asc')->limit(5)->select();
|
|
@@ -342,7 +342,7 @@ class Plantask extends Controller
|
|
|
];
|
|
|
|
|
|
$task_list = Db::name('package_order')->alias('order')
|
|
|
- ->field('order.id,order.endtime,p.name,p.name_en,user.firstname,user.lastname,user.email,user.lang,user.whatsapp')
|
|
|
+ ->field('order.id,order.endtime,p.name,p.name_en,user.firstname,user.lastname,user.email,user.whatsapp')
|
|
|
->join('lesson_package p','order.package_id = p.id','LEFT')
|
|
|
->join('user','order.user_id = user.id','LEFT')
|
|
|
->where($map)->order('endtime asc')->limit(5)->select();
|