debug

data/config/lingzh/refill.ini.php

@@ -1,5 +1,7 @@
 <?php
 
+global $config;
+
 $config['refill_oil_specs'] = [100 , 200 , 500 , 1000 , 2000];
 $config['refill_phone_specs'] = [10 , 20 , 30 , 50 , 100 , 200 , 300 , 500];
 //充值额度基本表

docker/compose/xyz-acc/docker-compose.yml

@@ -39,6 +39,8 @@ services:
       - ../../conf/php/lz-mobile-spwan-start:/usr/local/bin/docker-spwan-start
     container_name: "panda-mobile"
     command: ['docker-spwan-start']
+    depends_on:
+      - "redisrv"
 
   raccsrv:
     image: php-zts-debug:7.3.18
@@ -53,6 +55,8 @@ services:
       - ../../conf/php/racc-spwan-start-lz:/usr/local/bin/docker-spwan-start
     container_name: "panda-racc"
     command: [docker-spwan-start]
+    depends_on:
+      - "redisrv"
 
   websrv:
     image: php-fpm:alpine
@@ -67,6 +71,8 @@ services:
       - ../../conf/php-fpm/php-fpm.conf:/usr/local/etc/php-fpm.conf
     container_name: "panda-web"
     command: [php-fpm]
+    depends_on:
+      - "redisrv"
 
   crontabsrv:
     image: php-zts-debug:7.3.18
@@ -79,6 +85,8 @@ services:
       - ../../conf/crontab/root:/var/spool/cron/crontabs/root
     container_name: "panda-crontab"
     command: [crond,"-f"]
+    depends_on:
+      - "redisrv"
 
   phpcli:
     image: php-zts-debug:7.3.18
@@ -88,4 +96,6 @@ services:
       - ../../../:/var/www/html
       - /nfs/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
-    container_name: "panda-php"
+    container_name: "panda-php"
+    depends_on:
+      - "redisrv"

helper/refill/ProviderManager.php

@@ -216,42 +216,6 @@ class ProviderManager
         }
     }
 
-    public 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'] ?? [];
-            $amounts = $cfg['amount'] ?? [];
-
-            foreach ($card_types as $type) {
-                if (array_key_exists($type, $result)) {
-                    $item = $result[$type];
-                } else {
-                    $item = [];
-                }
-
-                foreach ($amounts as $amount => $val) {
-                    $item[] = $amount;
-                }
-                $item = array_unique($item);
-                $result[$type] = $item;
-            }
-        }
-
-        return $result;
-    }
-
     public function goods()
     {
         //$this->mSpecTypes[$quality]["{$type}-{$spec}"][] = $name;