修改充值通道配置

app/Http/Controllers/admin/RechargeChannel.php

@@ -39,10 +39,11 @@ class RechargeChannel extends Controller
         try {
             $params = request()->validate([
                 'id' => ['nullable','integer'],
-                'name' => ['nullable','string'],
-                'channel_ids' => ['nullable','string'],
+                'name' => ['required','string'],
+                'channel_ids' => ['required','array'],
             ]);
             
+            $params['channel_ids'] = implode(',', $params['channel_ids']);
             if (empty($params['id'])) {
                 RechargeChannelGroup::create($params);
             } else {

app/Models/RechargeChannel.php

@@ -9,6 +9,11 @@ class RechargeChannel extends BaseModel
     protected $fillable = ['key', 'name', 'type', 'rate','min','max' ,'fixed' ,'sort'];
     protected $hidden = [];
 
+    public function getFixedAttribute($value)
+    {
+        return $value ? explode(',', $value) : null; 
+    }
+
     //获取充值通道
     public static function product($from = '')
     {
@@ -30,12 +35,12 @@ class RechargeChannel extends BaseModel
                 $where['id'] = ['in', $channel_ids];
             }
         }
-        $product = self::where($where)->orderBy('sort', 'asc')->get()->toArray();
+        $product = self::where($where)->orderBy('sort', 'asc')->select(['name','type','min','max','fixed','rate'])->get()->toArray();
         
         $list = [];
-        $config = [];
-        foreach($product as $pv) {
-            if ($config) {
+        foreach($product as $key => $pv) {
+            if (isset($list[$pv['type']]['config'])) {
+                $config = $list[$pv['type']]['config'];
                 if (empty($config['range'])) {
                     $config['range'][] = $config;
                 }
@@ -56,13 +61,16 @@ class RechargeChannel extends BaseModel
             } else {
                 $config = $pv;
             }
+            
+            $list[$pv['type']] = [
+                'key' => $key,
+                'label' => lang($pv['name']),
+                'value' => $pv['type'],
+                'config' => $config ?? [],
+            ];
         }
-        $list[] = [
-            'label' => lang($pv['type']),
-            'value' => $pv['type'],
-            'config' => $config ?? [],
-        ];
+        $list = array_column($list, null, 'key');
     
-        return $list;
+        return array_values($list);
     }
 }

app/Models/RechargeChannelGroup.php

@@ -9,6 +9,11 @@ class RechargeChannelGroup extends BaseModel
     protected $fillable = ['name', 'channel_ids'];
     protected $hidden = [];
 
+    public function getChannelIdsAttribute($value)
+    {
+        return $value ? explode(',', $value) : []; 
+    }
+
     public function rechargeChannel()
     {
         return $this->hasMany(RechargeChannel::class, 'channel_ids', 'id');