工资计算优化

application/api/controller/StaffSalary.php

@@ -58,7 +58,7 @@ class StaffSalary extends Api
         $options = [
             'host'       => '127.0.0.1',
             'port'       => 6379,
-            'password'   => '',
+            'password'   => '123456',
             'select'     => 15,
             'timeout'    => 0,
             'expire'     => 0,
@@ -565,17 +565,14 @@ class StaffSalary extends Api
                 });
             }else{
 //                //如果出勤天数小于法定天数,按正常计算
-//                if(strpos($item['sczl_type'],'成品防护')){
-//                    $pieceWorkWage = $data[$key]['达标定额']/1000*$item['千件工价']*$item['Rate'];
-//                }else{
-//                    if (count($days[$day_bh]) <= $params['days'] && strpos($item['sczl_type'],'成品防护') === false){
-//                        $pieceWorkWage = $data[$key]['达标定额']/1000*$item['千件工价']*$item['Rate'];
-//                    }else{ //如果出勤天数大于法定天数,达标定额为 0,计件工资为0,超出的部分按加班工资算
-//                        $data[$key]['达标定额'] = '0.00';
-//                        $pieceWorkWage = '0.00';
-//                    }
-//                    $overTimePay = ($item['核算产量'] - $data[$key]['达标定额']) / 1000 *$item['千件工价'] * $item['Rate'] *1.5;
-//                }
+//                if (count($days[$day_bh]) <= $params['days'] && strpos($item['sczl_type'],'成品防护') === false){
+//                     $pieceWorkWage = $data[$key]['达标定额']/1000*$item['千件工价']*$item['Rate'];
+//                }else{ //如果出勤天数大于法定天数,达标定额为 0,计件工资为0,超出的部分按加班工资算
+//                     $data[$key]['达标定额'] = '0.00';
+//                     $pieceWorkWage = '0.00';
+//                 }
+//                 $overTimePay = ($item['核算产量'] - $data[$key]['达标定额']) / 1000 *$item['千件工价'] * $item['Rate'] *1.5;
+
                 // 基础计件工资计算公式
                 $baseWage = ($data[$key]['达标定额'] / 1000) * $item['千件工价'] * $item['Rate'];
 
@@ -598,9 +595,10 @@ class StaffSalary extends Api
                     }
                 }
                 // 统一计算加班工资（所有情况都会计算）
-                $actualOutput = (float)$item['核算产量'];
-                $overtimeOutput = max($actualOutput - (float)$data[$key]['达标定额'], 0);
-                $overTimePay = ($overtimeOutput / 1000) * $item['千件工价'] * $item['Rate'] * 1.5;
+//                $actualOutput = (float)$item['核算产量'];
+//                $overtimeOutput = max($actualOutput - (float)$data[$key]['达标定额'], 0);
+//                $overTimePay = ($overtimeOutput / 1000) * $item['千件工价'] * $item['Rate'] * 1.5;
+                $overTimePay = ($item['核算产量'] - $data[$key]['达标定额']) / 1000 *$item['千件工价'] * $item['Rate'] *1.5;
             }
             $data[$key]['个人计件工资'] = number_format($pieceWorkWage,2,'.', '');
             $data[$key]['个人加班工资'] = number_format($overTimePay,2,'.', '');