YUYIN/yuyin-php
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
赵钊
2025-11-24 09:38:06 +08:00
parent 42500b0363 b8778058dc
commit 7722f9735b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/api/model/Box.php
View File

@@ -216,7 +216,7 @@ class Box extends Model
$map[] = ['tid', '=', $tid];
$is_box_config = db('box_config')->where($map)->select();
if(!$is_box_config){
return ['code' => 201, 'msg' => '奖池数量不足', 'data' => null];
return ['code' => 201, 'msg' => '奖池数量不足!', 'data' => null];
}
//获取宝箱类型配置信息
@@ -316,7 +316,7 @@ class Box extends Model
for ($i = 0; $i < $need_open_num; $i++) {
$gift_data = $redis->blpop($keyname, 2); //1s 超时
if (empty($gift_data)) {
return ['code' => 201, 'msg' => '奖池数量不足', 'data' => null];
return ['code' => 201, 'msg' => '奖池数量不足!!', 'data' => null];
} else {
//获取是否有待核销必中
$gift_data_data = explode('-', $gift_data[1]);
@@ -369,7 +369,7 @@ class Box extends Model
$gift_data = $redis->blpop($keyname, 2); //1s 超时
if (empty($gift_data)) {
$this->redis_gift_data_rollback($redis, $keyname, $user_gift_id_redis_list);
return ['code' => 201, 'msg' => '奖池数量不足', 'data' => null];
return ['code' => 201, 'msg' => '奖池数量不足!!!', 'data' => null];
}
$gift_data_data = explode('-', $gift_data[1]);
@@ -387,7 +387,7 @@ class Box extends Model
if (count($user_gift_id_list) != $open_num) {
$this->redis_gift_data_rollback($redis, $keyname, $user_gift_id_redis_list);
return ['code' => 201, 'msg' => '奖池数量不足', 'data' => null];
return ['code' => 201, 'msg' => '奖池数量不足.', 'data' => null];
}
//取出所有礼物数据

2
application/api/model/UserLogin.php
View File

@@ -209,7 +209,7 @@ class UserLogin extends Model
if (empty($uid)) {
$uid = db::name('user')->order('uid desc')->value('uid');
if(empty($uid)){
$uid = 300001;
$uid = 310001;
}
}
$uid = $uid + mt_rand(1, 10);