YUSHENG/yusheng-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

公会流水清洗更换

Browse Source
This commit is contained in:
赵钊
2025-12-26 10:17:33 +08:00
parent 36f4187ada
commit 8307b6c83d
6 changed files with 90 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,6 +214,7 @@ class Guild extends adminApi
$insert_data['room_id'] = $rid;
$insert_data['status'] = 1;
$insert_data['is_deacon'] = 1;
$insert_data['apply_time'] = time();
$insert_data['createtime'] = time();
$insert_data['is_show_room'] = 1;
//结算比例
@@ -510,17 +511,15 @@ class Guild extends adminApi
foreach ($list as $k=>$v){
$search_stime = $search_stime_str;
$search_etime = $search_etime_str;
// $search_stime = date('Y-m-d H:i:s','1761554521');
// $search_etime = date('Y-m-d H:i:s','1766564906');
if($search_stime!=""){
if($v['apply_time'] && $search_stime < $v['apply_time']) {
if($v['apply_time'] && strtotime($search_stime) < $v['apply_time']) {
$search_stime = date('Y-m-d H:i:s',$v['apply_time']);
}
}else{
$search_stime = date('Y-m-d H:i:s',$v['apply_time']);
}
if($search_etime!=""){
if($v['quit_time'] && ($search_etime > $v['quit_time'])){
if($v['quit_time'] && (strtotime($search_etime) > $v['quit_time'])){
$search_etime = date('Y-m-d H:i:s',$v['quit_time']);
}
}else{

13
application/adminapi/controller/SingerSong.php
View File

@@ -19,13 +19,17 @@ class SingerSong extends adminApi
$search = input('search', '');
$status = input('status', '');
$where=[];
$wheres = [];
//搜索信息有值且是纯数字
if(is_numeric($search)){
$where['ss.user_id'] = $search;
$wheres['user_id'] = $search;
$where['u.user_code'] = $search;
$user_id = db::name('user')->where('user_code', $search)->value('id');
$wheres['user_id'] = $user_id;
}
if($search && !is_numeric($search)){
$where['u.nickname'] = ['like', '%'.$search.'%'];;
$where['u.nickname'] = ['like', '%'.$search.'%'];
$user_id = db::name('user')->where('nickname', $search)->value('id');
$wheres['user_id'] = $user_id;
}
if($start_time && $end_time){
$where['ss.createtime'] = ['between', [strtotime($start_time), strtotime($end_time)]];
@@ -34,9 +38,6 @@ class SingerSong extends adminApi
if($status){
$where['ss.status'] = $status;
$wheres['status'] = $status;
}else{
$where = [];
$wheres = [];
}
$count = db::name('vs_singer')->where($wheres)->count();

8
application/adminapi/model/Room.php
View File

@@ -73,15 +73,17 @@ class Room extends Model
public function getRoomFlow($room_id,$stime='',$etime=''){
$give_where = [];
$give_where['from_id'] = $room_id;
$give_where['from'] = ["in",[2,3,6]];
// $give_where['from'] = ["in",[2,3,6]];
$give_where['from'] = 2;
if(!empty($stime)){
$give_where['createtime'] = ['>=',strtotime($stime)];
}
if(!empty($etime)){
$give_where['createtime'] = ['<=',strtotime($etime)];
$give_where['createtime'] = ['<',strtotime($etime)];
}
if(!empty($stime) && !empty($etime)){
$give_where['createtime'] = ['between',[strtotime($stime),strtotime($etime)]];
// $give_where['createtime'] = ['between',[strtotime($stime),strtotime($etime)]];
$give_where['createtime'] = [['>=',strtotime($stime)],['<',strtotime($etime)]];
}
$total_price = db::name('vs_give_gift')->where($give_where)
->sum('total_price');