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

bug修改

Browse Source
This commit is contained in:
赵钊
2026-01-17 14:32:43 +08:00
parent 373a8ecedd
commit b570510602
5 changed files with 46 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
application/api/model/BlindBoxTurntableGiftDrawWorldNew.php
View File

@@ -248,18 +248,18 @@ class BlindBoxTurntableGiftDrawWorldNew extends Model
//防止过高爆率，检查本期用户概率
//当前用户在本期的(补偿 防止漏洞 超过预期 把盘拉平)
//总抽奖金额（支出）
$total_money = db::name('vs_gift_bag_receive_log')->where(['gift_bag_id' => $gift_bag_id,'user_id' => $user_id,'periods'=>$periods])->sum('bag_price');
//总礼物价值（收入）
$total_gift_money = db::name('vs_gift_bag_receive_log')->where(['gift_bag_id' => $gift_bag_id,'user_id' => $user_id,'periods'=>$periods])->sum('gift_price');
if($total_money>0 && $total_gift_money>0){
$ratio =round(($total_gift_money / $total_money),3) ?? 0;
if($ratio > 1.03){
$gift_bag_detail_duo = db::name("vs_gift_bag_detail")->where([ 'gift_bag_id' => $gift_bag_id,'remaining_number' => ['>',0]])->order('remaining_number', 'desc')->find();
if($gift_bag_detail_duo){
$gift = $giftInfoMap[$gift_bag_detail_duo['foreign_id']]??[];
}
}
}
// $total_money = db::name('vs_gift_bag_receive_log')->where(['gift_bag_id' => $gift_bag_id,'user_id' => $user_id,'periods'=>$periods])->sum('bag_price');
// //总礼物价值（收入）
// $total_gift_money = db::name('vs_gift_bag_receive_log')->where(['gift_bag_id' => $gift_bag_id,'user_id' => $user_id,'periods'=>$periods])->sum('gift_price');
// if($total_money>0 && $total_gift_money>0){
// $ratio =round(($total_gift_money / $total_money),3) ?? 0;
// if($ratio > 1.03){
// $gift_bag_detail_duo = db::name("vs_gift_bag_detail")->where([ 'gift_bag_id' => $gift_bag_id,'remaining_number' => ['>',0]])->order('remaining_number', 'desc')->find();
// if($gift_bag_detail_duo){
// $gift = $giftInfoMap[$gift_bag_detail_duo['foreign_id']]??[];
// }
// }
// }
$precomputedResults[] = [
'gift_user_id' => $giftUserId,

22
application/api/model/GiveGiftBases.php
View File

@@ -22,7 +22,7 @@ class GiveGiftBases extends Model
* 获取送礼记录
*/
public function getGiftRecords($params)
public function getGiftRecords($params,$ext_params=[])
{
// $params = $this->request->param();
@@ -53,13 +53,21 @@ class GiveGiftBases extends Model
}
// 时间范围
if (!empty($params['start_time'])) {
$options['start_time'] = strtotime($params['start_time']);
if (!empty($ext_params)) {
if (!empty($ext_params['start_time'])) {
$options['start_time'] = $ext_params['start_time'];
}
if (!empty($ext_params['end_time'])) {
$options['end_time'] = $ext_params['end_time'];
}
}else{
if (!empty($params['start_time'])) {
$options['start_time'] = strtotime($params['start_time']);
}
if (!empty($params['end_time'])) {
$options['end_time'] = strtotime($params['end_time'] . ' 23:59:59');
}
}
if (!empty($params['end_time'])) {
$options['end_time'] = strtotime($params['end_time'] . ' 23:59:59');
}
// 分页参数
$options['page'] = $params['page'] ?? 1;

17
application/api/model/Guild.php
View File

@@ -439,6 +439,11 @@ class Guild extends Model
}
//减少公会人数
db::name('vs_guild')->where('id', $guild_info['id'])->setDec('num');
if($guild_info['id']<=95){
$guild_id = "g".$guild_info['id'];
}else{
$guild_id = $guild_info['id'];
}
model('api/Tencent')->delete_group_member('g'.$guild_id, $uid);
//付费退出费用给公会长
@@ -551,7 +556,12 @@ class Guild extends Model
}
//减少公会人数
db::name('vs_guild')->where('id', $apply_info['guild_id'])->setDec('num');
model('api/Tencent')->delete_group_member('g'.$apply_info['guild_id'], $apply_info['user_id']);
if($apply_info['guild_id']['id']<=95){
$guild_id = "g".$apply_info['guild_id']['id'];
}else{
$guild_id = $apply_info['guild_id']['id'];
}
model('api/Tencent')->delete_group_member('g'.$guild_id, $apply_info['user_id']);
} else {
$update_data = [];
$update_data['status'] = 2;
@@ -584,6 +594,11 @@ class Guild extends Model
//解散公会
db::name('vs_guild')->where('id',$guild_id)->update(['delete_time'=>time(),'status'=>2]);
//解散群
if($guild_id<=95){
$guild_id = "g".$guild_id;
}else{
$guild_id = $guild_id;
}
model('api/Tencent')->delete_group('g'.$guild_id);
Db::commit();
return ['code' => 1, 'msg' => '解散成功!', 'data' => null];

3
application/api/model/Invited.php
View File

@@ -69,9 +69,8 @@ class Invited extends Model
$invited_draw_conf = get_system_config_value('invited_draw');//分成比例
$invited_draw = $invited_draw_conf / 100;
$invited_draw_money = $money * $invited_draw;
$invited_draw_money = $invited_draw_money / intval(get_system_config_value('rmb_coin_ratio')); //金币换算成钻石
//增加余额并记录日志
$wallet_update = model('api/UserWallet')->change_user_cion_log($invited_user_id,$invited_draw_money,0,6,'邀请用户充值返利');
$wallet_update = model('api/UserWallet')->change_user_earnings_log($invited_user_id,$invited_draw_money,0,6,'邀请用户充值返利');
if(!$wallet_update){
return ['code' => 0, 'msg' => "邀请给上级返利失败", 'data' => null];
}

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

@@ -655,10 +655,10 @@ class UserData extends Model
{
$data = null;
if($type == 2){
$data = db::name('user_data')->where('user_id',$user_id)->field('id,alipay_name,alipay_account')->find();
$data = db::name('user_data')->where('user_id',$user_id)->field('id,bank_card_number,alipay_name,alipay_account,bank_user_name,bank_card,open_bank')->find();
}
if($type == 3){
$data = db::name('user_data')->where('user_id',$user_id)->field('id,bank_card_number,bank_user_name,bank_card,open_bank')->find();
$data = db::name('user_data')->where('user_id',$user_id)->field('id,bank_card_number,alipay_name,alipay_account,bank_user_name,bank_card,open_bank')->find();
}
if($data['bank_card_number']==0){
$data['bank_card_number'] = '';