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-11-26 18:03:25 +08:00
parent 5d9ee030b8 ad6b12bc4d
commit 06a01e4908
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -908,7 +908,7 @@ class GiveGift extends Model
// 1.系统调节 2.充值 3.提现 4.金币转增（送出） 5.每日任务奖励 6.充值返利 7.购买装扮
// 8.礼盒奖励 9.房间补贴 10.购买礼物 11.收礼增加收益 12.工会补贴 13.转赠金币（接收） 14.收益兑换
// 15.首充 16.天降好礼充值 17.退出工会扣款 18.房主收益 19.主持人收益 20.抢头条 21.公会长收益，22.提现驳回或提现失败返还，23.财富等级奖励金币领取，24.删除关系扣金币，
//50-签约,51-签约失败退回,52-首次被签约收入
//50-签约,51-签约失败退回,52-首次被签约收入，54-叛徒补偿
if(in_array($change_type,[1,2,3,4,5,6,7,8,12,13,14,15,16,17,20])){
$room_ids = 0;
}else{
@@ -951,7 +951,7 @@ class GiveGift extends Model
}
}elseif ($money_type == 2){//2钻石
//增加用户钻石类型
$in_types = [9,11,12,18,19,21,52];
$in_types = [9,11,12,18,19,21,52,54];
//减少用户钻石类型
$out_types = [3,14];
if(in_array($change_type,$in_types)){

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

@@ -273,7 +273,7 @@ class Sign extends Model
}
}elseif ($sign_user_type == 2){
//签过没过期 给上任签约者
$result4 = model('api/GiveGift') -> change_user_cion_or_earnings_log($before_sign_user,$shouyizs,$room_id,2,52,'被首次签约成功收入');
$result4 = model('api/GiveGift') -> change_user_cion_or_earnings_log($before_sign_user,$shouyizs,$room_id,2,54,'解约补偿');
if(!$result4){
db::rollback();
return ['code' => 0, 'msg' => '网络错误，请重试', 'data' => null];

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

@@ -114,7 +114,7 @@ class User extends Model
public function get_me($uid)
{
$user_info = db::name('user')
->field('id as user_id,nickname,user_code,avatar,sex,mobile')
->field('id as user_id,nickname,user_code,avatar,sex,mobile,market_value')
->where('id', $uid)->find();
if (empty($user_info)) {
return ['code' => 0, 'msg' => '用户不存在', 'data' => null];
@@ -342,7 +342,7 @@ class User extends Model
public function get_user_home($from_uid,$uid)
{
$user_info = db::name('user')->alias('u')->join('user_data ud', 'u.id = ud.user_id')
->field('u.id as user_id,u.nickname,u.user_code,u.avatar,u.sex,u.birthday,u.profile,ud.tag_id,ud.home_bgimages,u.is_online')
->field('u.market_value,u.id as user_id,u.nickname,u.user_code,u.avatar,u.sex,u.birthday,u.profile,ud.tag_id,ud.home_bgimages,u.is_online')
->where(['u.id' => $uid,'u.status' => ['<>',0]])->find();
if(!$user_info){
return ['code' => 0, 'msg' => '用户不存在或已注销', 'data' => null];

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

@@ -51,7 +51,7 @@ class UserWallet extends Model
// 8.礼盒奖励 9.房间补贴 10.购买礼物 11.收礼增加收益 12.工会补贴 13.转赠金币（接收） 14.收益兑换
// 15.首充 16.天降好礼充值 17.退出工会扣款 18.房主收益 19.主持人收益，20.发布头条扣除余额,21.公会长收益,22.提现驳回或提现失败返还,23.财富等级奖励金币领取,24.删除关系扣金币
//27.小时榜获得，28-新人充值好礼,32-发红包（金币），29-发红包（钻石），30-抢红包（金币），31-抢红包（钻石） 33-红包剩余退回（金币），34-红包剩余退回（钻石）
//50-签约 51-签约失败退回,52-首次被签约收入
//50-签约 51-签约失败退回,52-首次被签约收入 53-师徒签到 54-叛徒补偿
if($gift_type == 1){ //1金币，2收益（钻石）
if($in_out_type == 1){//1收入
$in_out_types = [2,5,6,8,13,14,15,16,22,23,26,27,30,28,33,51];
@@ -60,7 +60,7 @@ class UserWallet extends Model
}
}elseif($gift_type == 2){ //1金币，2收益（钻石）
if($in_out_type == 1){//1收入
$in_out_types = [6,9,11,12,18,19,21,22,31,28,34,52];
$in_out_types = [6,9,11,12,18,19,21,22,31,28,34,52,53,54];
}elseif($in_out_type == 2){//2支出
$in_out_types = [3,14,29];
}