modify some logic

admin/control/merchant.php

@@ -1204,34 +1204,26 @@ class merchantControl extends SystemControl
     {
         $model_merchant = Model('merchant');
         $merchant = $model_merchant->getMerchantInfo(['mchid' => $mchid], '*', true);
+
         $org_quality = $merchant['quality'];
-        $retry_times = $this->merchant_retry_times($merchant);
+        $retry_times_cfg = $this->merchant_retry_times($merchant);
 
         $day_timeout = 0;
         $night_timeout = 0;
-        $quality_group = [
-            refill\Quality::SlowNormal,refill\Quality::ThirdNormal,refill\Quality::DefSuccess,
-            refill\Quality::NormalQuick,refill\Quality::SlowSixNormal,
-        ];
-        $quality_ploy = new quality_ploy();
 
-        if (in_array($org_quality, $qualitys)) {
-            if (!empty($retry_times['qualities'][$org_quality])) {
-                $day_timeout = $retry_times['qualities'][$org_quality]['day_secs'] ?? 0;
-                $night_timeout = $retry_times['qualities'][$org_quality]['night_secs'] ?? 0;
-            }
-        } elseif(in_array($org_quality, $quality_group)) {
-            $qualities = $quality_ploy->qualities($org_quality);
-            foreach($qualities as $quality) {
-                $day_timeout += $retry_times['qualities'][$quality]['day_secs'];
-                $night_timeout += $retry_times['qualities'][$quality]['night_secs'];
-            }
+        $quality_ploy = new quality_ploy();
+        $qualities = $quality_ploy->qualities($org_quality);
+        foreach ($qualities as $quality) {
+            $day_timeout += $retry_times_cfg['qualities'][$quality]['day_secs'];
+            $night_timeout += $retry_times_cfg['qualities'][$quality]['night_secs'];
         }
+
         if ($this->is_day()) {
             $time_out = $day_timeout;
         } else {
             $time_out = $night_timeout;
         }
+
         $update['day_timeout'] = $day_timeout;
         $update['night_timeout'] = $night_timeout;
         $update['time_out'] = $time_out;
@@ -1241,7 +1233,7 @@ class merchantControl extends SystemControl
     private function is_day(): bool
     {
         $hour = date("H");
-        if ($hour >= 0 && $hour < 6) {
+        if ($hour >= 23 || $hour <= 7) {
             return false;
         } else {
             return true;

docker/compose/xyz/conf/crontab/slave_root

@@ -15,7 +15,8 @@
 #0   0    *   *   *   php /var/www/html/crontab/index.php date merchant_available
 */1    *   *   *   *   php /var/www/html/crontab/index.php minutes update_channel_balance
 0   1   *   *   *   php /var/www/html/crontab/index.php date refill_clear
-#0   8   *   *   *   sh /mnt/xyzshop/util/purge.sh
-1   0   *   *   *   php /var/www/html/crontab/index.php date merchant_nightime
-1   6   *   *   *   php /var/www/html/crontab/index.php date merchant_daytime
+#0   8   *   *   *   sh /mnt/xyzshop/util/purge.sh #挪到了系统的crontab 执行了
+
+0   23   *   *   *   php /var/www/html/crontab/index.php date merchant_nightime
+0   7    *   *   *   php /var/www/html/crontab/index.php date merchant_daytime
 0   0    *   *   *   php /var/www/html/crontab/index.php date merchant_available

docker/compose/yl/conf/crontab/slave_root

@@ -2,6 +2,6 @@
 # min	hour	day	month	weekday	command
 */1    *   *   *   *   php /var/www/html/crontab/index.php minutes update_channel_balance
 0   1   *   *   *   php /var/www/html/crontab/index.php date refill_clear
-1   0   *   *   *   php /var/www/html/crontab/index.php date merchant_nightime
-1   6   *   *   *   php /var/www/html/crontab/index.php date merchant_daytime
+0   23   *   *   *   php /var/www/html/crontab/index.php date merchant_nightime
+0   7    *   *   *   php /var/www/html/crontab/index.php date merchant_daytime
 0   0    *   *   *  php /var/www/html/crontab/index.php date merchant_available

helper/refill/policy/mavg_price.php

@@ -2,7 +2,7 @@
 
 namespace refill;
 
-class mavg_price
+class  mavg_price
 {
     private $mMchidPrices;
     public function __construct()

helper/refill/policy/mchctl.php

@@ -16,11 +16,6 @@ class mchctl
         $this->update_ctl();
     }
 
-    private function update_price()
-    {
-
-    }
-
     private function update_ctl()
     {
         $this->mMchidMapCtls = [];