Revert "作废"

This reverts commit 139d3509f4.

app/common/controller/FinReceiptController.php

@@ -41,22 +41,6 @@ class FinReceiptController extends BaseController
         }
     }
 
-    /**
-     * 确认入账
-     * @param Request $request
-     * @return \support\Response
-     */
-    public function delete(Request $request)
-    {
-        try {
-            $id = $request->input('id');
-            $raw = $this->service->delete($id);
-            return $this->success($raw);
-        } catch (\Throwable $e) {
-            return $this->error($e->getMessage());
-        }
-    }
-
     public function show(Request $request)
     {
         try {

app/common/model/FinReceipt.php

@@ -2,12 +2,10 @@
 
 namespace app\common\model;
 
-use Illuminate\Database\Eloquent\SoftDeletes;
 use support\Model;
 
 class FinReceipt extends Model
 {
-    use SoftDeletes;
     /**
      * The connection name for the model.
      *

app/common/service/FinReceiptService.php

@@ -233,12 +233,6 @@ class FinReceiptService
             $query->where('submit_files','!=','');
         }
 
-        if($param['scene'] == 'delete'){ //查询作废数据
-            $query->onlyTrashed();
-        }elseif ($param['scene'] == 'all'){ //查询包含作废数据的全量数据
-            $query->withTrashed();
-        }
-
         if (isset($param['scene']) && ($param['scene'] == 'list' ||$param['scene'] == 'pending')) {
             return $query->paginate($limit, ['*'], 'page', $page);
         }
@@ -299,13 +293,6 @@ class FinReceiptService
         return $res;
     }
 
-
-    public function delete($id)
-    {
-        $res = FinReceipt::where('id', $id)->delete();
-        return $res;
-    }
-
     /**
      * 更新：绑定收款记录，计算折让金额
      * @param Request $request

config/route.php

@@ -359,8 +359,8 @@ Route::group('/admin', function () {
         Route::any('/store', [app\common\controller\FinReceiptController::class, 'store']);
         Route::any('/update', [app\common\controller\FinReceiptController::class, 'update']);
         Route::any('/payment', [app\common\controller\FinReceiptController::class, 'payment']);
+        Route::any('/destroy', [app\common\controller\FinReceiptController::class, 'destroy']);
         Route::any('/credit', [app\common\controller\FinReceiptController::class, 'credit']);
-        Route::any('/delete', [app\common\controller\FinReceiptController::class, 'delete']);
     });
     // 收款记录历史
     Route::group('/receipt/his', function () {