|
@@ -230,29 +230,23 @@ class OrderService
|
|
|
public static function promotionsUsers(mixed $pid, mixed $name,mixed $miniprogram_id, mixed $limit = 10)
|
|
|
{
|
|
|
if ($pid > 0) {
|
|
|
- $list = DB::table('users')->where('pid', $pid)->select('id as user_id', 'username as name');
|
|
|
+ $list = DB::table('users')->where('pid', $pid)->select('users.id as user_id', 'users.username as name');
|
|
|
if ($name) {
|
|
|
$list->where('username', 'like', "%" . $name . "%");
|
|
|
}
|
|
|
if ($miniprogram_id > 0){
|
|
|
- $list->whereExists(function ($query)use($miniprogram_id){
|
|
|
- $query->select(DB::raw(1))->form('user_has_miniprograms')
|
|
|
- ->whereRaw('user_has_miniprograms.uid','users.id')
|
|
|
- ->where('user_has_miniprograms.miniprogram_id',$miniprogram_id);
|
|
|
- });
|
|
|
+ $list->join('user_has_miniprograms','user_has_miniprograms.uid','users.id')
|
|
|
+ ->where('user_has_miniprograms.miniprogram_id',$miniprogram_id);
|
|
|
}
|
|
|
|
|
|
- return $list->orderBy('id', 'desc')->limit($limit)->get();
|
|
|
+ return $list->orderBy('users.id', 'desc')->limit($limit)->get();
|
|
|
}
|
|
|
|
|
|
$list = DB::table('users')->join('user_has_roles','users.id',"user_has_roles.user_id")->join('roles','roles.id','user_has_roles.role_id')
|
|
|
->select('users.id as user_id', 'users.username as name')->where('roles.identify','optimizer');
|
|
|
if ($miniprogram_id > 0){
|
|
|
- $list->whereExists(function ($query)use($miniprogram_id){
|
|
|
- $query->select(DB::raw(1))->form('user_has_miniprograms')
|
|
|
- ->whereRaw('user_has_miniprograms.uid','users.id')
|
|
|
- ->where('user_has_miniprograms.miniprogram_id',$miniprogram_id);
|
|
|
- });
|
|
|
+ $list->join('user_has_miniprograms','user_has_miniprograms.uid','users.id')
|
|
|
+ ->where('user_has_miniprograms.miniprogram_id',$miniprogram_id);
|
|
|
}
|
|
|
if ($name){
|
|
|
$list->where('users.username', 'like', "%" . $name . "%");
|