Browse Source

update combine goods

ayHaru 4 years ago
parent
commit
db8a1f447d
1 changed files with 11 additions and 3 deletions
  1. 11 3
      helper/refill/RefillFactory.php

+ 11 - 3
helper/refill/RefillFactory.php

@@ -91,8 +91,8 @@ class RefillFactory
     {
         global $config;
 
-        $oil = $this->combine_goods($config['oil_providers']);
-        $phone = $this->combine_goods($config['phone_providers']);
+        $oil = $this->combine_goods($config['oil_providers'], 1);
+        $phone = $this->combine_goods($config['phone_providers'], 2);
 
         return array_merge($oil, $phone);
     }
@@ -102,11 +102,19 @@ class RefillFactory
         return ['oil' => $this->mOilProvider,'phone' => $this->mPhoneProvider];
     }
 
-    private function combine_goods($configs)
+    private function combine_goods($configs,$type)
     {
+        $mod_prov = Model('refill_provider');
+        $provider_items = $mod_prov->getProviderList(['type' => $type]);
+        foreach ($provider_items as $item) {
+            $providers[$item['name']] = $item;
+        }
         $result = [];
         foreach ($configs as $item)
         {
+            if($providers[$item['name']]['opened'] != 1) {
+                continue;
+            }
             $cfg = $item['cfg'];
 
             $card_types = $cfg['card_type'] ?? [];