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

新需求-活动需求-上线后bug修改

Browse Source
This commit is contained in:
赵钊
2025-10-17 14:12:36 +08:00
parent 20a8c4e8bf
commit ee25111a0a
6 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
application/adminapi/controller/Activities.php
View File

@@ -424,6 +424,7 @@ class Activities extends adminApi
'money' => $ext['money'], 'money' => $ext['money'],
'money_str' => $ext['money_str'], 'money_str' => $ext['money_str'],
'diamond' => $ext['diamond'], 'diamond' => $ext['diamond'],
'activity_end_time' => $ext['activity_end_time'],
]; ];
return V(1,"成功",$data); return V(1,"成功",$data);
} }

2
application/api/controller/Activities.php
View File

@@ -200,7 +200,7 @@ class Activities extends BaseCom
public function drop_gift_send() public function drop_gift_send()
{ {
$uid = input('uid',$this->uid); $uid = input('uid',$this->uid);
$reslut = model('Activities')->drop_gift_send($uid); $reslut = model('Activities')->drop_gift_send($uid,16);
return V($reslut['code'],$reslut['msg'], $reslut['data']); return V($reslut['code'],$reslut['msg'], $reslut['data']);
} }

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

@@ -25,7 +25,7 @@ class Activities extends Model
public static function first_charge_gift_send($user_id,$money=0) public static function first_charge_gift_send($user_id,$money=0)
{ {
//礼包 //礼包
$gift_bag = DB::name('vs_gift_bag')->where(['activities_id'=>1,'status'=>1,'delete_time'=>0,'money'=>['>=',$money]])->order('money desc')->find(); $gift_bag = DB::name('vs_gift_bag')->where(['activities_id'=>1,'status'=>1,'delete_time'=>0,'money'=>['<=',$money]])->order('money desc')->find();
$gift_bag_id = $gift_bag['id'] ?? 0; $gift_bag_id = $gift_bag['id'] ?? 0;
if (!$gift_bag_id) { if (!$gift_bag_id) {
return ['code' => 0, 'msg' => '礼包不存在','data' => null]; return ['code' => 0, 'msg' => '礼包不存在','data' => null];

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

@@ -206,6 +206,9 @@ class Decorate extends Model
if($decorate_price_info['price']<=0 && $user_decorate_data['end_time'] > $now_time + $change_time){ if($decorate_price_info['price']<=0 && $user_decorate_data['end_time'] > $now_time + $change_time){
return ['code' => 0, 'msg' => '您已购买过此装扮，请勿重复购买', 'data' => null]; return ['code' => 0, 'msg' => '您已购买过此装扮，请勿重复购买', 'data' => null];
} }
if($user_decorate_data['end_time'] < $now_time){
$user_decorate_data['end_time'] = 0;
}
$change_time = $day * 24 * 3600; $change_time = $day * 24 * 3600;
$update['is_using'] = 2; $update['is_using'] = 2;
$update['end_time'] = $user_decorate_data['end_time'] + $change_time; $update['end_time'] = $user_decorate_data['end_time'] + $change_time;

5
application/api/model/UserGiftPack.php
View File

@@ -107,6 +107,7 @@ class UserGiftPack extends Model
self::DRAW_GIFT, self::DRAW_GIFT,
self::XLH_DRAW_GIFT_GET self::XLH_DRAW_GIFT_GET
,self::HOUR_RANK_GET ,self::HOUR_RANK_GET
,self::NEW_CHARGE_GIFT
]; ];
//获取背包日志列表 //获取背包日志列表
$log_model = Db::name('vs_user_gift_pack_log')->where(['user_id'=>$uid])->whereIn('type', $type) $log_model = Db::name('vs_user_gift_pack_log')->where(['user_id'=>$uid])->whereIn('type', $type)
@@ -121,7 +122,7 @@ class UserGiftPack extends Model
$gift_info = db::name('vs_gift')->where(['gid'=>$v['gid']])->find(); $gift_info = db::name('vs_gift')->where(['gid'=>$v['gid']])->find();
$list[$k]['remarks'] = $v['remarks']; $list[$k]['remarks'] = $v['remarks'];
$list[$k]['gift_num'] = $v['change_num']; $list[$k]['gift_num'] = $v['change_num'];
$list[$k]['gift_name'] = "X".$v['change_num'].$gift_info['gift_name']; $list[$k]['gift_name'] = $gift_info['gift_name']." X ".$v['change_num'];
$list[$k]['gift_image'] = $gift_info['play_image']; $list[$k]['gift_image'] = $gift_info['play_image'];
$list[$k]['time'] = date('Y-m-d H:i:s', $v['createtime']); $list[$k]['time'] = date('Y-m-d H:i:s', $v['createtime']);
} }
@@ -148,7 +149,7 @@ class UserGiftPack extends Model
$gift_info = db::name('vs_gift')->where(['gid'=>$v['gid']])->find(); $gift_info = db::name('vs_gift')->where(['gid'=>$v['gid']])->find();
$list[$k]['remarks'] = $v['remarks']; $list[$k]['remarks'] = $v['remarks'];
$list[$k]['gift_num'] = $v['change_num']; $list[$k]['gift_num'] = $v['change_num'];
$list[$k]['gift_name'] = "-".$v['change_num'].$gift_info['gift_name']; $list[$k]['gift_name'] = $gift_info['gift_name']." - ".$v['change_num'];
$list[$k]['gift_image'] = $gift_info['play_image']; $list[$k]['gift_image'] = $gift_info['play_image'];
$list[$k]['time'] = date('Y-m-d H:i:s', $v['createtime']); $list[$k]['time'] = date('Y-m-d H:i:s', $v['createtime']);
} }

6
application/common.php
View File

@@ -1203,6 +1203,12 @@ function handelCharge($where,$data){
if($is_first_charge == 0){ if($is_first_charge == 0){
model('Activities')->first_charge_gift_send($orderModel['user_id'],$orderModel['money']); model('Activities')->first_charge_gift_send($orderModel['user_id'],$orderModel['money']);
} }
//活动
if($orderModel['type_id'] == 6){
$orderModel['type_params'] = 2;
}elseif(in_array($orderModel['type_id'],[14,15,16])){
$orderModel['type_params'] = 3;
}
switch ($orderModel['type_params']){ switch ($orderModel['type_params']){
case 2: case 2:
//天降好礼 //天降好礼