diff --git a/application/adminapi/controller/Lottery.php b/application/adminapi/controller/Lottery.php index 4db12139..ef26d0c3 100644 --- a/application/adminapi/controller/Lottery.php +++ b/application/adminapi/controller/Lottery.php @@ -203,11 +203,15 @@ class Lottery extends adminApi //奖项类型:1-小奖 2-大奖 if($v['prize_type']==4){ $lists_data[$k]['prize_type_str'] = "高级奖"; + $gift_price = 10; }elseif ($v['prize_type']==2){ + $gift_price = 1; $lists_data[$k]['prize_type_str'] = "大奖"; }elseif ($v['prize_type']==3){ + $gift_price = 5; $lists_data[$k]['prize_type_str'] = "中级奖"; }else{ + $gift_price = 1; $lists_data[$k]['prize_type_str'] = "小奖"; } @@ -215,7 +219,7 @@ class Lottery extends adminApi $lists_data[$k]['status_str'] = $v['status']==1?"已发放":"未发放"; $lists_data[$k]['createtime'] = date("Y-m-d H:i:s", $v['createtime']); $lists_data[$k]['prize_amount'] = floor($v['prize_amount']); - $lists_data[$k]['beilv'] = floor($v['prize_amount']); + $lists_data[$k]['beilv'] = floor($v['prize_amount'] / $gift_price); } $return_data = [ 'page' =>$page, diff --git a/application/api/model/Lottery.php b/application/api/model/Lottery.php index 134c79cc..45034b34 100644 --- a/application/api/model/Lottery.php +++ b/application/api/model/Lottery.php @@ -150,12 +150,15 @@ class Lottery extends Model try { $gift_gold = $gift_price; if($poole_type == 5){ + $text = '中级'; $small_prize_play_image = db::name('bb_lottery_config')->where(['key' => 'big_prize_play_image'])->value('value'); $service = new LotteryService5(); }elseif($poole_type == 10){ + $text = '高级'; $small_prize_play_image = db::name('bb_lottery_config')->where(['key' => 'gao_prize_play_image'])->value('value'); $service = new LotteryService10(); }else{ + $text = '初级'; $small_prize_play_image = db::name('bb_lottery_config')->where(['key' => 'small_prize_play_image'])->value('value'); $service = new LotteryService(); } @@ -175,7 +178,7 @@ class Lottery extends Model return ['code' => 0, 'msg' => '流水记录失败', 'data' => null]; } - $tet['text'] = '恭喜用户'.$fromUserInfo['nickname'].'在幸运币活动中获得幸运币'.$beilv.'倍'; + $tet['text'] = '恭喜用户'.$fromUserInfo['nickname'].'在'.$text.'幸运币活动中获得幸运币'.$beilv.'倍'; $tet['type'] = 2; $tet['beilv'] = $beilv; $tet['play_image'] = $small_prize_play_image; @@ -185,7 +188,7 @@ class Lottery extends Model $push = new Push($send_uid, $room_id); $room_name = Db::name('vs_room')->where(['id' => $room_id, 'apply_status' => 2])->value('room_name'); - $text = '恭喜'.$fromUserInfo['nickname'] . '在' . $room_name . '房间获得幸运币'. $beilv . '倍'; + $text = '恭喜'.$fromUserInfo['nickname'] . '在' . $room_name . '房间获得'.$text.'幸运币'. $beilv . '倍'; $text_list_new[] = [ 'text' => $text, 'gift_picture' => $gift_info['base_image'],