Browse Source

修改bug

lip 11 hours ago
parent
commit
e7eb65b7f3

+ 3 - 4
app/Http/Controllers/admin/PaymentOrder.php

@@ -187,7 +187,7 @@ class PaymentOrder extends Controller
                 'page' => ['nullable', 'integer', 'min:1'],
                 'limit' => ['nullable', 'integer', 'min:1'],
                 'order_no' => ['nullable', 'string'],
-                'status' => ['nullable', 'integer', 'in:0,1,2,3'],
+                'status' => ['nullable', 'integer'],
                 'member_id' => ['nullable', 'integer'],
                 'first_name' => ['nullable'],
                 'payment_type' => ['nullable', 'integer'],
@@ -234,9 +234,8 @@ class PaymentOrder extends Controller
                 'ids.*' => ['required', 'integer', 'min:1'],
                 'is_locked' => ['required', 'integer', 'in:1,0'],
             ]);
-            foreach ($params['ids'] as $id) {
-                PaymentOrderModel::whereIn('id',$id)->whereIn('type',[2,4])->update('is_locked',$params['is_locked']);
-            }
+            PaymentOrderModel::whereIn('id',$params['ids'])->whereIn('type',[2,4])->update(['is_locked' => $params['is_locked']]);
+            
             DB::commit();
         } catch (ValidationException $e) {
             DB::rollBack();

+ 4 - 5
app/Http/Controllers/admin/Withdraw.php

@@ -50,7 +50,7 @@ class Withdraw extends Controller
                 'limit' => ['nullable', 'integer', 'min:1'],
                 'type' => ['nullable', 'integer'],
                 'member_id' => ['nullable', 'string', 'min:1'],
-                'status' => ['nullable', 'integer', 'min:0', 'max:3'],
+                'status' => ['nullable', 'integer'],
                 'first_name' => ['nullable'],
             ]);
             $page = request()->input('page', 1);
@@ -118,7 +118,7 @@ class Withdraw extends Controller
                 'page' => ['nullable', 'integer', 'min:1'],
                 'limit' => ['nullable', 'integer', 'min:1'],
                 'member_id' => ['nullable', 'string', 'min:1'],
-                'status' => ['nullable', 'integer', 'min:0', 'max:2'],
+                'status' => ['nullable', 'integer'],
                 'first_name' => ['nullable'],
             ]);
             $page = request()->input('page', 1);
@@ -222,9 +222,8 @@ class Withdraw extends Controller
                 'ids.*' => ['required', 'integer', 'min:1'],
                 'is_locked' => ['required', 'integer', 'in:1,0'],
             ]);
-            foreach ($params['ids'] as $id) {
-                $count += WithdrawModel::whereIn('id',$id)->update('is_locked',$params['is_locked']);
-            }
+            WithdrawModel::whereIn('id',$params['ids'])->update(['is_locked' => $params['is_locked']]);
+
             DB::commit();
         } catch (ValidationException $e) {
             DB::rollBack();

+ 3 - 0
app/Models/RechargeChannel.php

@@ -39,6 +39,7 @@ class RechargeChannel extends BaseModel
 
     public static function getFormatChannel($data_type, $recharge_channel_group_id = 1)
     {
+        $recharge_channel_group_id = $recharge_channel_group_id > 0 ? $recharge_channel_group_id : 1;
         $query = self::where(['status' => 1, 'data_type' => $data_type]);
         
         $field = 'recharge_type'; //充值类型
@@ -96,6 +97,7 @@ class RechargeChannel extends BaseModel
     
     //校验是否支持此提现方式
     public static function checkWithdrawChannel($type, $recharge_channel_group_id = 1) {
+        $recharge_channel_group_id = $recharge_channel_group_id > 0 ? $recharge_channel_group_id : 1;
         $withdraw_type = RechargeChannelGroup::where('id', $recharge_channel_group_id)->value('withdraw_type');
         if (in_array($type, $withdraw_type)) {
             return true;
@@ -106,6 +108,7 @@ class RechargeChannel extends BaseModel
     
     //校验是否支持此充值方式
     public static function checkRechargeChannel($type, $recharge_channel_group_id = 1) {
+        $recharge_channel_group_id = $recharge_channel_group_id > 0 ? $recharge_channel_group_id : 1;
         $recharge_type = RechargeChannelGroup::where('id', $recharge_channel_group_id)->value('recharge_type');
         if (in_array($type, $recharge_type)) {
             return true;