分离钱包和提现

@@ -8,6 +8,7 @@ use App\Http\Requests\Musician\MusicianWithdrawReceiptByNameRequest;
 use App\Http\Requests\Musician\MusicianWithdrawReceiptRequest;
 use App\Http\Requests\Musician\MusicianWithdrawReceiptRequest;
 use App\Http\Requests\Musician\MusicianWithdrawRequest;
 use App\Http\Requests\Musician\MusicianWithdrawRequest;
 use App\Http\Requests\Musician\MusicianWithdrawStatusRequest;
 use App\Http\Requests\Musician\MusicianWithdrawStatusRequest;
+use App\Services\MusicianWalletService;
 use App\Services\MusicianWithdrawService;
 use App\Services\MusicianWithdrawService;
 
 
 /**
 /**
@@ -19,15 +20,15 @@ class MusicianWalletController extends Controller
     /**
     /**
      * @var MusicianWithdrawService
      * @var MusicianWithdrawService
      */
      */
-    protected $musicianWithdrawService;
+    protected $musicianWalletService;
 
 
     /**
     /**
-     * MusicianWithdrawController constructor.
-     * @param MusicianWithdrawService $musicianWithdrawService
+     * MusicianWalletController constructor.
+     * @param MusicianWalletService $musicianWalletService
      */
      */
-    public function __construct(MusicianWithdrawService $musicianWithdrawService)
+    public function __construct(MusicianWalletService $musicianWalletService)
     {
     {
-        $this->musicianWithdrawService = $musicianWithdrawService;
+        $this->musicianWalletService = $musicianWalletService;
     }
     }
 
 
     /**
     /**
@@ -36,7 +37,7 @@ class MusicianWalletController extends Controller
      */
      */
     public function walletDetail(MusicianWalletDetailRequest $request)
     public function walletDetail(MusicianWalletDetailRequest $request)
     {
     {
-        return $this->musicianWithdrawService->walletDetail();
+        return $this->musicianWalletService->walletDetail();
     }
     }
 
 
 }
 }

+<?php
+
+namespace App\Services;
+
+use App\Helper\CacheKeyTools;
+use App\Helper\ErrorCode;
+use App\Helper\RedisClient;
+use App\Helper\Response;
+use App\Models\Legal\Company;
+use App\Models\Legal\Contract;
+use App\Models\Legal\StakeholderBalanceByPayer;
+use App\Models\Legal\StakeholderBalanceDetail;
+use App\Models\Legal\StakeholderIncomeSyncApp;
+use App\Models\Legal\StakeholderIncomeSyncAppDetails;
+use App\Models\Legal\StakeholderPrepaid;
+use App\Models\Legal\StakeholderSongCollate;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+
+/**
+ * Class MusicianWalletService
+ * @package App\Services
+ */
+class MusicianWalletService extends Service
+{
+    /**
+     * 返回账单详情
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function walletDetail()
+    {
+        $app = StakeholderIncomeSyncApp::query()->where(['serial_no'=>$this->request->input('serial_no'), 'sync_status'=>1])->first();
+        if (empty($app)) return Response::error(ErrorCode::ORDER_NO_FOUND);
+
+        $collate = StakeholderSongCollate::query()->where([
+                        'bills_id'=>$app->related_id, 'stakeholder_id'=>$app->stakeholder_id, 'subject_no'=>$app->subject_no
+                    ])->select(['song_id', 'role', 'cost_amount', 'deduct_prepaid as deduct_amount', 'real_share_amount', 'name', 'singer'])
+                    ->paginate($this->pageSize);
+
+        foreach ($collate as &$item) {
+           $item->setAttribute('role', Contract::transformRole($item->role));
+        }
+
+        return Response::success($collate);
+    }
+}

@@ -24,27 +24,6 @@ use Illuminate\Support\Facades\Log;
 class MusicianWithdrawService extends Service
 class MusicianWithdrawService extends Service
 {
 {
     /**
     /**
-     * 返回账单详情
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function walletDetail()
-    {
-        $app = StakeholderIncomeSyncApp::query()->where(['serial_no'=>$this->request->input('serial_no'), 'sync_status'=>1])->first();
-        if (empty($app)) return Response::error(ErrorCode::ORDER_NO_FOUND);
-
-        $collate = StakeholderSongCollate::query()->where([
-                        'bills_id'=>$app->related_id, 'stakeholder_id'=>$app->stakeholder_id, 'subject_no'=>$app->subject_no
-                    ])->select(['song_id', 'role', 'cost_amount', 'deduct_prepaid as deduct_amount', 'real_share_amount', 'name', 'singer'])
-                    ->paginate($this->pageSize);
-
-        foreach ($collate as &$item) {
-           $item->setAttribute('role', Contract::transformRole($item->role));
-        }
-
-        return Response::success($collate);
-    }
-
-    /**
      * 发票信息 - 通过名字
      * 发票信息 - 通过名字
      * @return \Illuminate\Http\JsonResponse|mixed
      * @return \Illuminate\Http\JsonResponse|mixed
      */
      */