add - 长期工程师结算

app/adminapi/controller/master_worker/EngineerSettlementPermanentlyController.php

@@ -69,6 +69,7 @@ class EngineerSettlementPermanentlyController extends BaseAdminController
     public function edit()
     {
         $params = (new EngineerSettlementPermanentlyValidate())->post()->goCheck('edit');
+        $params['admin_id'] = $this->adminId;
         $result = EngineerSettlementPermanentlyLogic::edit($params);
         if (true === $result) {
             return $this->success('编辑成功', [], 1, 1);

app/adminapi/logic/master_worker/EngineerSettlementPermanentlyLogic.php

@@ -77,13 +77,13 @@ class EngineerSettlementPermanentlyLogic extends BaseLogic
         Db::startTrans();
         try {
             EngineerSettlementPermanently::where('id', $params['id'])->update([
-                'master_worker_id' => $params['master_worker_id'],
-                'last_settlement_time' => $params['last_settlement_time'],
-                'settlement_time' => $params['settlement_time'],
-                'step_days' => $params['step_days'],
-                'status' => $params['status'],
+//                'master_worker_id' => $params['master_worker_id'],
+//                'last_settlement_time' => $params['last_settlement_time'],
+//                'settlement_time' => $params['settlement_time'],
+//                'step_days' => $params['step_days'],
+                'status' => 1,
                 'admin_id' => $params['admin_id'],
-                'remark' => $params['remark']
+                //'remark' => $params['remark']
             ]);
 
             Db::commit();

app/api/logic/PerformanceLogic.php

@@ -134,7 +134,7 @@ class PerformanceLogic extends BaseLogic
             $settlement_amount += (float)$work->add_work_amount;
 
             //工程师可提现金额，汇总 配件总金额
-            $offering_price = ServiceWorkSpare::where("service_work_id", $work->id)->where('status', 1)->sum('offering_price')??0;
+            $offering_price = ServiceWorkSpare::where("service_work_id", $work->id)->where('status', 1)->sum(Db::raw("spare_number * offering_price"))??0;
             $freezeMoney = $work->spare_total - $offering_price;
             if($freezeMoney > 0){
                 // work_id
@@ -227,7 +227,7 @@ class PerformanceLogic extends BaseLogic
             //工程师可提现金额，汇总了加单金额
             $settlement_amount += (float)$work->add_work_amount;
             //工程师可提现金额，汇总 配件总金额
-            $offering_price = ServiceWorkSpare::where("service_work_id", $work->id)->where('status', 1)->sum('offering_price')??0;
+            $offering_price = ServiceWorkSpare::where("service_work_id", $work->id)->where('status', 1)->sum(Db::raw("spare_number * offering_price"))??0;
             $freezeMoney = $work->spare_total - $offering_price;
             if($freezeMoney > 0){
                 // work_id