Commit aeef5467 aeef54675fdf1c369bfa53415c9e529b4eab4592 by lemon

数据同步

1 parent 7ab4b25a
...@@ -77,8 +77,10 @@ class StakeholderIncomeSyncCommand extends Command ...@@ -77,8 +77,10 @@ class StakeholderIncomeSyncCommand extends Command
77 77
78 Log::channel('api')->warning(__METHOD__."streamid:{$id}-即将处理任务", ['item'=>$msg[$key][$id]]); 78 Log::channel('api')->warning(__METHOD__."streamid:{$id}-即将处理任务", ['item'=>$msg[$key][$id]]);
79 79
80
80 //获取记录 81 //获取记录
81 if ($http_data = $this->resolveSyncData($serial_no)) { 82 if ($http_data = $this->resolveSyncData($serial_no)) {
83
82 //http 84 //http
83 $http_res = ApiService::walletAddIncome($http_data); 85 $http_res = ApiService::walletAddIncome($http_data);
84 86
......
...@@ -50,11 +50,11 @@ class MusicianWithdrawController extends Controller ...@@ -50,11 +50,11 @@ class MusicianWithdrawController extends Controller
50 } 50 }
51 51
52 /** 52 /**
53 * 提现修改状态 53 * 提现状态修改
54 * @return \Illuminate\Http\JsonResponse 54 * @return \Illuminate\Http\JsonResponse
55 */ 55 */
56 public function status(MusicianWithdrawStatusRequest $request) 56 public function cashOut(MusicianWithdrawStatusRequest $request)
57 { 57 {
58 return $this->musicianWithdrawService->changeStatus(); 58 return $this->musicianWithdrawService->cashOut();
59 } 59 }
60 } 60 }
......
...@@ -28,7 +28,7 @@ class MusicianWithdrawStatusRequest extends FormRequest ...@@ -28,7 +28,7 @@ class MusicianWithdrawStatusRequest extends FormRequest
28 public function rules() 28 public function rules()
29 { 29 {
30 return [ 30 return [
31 'serial_no' => ['required', 'bail', 'array', 'filled'], 31 'serial_no' => ['required', 'bail'],
32 'type' => ['required', 'bail', 'in:success,fail,advance'], 32 'type' => ['required', 'bail', 'in:success,fail,advance'],
33 ]; 33 ];
34 } 34 }
......
...@@ -114,12 +114,15 @@ class MusicianWithdrawService extends Service ...@@ -114,12 +114,15 @@ class MusicianWithdrawService extends Service
114 * 修改提现状态 114 * 修改提现状态
115 * @return \Illuminate\Http\JsonResponse|mixed 115 * @return \Illuminate\Http\JsonResponse|mixed
116 */ 116 */
117 public function changeStatus() 117 public function cashOut()
118 { 118 {
119 $withdraw_status = ''; 119 $withdraw_status = '';
120 120
121 $query = StakeholderIncomeSyncAppDetails::query()->where(['sync_status'=>1, 'identifier'=>$this->identifier->identifier]) 121 /*
122 ->whereIn('serial_no', $this->request->input('busi_id')); 122 $query = StakeholderIncomeSyncApp::query()->where(['serial_no'=>$this->request->'' ,'sync_status'=>1, 'identifier'=>$this->identifier->identifier])
123 ->whereIn('serial_no', $this->request->serial_no);
124 */
125
123 126
124 if ($query->update(['withdraw_status'=>$withdraw_status])) { 127 if ($query->update(['withdraw_status'=>$withdraw_status])) {
125 return Response::success(); 128 return Response::success();
......
...@@ -17,7 +17,7 @@ trait Bills ...@@ -17,7 +17,7 @@ trait Bills
17 * 获取账单名字 17 * 获取账单名字
18 * @param \App\Models\Legal\Bills $bills 18 * @param \App\Models\Legal\Bills $bills
19 */ 19 */
20 public function billsTitle(\App\Models\Legal\Bills $bills) 20 public function billsTitle($bills)
21 { 21 {
22 $start_month = date('m', strtotime($bills->bill_section_start)); 22 $start_month = date('m', strtotime($bills->bill_section_start));
23 $end_month = date('m', strtotime($bills->bill_section_end)); 23 $end_month = date('m', strtotime($bills->bill_section_end));
......
...@@ -40,7 +40,7 @@ Route::group([], function (){ ...@@ -40,7 +40,7 @@ Route::group([], function (){
40 //账单状态修改 40 //账单状态修改
41 Route::post('withdraw/bill_confirm', 'MusicianWithdrawController@billConfirm'); 41 Route::post('withdraw/bill_confirm', 'MusicianWithdrawController@billConfirm');
42 //账单状态修改 42 //账单状态修改
43 Route::post('withdraw/status', 'MusicianWithdrawController@status'); 43 Route::post('withdraw/status', 'MusicianWithdrawController@cashOut');
44 //钱包-账单收益 44 //钱包-账单收益
45 Route::get('wallet/detail', 'MusicianWalletController@walletDetail'); 45 Route::get('wallet/detail', 'MusicianWalletController@walletDetail');
46 46
......