Revert "bug修改"

This reverts commit 63b64dfb18.

application/adminapi/controller/User.php

@@ -470,15 +470,13 @@ class User extends adminApi
             $reslut = DB::name('user')->where('id', $user_id)->update($up_user);
         }
         if($up_user_data){
-            if(!empty($user['mobile'])){
-                $user_auth = DB::name('user_auth')->where('mobile', $user['mobile'])->find();
-                if($user_auth){
-                    $res = DB::name('user_auth')->where('mobile', $user['mobile'])->update($up_user_data);
-                }else{
-                    $up_user_data['mobile'] =  $user['mobile'];
-                    if($real_name && $card_id){
-                        $res = DB::name('user_auth')->insert($up_user_data);
-                    }
+            $user_auth = DB::name('user_auth')->where('mobile', $user['mobile'])->find();
+            if($user_auth){
+                $res = DB::name('user_auth')->where('mobile', $user['mobile'])->update($up_user_data);
+            }else{
+                $up_user_data['mobile'] =  $user['mobile'];
+                if($real_name && $card_id){
+                    $res = DB::name('user_auth')->insert($up_user_data);
                 }
             }
         }

application/api/model/BlindBoxTurntableGiftDrawWorldNew.php

@@ -1316,9 +1316,9 @@ class BlindBoxTurntableGiftDrawWorldNew extends Model
     private function selectGiftFromAvailable(array &$available_gifts, $user_id = 0)
     {
         // 添加针对特定用户和礼物的概率调整逻辑
-//        $adjusted_gifts = $this->adjustGiftProbabilities($available_gifts, $user_id);
+        $adjusted_gifts = $this->adjustGiftProbabilities($available_gifts, $user_id);
 
-        $remaining = array_sum(array_column($available_gifts, 'remaining_number'));
+        $remaining = array_sum(array_column($adjusted_gifts, 'remaining_number'));
         if ($remaining <= 0) {
             return null;
         }
@@ -1330,7 +1330,7 @@ class BlindBoxTurntableGiftDrawWorldNew extends Model
             $rand_value = mt_rand(1, $remaining);
             $current_sum = 0;
 
-            foreach ($available_gifts as $gift) {
+            foreach ($adjusted_gifts as $gift) {
                 if ($gift['remaining_number'] <= 0) {
                     continue;
                 }

application/api/model/Gift.php

@@ -68,7 +68,7 @@ class Gift extends Model
 //        if($room_id){
 //            $is_open_blind_box_turntable = Db::name('vs_room')->where(['id'=>$room_id])->value('is_open_blind_box_turntable');
 //        }
-        $list = $this->field('gid as gift_id,gift_name,base_image,gift_price,icon')->where($map)->where($where)->order('sort desc, gift_price asc')->select();
+        $list = $this->field('gid as gift_id,gift_name,base_image,gift_price,icon')->where($map)->where($where)->order('sort asc, gift_price asc')->select();
         if($label==2){
             $list_data = [];
             foreach ($list as &$v) {
@@ -104,9 +104,9 @@ class Gift extends Model
                     }
                 }
             }
-//            usort($list_data, function($a, $b) {
-//                return $a['gift_id'] <=> $b['gift_id'];
-//            });
+            usort($list_data, function($a, $b) {
+                return $a['gift_id'] <=> $b['gift_id'];
+            });
             $list = $list_data;
         }
 

application/guildadmin/controller/Room.php

@@ -323,8 +323,6 @@ class Room extends GuildAdmin
         $page = input('page', 1);
         $page_limit = input('page_limit', 10);
         $type = input('type', 1);//1:全部流水 2:日流水 3:周流水 4:月流水
-        $stime = input('stime', '');
-        $etime = input('etime', '');
         if($room_id == ''){
             return V(0,"参数错误");
         }
@@ -350,18 +348,6 @@ class Room extends GuildAdmin
             $end_time  = time();
             $where['a.createtime'] = ['between', [$begin_time, $end_time]];
         }
-        if($stime != '' && $etime != ''){
-            $begin_time = strtotime($stime);
-            $end_time  = strtotime($etime);
-            $where['a.createtime'] = ['between', [$begin_time, $end_time]];
-        }elseif($stime != '' && $etime == ''){
-            $begin_time = strtotime($stime);
-            $end_time  = time();
-            $where['a.createtime'] = ['between', [$begin_time, $end_time]];
-        }elseif($etime != '' && $stime == ''){
-            $end_time  = strtotime($etime);
-            $where['a.createtime'] = ['<=', $etime];
-        }
         $count = db::name('vs_give_gift')->alias('a')
             ->field('a.id')
             ->join('user b', 'a.user_id = b.id', 'left')
@@ -391,8 +377,6 @@ class Room extends GuildAdmin
 
             }
         }
-        //幸运流水总计
-        $total_lucky_coin = db::name('vs_room_luck_value')->alias('a')->where('room_id',$room_id)->where($where)->sum('luck_value');
         $return_data = [
             'page' =>$page,
             'page_limit' => $page_limit,
@@ -403,8 +387,7 @@ class Room extends GuildAdmin
                     ->join('user b', 'a.user_id = b.id', 'left')
                     ->where('a.from',2)
                     ->where('a.from_id',$room_id)
-                    ->where($where)->sum('total_price'),
-                'total_lucky_coin' => $total_lucky_coin,
+                    ->where($where)->sum('total_price')
             ]
         ];
         return V(1,"成功", $return_data);