Merge branch 'raccount' into rchannel

data/config/xyz/refill.ini.php

@@ -2570,9 +2570,9 @@ $guochuang_nation_phone = ['name' => 'guochuang_nation', 'store_id' => 121, 'qua
         ],
 
         10 => [
-            ['goods_id' => 7060, 'price' => 10.31, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7060, 'price' => 10.11, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7060, 'price' => 10.26, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7060, 'price' => 10.46, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7060, 'price' => 10.05, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7060, 'price' => 10.22, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         20 => [
             ['goods_id' => 7061, 'price' => 20.32, 'quality' => 2, 'card_type' => 'chinamobile'],

docker/compose/xyz/conf/crontab/slave_root

@@ -13,10 +13,9 @@
 #0   3   1   */1 *   php /var/www/html/crontab/index.php month index
 #0   1   *   *   *   php /var/www/html/crontab/index.php date _order_stats
 #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   5   *   *   *   php /var/www/html/crontab/index.php sh /var/www/html/util/purge.sh
+#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   0    *   *   *   php /var/www/html/crontab/index.php date merchant_available

util/test.sh

@@ -14,16 +14,12 @@ time_diff() {
 }
 
 time_diff
+echo $cur_diff,$min_diff
 
-# shellcheck disable=SC2154
-if [[ $cur_diff > ${min_diff} ]]; then
+if [[ $cur_diff -gt $min_diff ]]; then
   echo 'can purge'
 else
-  echo 'cannot purge'
+  echo '请等到凌晨一点后删除'
+  exit
 fi
 
-
-today=$(date "+%Y-%m-%d")
-command="PURGE master LOGS BEFORE '${today} 00:00:00'; "
-echo $command
-