up - 结算

app/adminapi/logic/works/ServiceWorkLogic.php

@@ -535,7 +535,15 @@ class ServiceWorkLogic extends BaseLogic
             ->each(function ($item){
                 $item['amount'] = $item['action'] == 1 ? '+'.$item['amount'] : '-'.$item['amount'];
             })->toArray();
-
+        //保修工单时的信息
+        $result['effective_income_amount'] = 0;
+        if(!empty($result['order_effective_id'])){
+            $order_effective = OrderEffectiveLog:: findOrEmpty($result['order_effective_id']);
+            $serviceWork = ServiceWork::findOrEmpty($order_effective->work_id);
+            if($serviceWork->master_worker_id != $result['master_worker_id']){
+                $result['effective_income_amount'] = \app\adminapi\logic\effective\OrderEffectiveLogLogic::commissionAndAssuranceDeposit($serviceWork);
+            }
+        }
         return  $result;
     }
 

app/api/logic/ServiceOrderLogic.php

@@ -543,10 +543,10 @@ class ServiceOrderLogic extends BaseLogic
                 $order_info['service_work']['url_page'] = rawurlencode($params['domain'].'/static/wxapp/H5/'.$propertyActivity['url_page'].'/index.html?property_activity_id='.$propertyActivity['id'].'&token='.$params['user_info']['token']);
             }
             //保修工单时的信息
+            $order_info['effective_income_amount'] = 0;
             if(!empty($order_info['service_work']['order_effective_id'])){
                 $order_effective = OrderEffectiveLog:: findOrEmpty($order_info['service_work']['order_effective_id']);
                 $serviceWork = ServiceWork::findOrEmpty($order_effective->work_id);
-                $order_info['effective_income_amount'] = 0;
                 if($serviceWork->master_worker_id != $order_info['service_work']['master_worker_id']){
                     $order_info['effective_income_amount'] = \app\adminapi\logic\effective\OrderEffectiveLogLogic::commissionAndAssuranceDeposit($serviceWork);
                 }