成员交易逻辑修改-bug

app/Lib/Model/UserModel.class.php

@@ -183,12 +183,17 @@ class UserModel extends Model
      */
     public function getGroupEntrustList($gInfo,$top = 0,$p = 1,$pageSize = 5)
     {
-        $is_xlq = $gInfo['category'] == 1 ? 1 : 0;
         $gId = $gInfo['group_id'];
-        #是否归档
-        $group = D('Group')->getGroup($gId);
+        $is_xlq = $gInfo['category'] == 1 ? 1 : 0;
+        $getModel = function ($is_xlq,$gInfo){
+            if($is_xlq == 1){
+                return M()->db(1,C('DB_CONFIG_SYN'));
+            }else{
+                return M()->db(2,getModel($gInfo['web_id']));
+            }
+        };
+        $model = $getModel($is_xlq,$gInfo);
         if($is_xlq == 1){
-            $model = M()->db(1,C('DB_CONFIG_SYN'));
             $uinfo_table_name = 'syn_userinfo';
             $table_name = 'syn_entrust';
             $his_table_name = 'syn_hisentrust';
@@ -202,13 +207,12 @@ class UserModel extends Model
             ];
         }else{
             $suffix = D('Userinfo')->getTable($gId);
-            $model = M()->db(2,getModel($group['web_id']));
             $uinfo_table_name = $suffix ? 'mncg_archive.userinfo' . $suffix : 'mncg.userinfo';
             $table_name = 'entrust';
             $his_table_name = $suffix ? 'mncg_archive.hisentrust' . $suffix : 'hisentrust';
 
             $uinfo_where = [
-                'zt' => 1, 'sex' => $group['teamid']
+                'zt' => 1, 'sex' => $gInfo['teamid']
             ];
             $entrust_where = [
                 'bz' => $gId,
@@ -241,7 +245,7 @@ class UserModel extends Model
                 $top3_data = $model->table($his_table_name)
                     ->field('*,cj_time sort_time')
                     ->where($entrust_where)
-                    ->where(['userid'=>['in',array_keys($top3_uids)],'cj_time'=>['gt',strtotime('today')]])
+                    ->where(['userid'=>['in',array_keys($top3_uids)],'cj_time'=>['gt',date('Y-m-d H:i:s',strtotime('today'))]])
                     ->group('userid')
                     ->order('FIELD(userid,"'.implode('","',array_keys($top3_uids)).'") asc,cj_time desc')
                     ->select();