MIDI/midi-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
赵钊
2025-08-16 14:30:30 +08:00
parent 9566409a0c 43733e1cee
commit 36366416d3
3 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
application/adminapi/controller/Gift.php
View File

@@ -44,7 +44,12 @@ class Gift extends adminApi
} }
} }
if($type == 2){ if($type == 2){
$giftTypeData = db::name('vs_gift_label')->where('delete_time',0)->order("sort asc,id desc")->select(); $type_id = input('type_id', 0);
$where['delete_time'] = 0;
if(!empty($type_id)){
$where['tid'] = $type_id;
}
$giftTypeData = db::name('vs_gift_label')->where($where)->order("sort asc,id desc")->select();
foreach ($giftTypeData as $key => $value) { foreach ($giftTypeData as $key => $value) {
$giftType[$key]['id'] = $value['id']; $giftType[$key]['id'] = $value['id'];
$giftType[$key]['name'] = $value['name']; $giftType[$key]['name'] = $value['name'];

32
application/api/model/Activities.php
View File

@@ -36,21 +36,29 @@ class Activities extends Model
Db::startTrans(); Db::startTrans();
try { try {
foreach ($gift_bag_detail as $k=>$v){ foreach ($gift_bag_detail as $k=>$v){
$gift_id =0;
$gift_price = 0;
$gift_num = $v['quantity'];
switch ($v['type']) { switch ($v['type']) {
case 1: //金币 方法1：直接添加到用户钱包 case 1: //金币 方法1：直接添加到用户钱包
$gift_price = $v['quantity'];
$res = model('common/UserWallet')->change_user_money($user_id, $v['quantity'], model('common/UserWallet')::MONEYTYPECOIN, model('common/UserWallet')::FIRST_CHARGE,model('common/UserWallet')::ChangeTypeLable(model('common/UserWallet')::FIRST_CHARGE)); $res = model('common/UserWallet')->change_user_money($user_id, $v['quantity'], model('common/UserWallet')::MONEYTYPECOIN, model('common/UserWallet')::FIRST_CHARGE,model('common/UserWallet')::ChangeTypeLable(model('common/UserWallet')::FIRST_CHARGE));
break; break;
case 2: //礼物 方法2：添加到用户礼物背包 case 2: //礼物 方法2：添加到用户礼物背包
$gift_id = $v['foreign_id'];
$res = model('UserGiftPack')->change_user_gift_pack($user_id,$v['foreign_id'],$v['quantity'],model('UserGiftPack')::FIRST_CHARGE,"首充好礼获得礼物"); $res = model('UserGiftPack')->change_user_gift_pack($user_id,$v['foreign_id'],$v['quantity'],model('UserGiftPack')::FIRST_CHARGE,"首充好礼获得礼物");
break; break;
case 3: //坐骑 方法3：添加到用户装扮 case 3: //坐骑 方法3：添加到用户装扮
$gift_id = $v['foreign_id'];
$decorate_price_info = db::name('vs_decorate_price')->where(['id'=>$v['foreign_id']])->find(); $decorate_price_info = db::name('vs_decorate_price')->where(['id'=>$v['foreign_id']])->find();
if(empty($decorate_price_info)){ if(empty($decorate_price_info)){
continue; break;
} }
$gift_price = $decorate_price_info['price'];
$res = model('Decorate')->pay_decorate($user_id,$decorate_price_info['did'],$decorate_price_info['day'],5); $res = model('Decorate')->pay_decorate($user_id,$decorate_price_info['did'],$decorate_price_info['day'],5);
break; break;
case 4: //道具 方法5：钻石 case 4: //道具 方法5：钻石
$gift_price = $v['quantity'];
$res = model('common/UserWallet')->change_user_money($user_id, $v['quantity'], model('common/UserWallet')::MONEYTYPEARNINGS, model('common/UserWallet')::FIRST_CHARGE,model('common/UserWallet')::ChangeTypeLable(model('common/UserWallet')::FIRST_CHARGE)); $res = model('common/UserWallet')->change_user_money($user_id, $v['quantity'], model('common/UserWallet')::MONEYTYPEARNINGS, model('common/UserWallet')::FIRST_CHARGE,model('common/UserWallet')::ChangeTypeLable(model('common/UserWallet')::FIRST_CHARGE));
default: default:
break; break;
@@ -59,15 +67,19 @@ class Activities extends Model
Db::rollback(); Db::rollback();
return ['code' => 0, 'msg' => $res['msg'], 'data' => null]; return ['code' => 0, 'msg' => $res['msg'], 'data' => null];
} }
// 记录日志
//添加礼盒记录
$reslut = Db::name('vs_gift_bag_receive_log')->insert([
'user_id' => $user_id,
'gift_bag_id' => $gift_bag_id,
'gift_id'=> $gift_id,
'gift_price' => $gift_price,
'num' => $gift_num,
'bag_price' => $money,
'createtime' => time(),
'updatetime' => time()
]);
} }
// 记录日志
//添加礼盒记录
$reslut = Db::name('vs_gift_bag_receive_log')->insert([
'user_id' => $user_id,
'gift_bag_id' => $gift_bag_id,
'createtime' => time(),
'updatetime' => time()
]);
// 添加活动记录 // 添加活动记录
$reslut = Db::name('vs_activities_receive')->insert([ $reslut = Db::name('vs_activities_receive')->insert([
'user_id' => $user_id, 'user_id' => $user_id,
@@ -111,7 +123,7 @@ class Activities extends Model
case 3: //坐骑 方法3：添加到用户装扮 case 3: //坐骑 方法3：添加到用户装扮
$decorate_price_info = db::name('vs_decorate_price')->where(['id'=>$v['foreign_id']])->find(); $decorate_price_info = db::name('vs_decorate_price')->where(['id'=>$v['foreign_id']])->find();
if(empty($decorate_price_info)){ if(empty($decorate_price_info)){
continue; break;
} }
$res = model('Decorate')->pay_decorate($user_id,$decorate_price_info['did'],$decorate_price_info['day'],6); $res = model('Decorate')->pay_decorate($user_id,$decorate_price_info['did'],$decorate_price_info['day'],6);
break; break;

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

@@ -135,7 +135,7 @@ class Login extends Model
$return_res[$key]['tencent_im'] = ''; $return_res[$key]['tencent_im'] = '';
} }
return ['code' => 1, 'msg' => '用户获取成功', 'data' => $return_res]; return ['code' => 1, 'msg' => '用户获取成功!~', 'data' => $return_res];
}else{ }else{
$user_info = $phone_user['data'][0]; $user_info = $phone_user['data'][0];
} }