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:
赵钊
2025-12-24 20:21:54 +08:00
parent 3003b489a3
commit 136802fa48
3 changed files with 42 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,7 +62,7 @@ class Guild extends adminApi
// $where['createtime'] = ['between',[strtotime($search_stime),strtotime($search_etime.' 23:59:59')]];
// }
$count = db::name('vs_guild')->where($where)->count();
$data = db::name('vs_guild')->where($where)->page($page,$page_limit)->select();
$data = db::name('vs_guild')->where($where)->order('income desc')->page($page,$page_limit)->select();
$list = [];
foreach ($data as $k=>$v) {
$list[$k]['id'] = $v['id'];
@@ -82,7 +82,7 @@ class Guild extends adminApi
}
$list[$k]['guild_logo'] = $v['cover'];
//当日流水
$list[$k]['today_money'] = model('Guild')->getTodayMoney($v['id'],$search_stime,$search_etime);
$list[$k]['today_money'] = $v['income'];//model('Guild')->getTodayMoney($v['id'],$search_stime,$search_etime);
$list[$k]['is_show'] = $v['is_show'];
$list[$k]['is_show_str'] = $v['is_show'] == 1 ? '显示' : '隐藏';
$list[$k]['status'] = $v['status'];
@@ -510,29 +510,26 @@ 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($search_stime!="" && $v['apply_time'] < strtotime($search_stime)){
$search_stime = $search_stime;
}else{
$search_stime = date('Y-m-d H:i:s',$v['apply_time']) ;
if($v['apply_time'] && $search_stime < $v['apply_time']) {
$search_stime = date('Y-m-d H:i:s',$v['apply_time']);
}
}else{
$search_stime = $search_stime;
$search_stime = date('Y-m-d H:i:s',$v['apply_time']);
}
if($search_etime!=""){
if($v['quit_time']){
if($search_etime!="" && $v['quit_time'] > strtotime($search_etime)){
$search_etime = $search_etime;
}else{
$search_etime = date('Y-m-d H:i:s',$v['quit_time']);
}
}else{
$search_etime = $search_etime;
if($v['quit_time'] && ($search_etime > $v['quit_time'])){
$search_etime = date('Y-m-d H:i:s',$v['quit_time']);
}
}else{
$search_etime = $search_etime;
if($v['quit_time']){
$search_etime = date('Y-m-d H:i:s',$v['quit_time']);
}else{
$search_etime = date('Y-m-d H:i:s',time());
}
}
$room_info = db::name('vs_room')->where(['id'=>$v['room_id']])->find();
$rum_lists[$k]['id']=$v['id'];
$rum_lists[$k]['room_id']=$v['room_id'];

11
application/api/model/Tasks.php
View File

@@ -268,12 +268,15 @@ class Tasks extends Model
if($v['task_type']!=4){
$reslut['tasks'][$v['task_type']-1]['task_list'][] = $v;
}else{
if(!empty($sign_student_list)){
foreach ($sign_student_list as $key => $value) {
$reslut['tasks'][$v['task_type']-1]['task_list'][] = $value;
if($v['task_id'] == 24){
$reslut['tasks'][$v['task_type']-1]['task_list'][] = $v;
}else{
if(!empty($sign_student_list)){
foreach ($sign_student_list as $key => $value) {
$reslut['tasks'][$v['task_type']-1]['task_list'][] = $value;
}
}
}
}
}
foreach ($reslut['tasks'] as &$value) {

40
application/cron/controller/Test.php
View File

@@ -25,7 +25,7 @@ class Test
// $this->xlh_gift_send();
// echo "\n";
//
$this->clean_guild_flow();
// $this->clean_guild_flow();
}
@@ -507,9 +507,9 @@ class Test
//清洗公会流水
public function clean_guild_flow()
{
{die;
echo "开始清洗公会流水： \n";
$guild = db::name('vs_guild')->where(['status' => 1, 'income' => 0])->select();
$guild = db::name('vs_guild')->where(['status' => 1])->select();
foreach ($guild as $value) {
echo "================================\n";
echo "开始清洗公会({$value['id']})流水 \n";
@@ -517,7 +517,7 @@ class Test
$transaction = 0;
foreach ($guild_user as $v) {
$week_start_time_seach = "1761554521";
$week_end_time_seach = time();
$week_end_time_seach = "1766564906";
if($v['apply_time'] && $week_start_time_seach < $v['apply_time']){
$week_start_time_seach = $v['apply_time'];
}
@@ -528,26 +528,28 @@ class Test
->where('from_id',$v['room_id'])
->where(['from'=>['in',[2,3,6]],'createtime' => ['between', [$week_start_time_seach, $week_end_time_seach]]])
->sum('total_price');
db::name('vs_guild_user')->where(['id' => $v['id']])->update([
'coin' => $transaction_one,
]);
// db::name('vs_guild_user')->where(['id' => $v['id']])->update([
// 'coin' => $transaction_one,
// ]);
// Db::name('vs_guild_user')->where(['id' => $v['id']])->setInc('coin', $transaction_one);
$data = [
'guild_id' => $value['id'],
'room_id' => $v['room_id'],
'give_gift_id' => 0,
'flow_price' => $transaction_one,
'day' => "",
'createtime' => time(),
];
$res = Db::name('vs_guild_flow')->insert($data);
// $data = [
// 'guild_id' => $value['id'],
// 'room_id' => $v['room_id'],
// 'give_gift_id' => 0,
// 'flow_price' => $transaction_one,
// 'day' => "",
// 'createtime' => time(),
// ];
// $res = Db::name('vs_guild_flow')->insert($data);
$transaction += $transaction_one;
echo " 公会房间(". $v['room_id'] .")流水：" . $transaction_one . "\n";
}
db::name('vs_guild')->where(['id' => $value['id']])->update([
'income' => $transaction,
]);
// db::name('vs_guild')->where(['id' => $value['id']])->update([
// 'income' => $transaction,
// ]);
// Db::name('vs_guild')->where(['id' => $value['id']])->setInc('income', $transaction);
echo "清洗公会房间流水完成：" . count($guild_user) . "\n";
}
echo "清洗公会流水完成: ".count($guild)."\n";