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-05 20:44:50 +08:00
parent 0d758d8587
commit a3f6327739
2 changed files with 93 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,7 +144,7 @@ class GiftNew extends Model
->alias('a')
->join('vs_gift b','a.gift_id = b.gid')
->field('a.id,b.gid as gift_id,a.new_gift_name,b.gift_name,b.base_image,b.gift_price,b.icon')
->where(['a.user_id' => $user_id,'a.delete_time'=>0])
->where(['a.user_id' => $user_id,'a.delete_time'=>0,'a.new_gift_name'=>['<>','']])
->order('a.sort desc ,a.updatetime desc')
->select();
return ['code' => 1, 'msg' => '获取成功','data' =>$list];

126
application/cron/controller/Subsidy.php
View File

@@ -31,13 +31,92 @@ class Subsidy
* 配置：定时脚本每周一 执行
* 配置：/cron/Subsidy/createGuildSubsidyData
*/
// public function createGuildSubsidyData(){
// //获取上周第一天时间
// $week_start_time = strtotime('last week Monday');
// $week_end_time = strtotime(date('Y-m-d 23:59:59',strtotime('last week Sunday')));
//// $week_start_time = strtotime('2025-09-29');
//// $week_end_time = strtotime('2025-09-29 23:59:59');
//
// //获取上周时间
// $time_value = date('o-W', $week_start_time);
// echo $time_value . "工会周补贴数据生成开始\n";
// //查询所有工会
// $guild_list = db::name('vs_guild')->where(['delete_time'=>0])->field('id')->select();
// $data_count = 0;
// foreach ($guild_list as $key => $value) {
// //获取所有工会房间ID
// $guild_user_data = db::name('vs_guild_user')->where('guild_id', $value['id'])->where(['apply_time'=>['>',0],'status'=>1,'room_id'=>['>',0]])->field('room_id,apply_time,quit_time')->select();
// $transaction = 0;
// foreach ($guild_user_data as $k => $v) {
// $week_start_time_seach = $week_start_time;
// $week_end_time_seach = $week_end_time;
// if($v['apply_time'] && $week_end_time_seach < $v['apply_time']){
// continue;
// }
// if($v['quit_time'] && $v['quit_time'] < $week_start_time_seach){
// continue;
// }
// if($v['apply_time'] && $week_start_time_seach < $v['apply_time']){
// $week_start_time_seach = $v['apply_time'];
// }
// if($v['quit_time'] && ($week_end_time_seach > $v['quit_time'])){
// $week_end_time_seach = $v['quit_time'];
// }
// $transaction_one = db::name('vs_give_gift')
// ->whereIn('from_id',$v['room_id'])
// ->where(['from'=>['in',[2,3,6]],'createtime' => ['between', [$week_start_time_seach, $week_end_time_seach]]])
// ->sum('total_price');
// $transaction += $transaction_one;
// }
//
// if($transaction > 0){
// //判断是否已经生成过
// if (db::name('vs_guild_subsidy')->where(['guild_id'=>$value['id'],'week'=>$time_value])->find()) {
// continue;
// }
// //获取补贴配置
// $config = db::name('vs_guild_subsidy_config')->where(['status' => 1])->order('end_amount desc')->select(); //配置查询
// if (!$config) {
// echo '补贴配置为空\n';
// die;
// }
// $subsidy_ratio = 0;
// $subsidy_amount = 0;
// foreach ($config as $k => $v) {
// if ($transaction >= $v['end_amount']) {
// $subsidy_ratio = $v['subsidy_ratio'];
// $subsidy_amount = ($transaction * ($subsidy_ratio / 100)) / get_system_config_value('rmb_coin_ratio');//转为钻石
// break; // 找到匹配项后提前退出循环
// }
// }
// //生成补贴数据
// $data = [
// 'guild_id' => $value['id'],
// 'week' => $time_value,
// 'start_time' => date('Y-m-d H:i:s', $week_start_time),
// 'end_time' =>date('Y-m-d H:i:s', $week_end_time),
// 'total_transaction' => $transaction,
// 'subsidy_amount' => $subsidy_amount,
// 'subsidy_ratio' => $subsidy_ratio,
// 'status' => 0,
// 'createtime' => time(),
// ];
// // echo "工会".$value['id']."生成数据:流水金额：{$transaction} 补贴比例：{$subsidy_ratio}% 补贴金额：{$subsidy_amount}\n";
// $subsidy_id = Db::name('vs_guild_subsidy')->insertGetId($data);
// if ($subsidy_id) {
// echo "工会".$value['id']."生成成功(补贴ID：".$subsidy_id." 补贴金额：".$subsidy_amount.")\n";
// $data_count++;
// }
// }
// }
// echo $time_value . "工会周补贴数据生成完成-共" . $data_count . "条数据\n";
// }
public function createGuildSubsidyData(){
//获取上周第一天时间
$week_start_time = strtotime('last week Monday');
$week_end_time = strtotime(date('Y-m-d 23:59:59',strtotime('last week Sunday')));
// $week_start_time = strtotime('2025-09-29');
// $week_end_time = strtotime('2025-09-29 23:59:59');
//获取上周时间
$time_value = date('o-W', $week_start_time);
echo $time_value . "工会周补贴数据生成开始\n";
@@ -45,31 +124,10 @@ class Subsidy
$guild_list = db::name('vs_guild')->where(['delete_time'=>0])->field('id')->select();
$data_count = 0;
foreach ($guild_list as $key => $value) {
//获取所有工会房间ID
$guild_user_data = db::name('vs_guild_user')->where('guild_id', $value['id'])->where(['apply_time'=>['>',0],'status'=>1,'room_id'=>['>',0]])->field('room_id,apply_time,quit_time')->select();
$transaction = 0;
foreach ($guild_user_data as $k => $v) {
$week_start_time_seach = $week_start_time;
$week_end_time_seach = $week_end_time;
if($v['apply_time'] && $week_end_time_seach < $v['apply_time']){
continue;
}
if($v['quit_time'] && $v['quit_time'] < $week_start_time_seach){
continue;
}
if($v['apply_time'] && $week_start_time_seach < $v['apply_time']){
$week_start_time_seach = $v['apply_time'];
}
if($v['quit_time'] && ($week_end_time_seach > $v['quit_time'])){
$week_end_time_seach = $v['quit_time'];
}
$transaction_one = db::name('vs_give_gift')
->whereIn('from_id',$v['room_id'])
->where(['from'=>['in',[2,3,6]],'createtime' => ['between', [$week_start_time_seach, $week_end_time_seach]]])
->sum('total_price');
$transaction += $transaction_one;
}
$transaction = Db::name('vs_guild_flow')
->where(['guild_id' => $value['id']])
->where(['createtime' => ['between', [$week_start_time, $week_end_time]]])
->sum('flow_price');
if($transaction > 0){
//判断是否已经生成过
if (db::name('vs_guild_subsidy')->where(['guild_id'=>$value['id'],'week'=>$time_value])->find()) {
@@ -102,12 +160,12 @@ class Subsidy
'status' => 0,
'createtime' => time(),
];
// echo "工会".$value['id']."生成数据:流水金额：{$transaction} 补贴比例：{$subsidy_ratio}% 补贴金额：{$subsidy_amount}\n";
$subsidy_id = Db::name('vs_guild_subsidy')->insertGetId($data);
if ($subsidy_id) {
echo "工会".$value['id']."生成成功(补贴ID：".$subsidy_id." 补贴金额：".$subsidy_amount.")\n";
$data_count++;
}
// echo "工会".$value['id']."生成数据:流水金额：{$transaction} 补贴比例：{$subsidy_ratio}% 补贴金额：{$subsidy_amount}\n";
$subsidy_id = Db::name('vs_guild_subsidy_1')->insertGetId($data);
if ($subsidy_id) {
echo "工会".$value['id']."生成成功(补贴ID：".$subsidy_id." 补贴金额：".$subsidy_amount.")\n";
$data_count++;
}
}
}
echo $time_value . "工会周补贴数据生成完成-共" . $data_count . "条数据\n";