成员交易逻辑修改-bug

app/Lib/Model/UserModel.class.php

@@ -235,7 +235,7 @@ class UserModel extends Model
                 ->where($entrust_where)
                 ->where(['userid'=>['in',array_keys($top3_uids)]])
                 ->group('userid')
-                ->order('FIELD(userid,"'.implode('","',array_keys($top3_uids)).'")')
+                ->order('FIELD(userid,"'.implode('","',array_keys($top3_uids)).'") asc,cj_time desc')
                 ->select();
             if(empty($top3_data)){
                 $top3_data = $model->table($his_table_name)
@@ -243,9 +243,17 @@ class UserModel extends Model
                     ->where($entrust_where)
                     ->where(['userid'=>['in',array_keys($top3_uids)],'cj_time'=>['gt',strtotime('today')]])
                     ->group('userid')
-                    ->order('FIELD(userid,"'.implode('","',array_keys($top3_uids)).'")')
+                    ->order('FIELD(userid,"'.implode('","',array_keys($top3_uids)).'") asc,cj_time desc')
                     ->select();
             }
+            $tmp = [];
+            foreach ($top3_data as $k=>$v){
+                if($tmp[$v['userid']]){
+                    unset($top3_data[$k]);
+                }else{
+                    $tmp[$v['userid']] = 1;
+                }
+            }
             $top3_ids = array_column($top3_data,'id');
             if(!empty($top3_ids)){
                 $entrust_where['id'] = ['not in',$top3_ids];