财务打款系统bug修复

master
zhengyongxing 4 years ago
parent 860d389700
commit 0d5ab01f32

@ -214,7 +214,7 @@ class BusinessAffairsAwardController extends ThinkController
$detail .= "<br>"; $detail .= "<br>";
} }
$data[$key]['total_quarter_bonus_pool'] = $value['quarter_bonus_pool'] * 0.25; $data[$key]['total_quarter_bonus_pool'] = round($value['quarter_bonus_pool'] * 0.25,2);
$time = date("m",strtotime($value['time'])); $time = date("m",strtotime($value['time']));
if (!in_array($time,$check_quarter)) { if (!in_array($time,$check_quarter)) {

@ -1563,6 +1563,7 @@ class TimingController extends AdminController {
echo date("Y-m-d H:i:s")."----------------------商务奖金计算----------------------\n"; echo date("Y-m-d H:i:s")."----------------------商务奖金计算----------------------\n";
// dump($this->businessAffairRatio(3471300));die();
if (!$_REQUEST['time']) { if (!$_REQUEST['time']) {
@ -1618,23 +1619,24 @@ class TimingController extends AdminController {
foreach($data as $key => $value) { foreach($data as $key => $value) {
$month_bonus_pool += $this->businessAffairRatio($value['pay_amount']); $month_bonus_pool += $value['pay_amount'];
$quarter_bonus_pool = $this->businessAffairRatio($value['pay_amount']); $quarter_bonus_pool = $value['pay_amount'];
if ($is_hav) { if ($is_hav) {
for($i = (($value['month']%3)?(($value['month']%3)-1):2); $i > 0; $i--) { for($i = (($value['month']%3)?(($value['month']%3)-1):2); $i > 0; $i--) {
$date = date("Y-m",strtotime($value['year'].'-'.(($value['month']-$i)>0?($value['month']-$i):($value['month']-$i+12)))); $date = date("Y-m",strtotime($value['year'].'-'.(($value['month']-$i)>0?($value['month']-$i):($value['month']-$i+12))));
dump($date);
$quarter_bonus_pool +=
$this->businessAffairRatio($handleData[$date.$value['game_belong_id'].$value['relation_game_id']]['pay_amount']); $quarter_bonus_pool += $handleData[$date.$value['game_belong_id'].$value['relation_game_id']]['pay_amount'];
} }
} }
} }
$month_bonus_pool = $this->businessAffairRatio($month_bonus_pool);
$quarter_bonus_pool = $this->businessAffairRatio($quarter_bonus_pool);
foreach ($data as $key => $value){ foreach ($data as $key => $value){

Loading…
Cancel
Save