up - 统计出配件总金额

app/common/model/master_worker/SalaryItemPermanently.php

@@ -77,11 +77,14 @@ class SalaryItemPermanently extends BaseModel
             // 查询时间范围内所有已经完单的工单
             $order_list = ServiceWork::where('master_worker_id',$master_worker_id)->
             where('finished_time','between',[$params['start_time'],$params['end_time']])->
-            where('service_status','=',3)->where('work_pay_status','=',2)->
-            select(['id','work_sn','work_amount','spare_total','master_worker_id','finished_time','service_status','work_pay_status'])->toArray();
+            where('service_status',3)->where('work_pay_status',2)->
+            field(['id','work_sn','work_amount','spare_total','master_worker_id','finished_time','service_status','work_pay_status'])->
+            select()->toArray();
             $amount = 0.00;
+            $spare_total = 0.00;
             foreach ($order_list as $item) {
                 $amount += (float)bcsub($item['work_amount'] ,$item['spare_total']);//(float)bcmul(, $ratio,2);
+                $spare_total += $item['spare_total'];
             }
             $term_amount = (float)bcmul($amount, $ratio,2);
 
@@ -90,7 +93,7 @@ class SalaryItemPermanently extends BaseModel
                 'master_worker_id' => $master_worker_id,
                 'term' => 1,
                 'term_amount' => $term_amount,
-                'remark' => $params['item_name'].':  金额--'.$term_amount.';比例：--'.$ratio,
+                'remark' => $params['item_name'].':配件总金额--'.$spare_total.': 奖励总金额--'.$term_amount.';比例：--'.$ratio,
                 'extra' => json_encode([
                     'step_days'=>$params['step_days'],'item_name'=>$params['item_name'],
                     'start_time'=>$params['start_time'],'end_time'=>$params['end_time'],'promotion_level'=>$promotion_level,'ratio'=>$ratio,
@@ -115,7 +118,8 @@ class SalaryItemPermanently extends BaseModel
             $order_list = ServiceWork::where('master_worker_id',$master_worker_id)->
             where('finished_time','between',[$params['start_time'],$params['end_time']])->
             where('service_status','=',3)->where('work_pay_status','=',2)->where('work_type','=',2)->
-            select(['id','work_sn','work_amount','spare_total','master_worker_id','finished_time','service_status','work_pay_status'])->toArray();
+            field(['id','work_sn','work_amount','spare_total','master_worker_id','finished_time','service_status','work_pay_status'])->
+            select()->toArray();
 
             $amount = 0.00;
             foreach ($order_list as $item) {