1

app/Service/PaymentReceiptService.php

@@ -36,9 +36,15 @@ class PaymentReceiptService extends Service
             $model->save();
 
             $time = time();
+            $old = PaymentReceiptInfo::where('del_time',0)
+                ->where('payment_receipt_id',$data['id'])
+                ->select('file')
+                ->get()->toArray();
+            $old = array_column($old,'file');
             PaymentReceiptInfo::where('del_time',0)
                 ->where('payment_receipt_id',$data['id'])
                 ->update(['del_time' => $time]);
+            $new = [];
             if(! empty($data['file'])){
                 $insert = [];
                 foreach ($data['file'] as $value){
@@ -50,6 +56,7 @@ class PaymentReceiptService extends Service
                         'crt_time' => $time,
                     ];
                 }
+                $new[]= $value['url'];
                 PaymentReceiptInfo::insert($insert);
             }
             if(! empty($data['employee_one'])){
@@ -71,6 +78,8 @@ class PaymentReceiptService extends Service
             return [false,$exception->getMessage()];
         }
 
+        $this->delStorageFile($old, $new);
+
         return [true,''];
     }
 
@@ -166,8 +175,18 @@ class PaymentReceiptService extends Service
             ->first();
         if(empty($customer)) return [false,'记录不存在或已被删除'];
         $customer = $customer->toArray();
+        $array = [
+            $customer['account'],
+            $customer['pay_way'],
+        ];
+        $basic_map = BasicType::whereIn('id',$array)
+            ->pluck('title','id')
+            ->toArray();
+        $customer['account_title'] = $basic_map[$customer['account']] ?? "";
+        $customer['pay_way_title'] = $basic_map[$customer['pay_way']] ?? "";
         $customer['state_title'] = PaymentReceipt::$name[$customer['state']] ?? "";
         $customer['type_title'] = PaymentReceipt::$model_type[$customer['type']] ?? "";
+        $customer['data_type_title'] = PaymentReceipt::$data_type[$customer['data_type']] ?? "";
         $customer['crt_name'] = Employee::where('id',$customer['crt_id'])->value('emp_name');
         $customer['crt_time'] = $customer['crt_time'] ? date("Y-m-d H:i:s",$customer['crt_time']): '';
         $customer['payment_receipt_date'] = $customer['payment_receipt_date'] ? date("Y-m-d",$customer['payment_receipt_date']): '';