From 793804fe45710733e63fa78a02192e9f3b0b215e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Mon, 29 Dec 2025 16:52:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E6=B8=85=E9=99=A4=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E7=9A=84=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Xxiaoshi.php | 5 ++---
 application/api/model/Sign.php          | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

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..82ea1199 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])->order('sign_value desc,id asc')->find();
         if($max_sign_user){
             $before_sign_user = null;
             $is_sign = null;

From a17697056ac03a1339c46f9d251be2f8026bd691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Mon, 29 Dec 2025 17:04:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=AD=BE=E7=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Sign.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/api/model/Sign.php b/application/api/model/Sign.php
index 82ea1199..03427473 100644
--- a/application/api/model/Sign.php
+++ b/application/api/model/Sign.php
@@ -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,id asc')->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;