YUSHENG/yusheng-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
赵钊
2025-12-29 18:52:44 +08:00
parent 705018e3e8 a17697056a
commit 0b8655e5d2
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
application/api/controller/Xxiaoshi.php
View File

@@ -31,9 +31,8 @@ class Xxiaoshi extends Controller
//测试数据 //测试数据
public function testData() public function testData()
{ {
$res = db::name('vs_user_gift_pack_log')->alias('a') $res = db::name('vs_user_gift_pack')
->join('user b','a.user_id = b.id') ->field('gid,after_num')
->field('a.gid,b.nickname,a.user_id,a.gid,a.after_num')
->where(['a.updatetime'=> ['<=', 1766332800]]) ->where(['a.updatetime'=> ['<=', 1766332800]])
->group('a.gid') ->group('a.gid')
->select(); ->select();

4
application/api/model/Sign.php
View File

@@ -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(); 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(); $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]; 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){ if($max_sign_user){
$before_sign_user = null; $before_sign_user = null;
$is_sign = null; $is_sign = null;