diff --git a/application/api/controller/Xxiaoshi.php b/application/api/controller/Xxiaoshi.php index 334479cf..7ee178a2 100644 --- a/application/api/controller/Xxiaoshi.php +++ b/application/api/controller/Xxiaoshi.php @@ -31,9 +31,8 @@ class Xxiaoshi extends Controller //测试数据 public function testData() { - $res = db::name('vs_user_gift_pack_log')->alias('a') - ->join('user b','a.user_id = b.id') - ->field('a.gid,b.nickname,a.user_id,a.gid,a.after_num') + $res = db::name('vs_user_gift_pack') + ->field('gid,after_num') ->where(['a.updatetime'=> ['<=', 1766332800]]) ->group('a.gid') ->select(); diff --git a/application/api/model/Sign.php b/application/api/model/Sign.php index c89ce5ef..03427473 100644 --- a/application/api/model/Sign.php +++ b/application/api/model/Sign.php @@ -125,7 +125,7 @@ class Sign extends Model db::name('vs_room')->where(['id' => $room_id])->inc('hot_value', $gift_totalaa)->inc('today_hot_value', $gift_totalaa)->update(); //获取出价最高用户 - $sign_user = db::name('vs_user_sign_auction')->where(['room_id' => $room_id,'sign_time' => $sign_time,'type' => 0])->order('sign_value desc')->field('id,user_id,sign_value')->find(); + $sign_user = db::name('vs_user_sign_auction')->where(['room_id' => $room_id,'sign_time' => $sign_time,'type' => 0])->order('sign_value desc,id asc')->field('id,user_id,sign_value')->find(); //其他的出价退回到用户的钱包 $refund = db::name('vs_user_sign_auction')->where(['room_id' => $room_id,'sign_time' => $sign_time,'type' => 0])->select(); @@ -193,7 +193,7 @@ class Sign extends Model return ['code' => 0, 'msg' => '该场次签约已结束', 'data' => null]; } //获取签约出价最高的 - $max_sign_user = db::name('vs_user_sign_auction')->where(['room_id' => $room_id,'sign_time' => $sign_time])->order('sign_value desc')->find(); + $max_sign_user = db::name('vs_user_sign_auction')->where(['room_id' => $room_id,'sign_time' => $sign_time,'type' => 0])->order('sign_value desc,id asc')->find(); if($max_sign_user){ $before_sign_user = null; $is_sign = null;