|
@@ -245,7 +245,7 @@ class Plantask extends Controller
|
|
|
];
|
|
|
|
|
|
$task_list = Db::name('package_order')->alias('order')
|
|
|
- ->field('order.id,order.endtime,p.name,p.name_en,p.remain,user.firstname,user.lastname,user.email,user.whatsapp')
|
|
|
+ ->field('order.id,order.endtime,p.name,p.name_en,order.remain,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(2)->select();
|
|
@@ -312,7 +312,7 @@ class Plantask extends Controller
|
|
|
];
|
|
|
|
|
|
$task_list = Db::name('package_order')->alias('order')
|
|
|
- ->field('order.id,order.endtime,p.name,p.name_en,p.remain,user.firstname,user.lastname,user.email,user.whatsapp')
|
|
|
+ ->field('order.id,order.endtime,p.name,p.name_en,order.remain,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(2)->select();
|
|
@@ -378,7 +378,7 @@ class Plantask extends Controller
|
|
|
];
|
|
|
|
|
|
$task_list = Db::name('package_order')->alias('order')
|
|
|
- ->field('order.id,order.endtime,p.name,p.name_en,p.remain,user.firstname,user.lastname,user.email,user.whatsapp')
|
|
|
+ ->field('order.id,order.endtime,p.name,p.name_en,order.remain,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(2)->select();
|
|
@@ -443,7 +443,7 @@ class Plantask extends Controller
|
|
|
$week = date('w');
|
|
|
|
|
|
if($week != 1){
|
|
|
- exit;
|
|
|
+ //exit;
|
|
|
}
|
|
|
|
|
|
//先查找 下周有没有数据
|