KoPKB/api_arrahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix imbangduga

Browse Source
This commit is contained in:
Hafifie PKB
2024-04-28 11:06:45 +08:00
parent 13890767dd
commit 5d2f5c53a5
6 changed files with 74 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Services/Reports/OnePercentService.php
+32 -20
View File
@@ -62,7 +62,7 @@ class OnePercentService
}
public function getTotalKeuntungan($type = 'B',$start = '2023-12-14',$end = '2023-12-14') : Object{
public function getTotalKeuntungan($type = 'B',$start = '2023-12-14',$end = '2023-12-14') : Float{
if($type == 'B'){
if($start == null){
$akrual = Gadai::on($this->cawangan['mysql'])->where([['sttebus',''],['tagbaru',1]])->sum('tunggakanonepercent');
@@ -79,11 +79,12 @@ class OnePercentService
->orderBy('sirig', 'ASC')
->get();
$test = $this->calculateTotalProfit($akrual,$start);
return response()->json($test);
$keuntungan = $this->calculateTotalProfit($akrual,$start);
$keuntungan = $keuntungan['onepercent'];
}
return $keuntungan;
}else if($type == 'L'){
$akrual = Gadai::on($this->cawangan['mysql'])->where([['sttebus',''],['tagbaru',1],['t_update','>=',$start],['t_update','<=',$end]])->sum('tunggakanonepercent');
@@ -108,13 +109,33 @@ class OnePercentService
if($type == 'B'){
$akrual = Gadai::on($this->cawangan['mysql'])->where([['sttebus',''],['tagbaru',1]])->sum('tunggakanujrah');
// $akrual = Gadai::on($this->cawangan['mysql'])->where([['sttebus',''],['tagbaru',1]])->sum('tunggakanujrah');
$norujukan = Gadai::on($this->cawangan['mysql'])->where('sttebus','T')->where('tagbaru',1)->pluck('norujukan');
// $norujukan = Gadai::on($this->cawangan['mysql'])->where('sttebus','T')->where('tagbaru',1)->pluck('norujukan');
$ujrah = TransaksiKeuntungan::on('mysql7')
->whereIn('norujukan',$norujukan)
->sum('ujrah_rebet');
// $ujrah = TransaksiKeuntungan::on('mysql7')
// ->whereIn('norujukan',$norujukan)
// ->sum('ujrah_rebet');
if($start == null){
$akrual = Gadai::on($this->cawangan['mysql'])->where([['sttebus',''],['tagbaru',1]])->sum('tunggakanujrah');
$norujukan = Gadai::on($this->cawangan['mysql'])->where('sttebus','T')->where('tagbaru',1)->pluck('norujukan');
$keuntungan = TransaksiKeuntungan::on('mysql7')
->whereIn('norujukan',$norujukan)
->sum('ujrah_rebet');
}else{
$akrual = Gadai::on($this->cawangan['mysql'])
->where([['tagpalsu','=',0],['t_gadai','<=',$start],['sttebus','=',''],['tagbaru',1]])
->orWhere([['tagbaru',1],['tagpalsu','=',0],['t_update','>',$start],['sttebus','!=',''],['t_gadai','<=',$start]])
->orderBy('t_gadai', 'ASC')
->orderBy('sirig', 'ASC')
->get();
$keuntungan = $this->calculateTotalProfit($akrual,$start);
$keuntungan = $keuntungan['ujrah'];
}
return $keuntungan;
}else if($type == 'L'){
$akrual = Gadai::on($this->cawangan['mysql'])->where([['sttebus',''],['tagbaru',1],['t_update','>=',$start],['t_update','<=',$end]])->sum('tunggakanujrah');
@@ -145,11 +166,6 @@ class OnePercentService
foreach ($chunk as $item) {
$trans_keun = TransaksiKeuntungan::on('mysql7')->where([['norujukan','=',$item->norujukan],['bayaran_pembiayaan','>=',0]])->whereDate('tarikh_bayaran','<=',$tarikh)->get();
$calculation = new V2Calculation();
// if($item->norujukan == 'KB2240115-0013')
// {
// dd($trans_keun);
// }
if($trans_keun->isNotEmpty()){
$bakipinjaman = $item->pinjaman;
@@ -181,11 +197,6 @@ class OnePercentService
$summationujrah += $ujrah;
$summationbkpjm += $item->pinjaman;
// if($item->norujukan == 'KB2240108-0020')
// {
// dd($item->bakipjm);
// }
array_push($array_test,['norujukan' => $item->norujukan,'ujrah' => $ujrah,'onepercent' => $onepercent,'pinjaman' => $item->pinjaman, 'bakipjm' => $item->pinjaman]);
}
$count++;
@@ -194,8 +205,9 @@ class OnePercentService
});
// return response()->json($array_test);
dd($summationonepercent,$summationujrah,$count,$summationbkpjm,$array_test);
dd('test');
// dd($summationonepercent,$summationujrah,$count,$summationbkpjm,$array_test);
// dd('test');
return ['onepercent' => $summationonepercent,'ujrah' => $summationujrah];
}