Merge branch 'raccount' into rchannel

admin/control/merchant.php

@@ -1114,6 +1114,8 @@ class merchantControl extends SystemControl
 
             $retry_times_data = function ($qualitys){
                 $qualities = [];
+                $day_secs_total = 0;
+                $night_secs_total = 0;
                 foreach ($qualitys as $quality) {
                     $quality = intval($quality);
                     $day_secs_key = "{$quality}-day_secs";
@@ -1121,6 +1123,8 @@ class merchantControl extends SystemControl
                     $times_key = "{$quality}-times";
                     if(!empty($_POST[$day_secs_key]) && !empty($_POST[$night_secs_key]) && !empty($_POST[$times_key])) {
                         $qualities[$quality] = ['day_secs' => intval($_POST[$day_secs_key]), 'night_secs' => intval($_POST[$night_secs_key]), 'times' => intval($_POST[$times_key])];
+                        $day_secs_total += $_POST[$day_secs_key];
+                        $night_secs_total += $_POST[$night_secs_key];
                     }
                 }
                 $retry_times_cfg['qualities'] = $qualities;
@@ -1131,13 +1135,21 @@ class merchantControl extends SystemControl
                 $retry_times_cfg['profit_ratio'] = $profit_ratio;
                 $profit_formula = $_POST['profit_formula'] ?? '';
                 $retry_times_cfg['profit_formula'] = $profit_formula;
-                return serialize($retry_times_cfg);
+                return [serialize($retry_times_cfg), $day_secs_total, $night_secs_total];
             };
+            [$retry_times_cfg, $day_secs_total, $night_secs_total] = $retry_times_data($qualitys);
 
             $update['quality'] = intval($_POST['quality']);
             $update['oil_quality'] = intval($_POST['oil_quality']);
             $update['intercept_cfg'] = $intercept_data();
-            $update['retry_times_cfg'] = $retry_times_data($qualitys);
+            $update['retry_times_cfg'] = $retry_times_cfg;
+            if(!empty($day_secs_total)) {
+                $update['day_timeout'] = $day_secs_total;
+            }
+            if(!empty($night_secs_total)) {
+                $update['night_timeout'] = $night_secs_total;
+            }
+
             $resp = $model_merchant->editMerchant($update, ['mchid' => $mchid]);
             if ($resp) {
                 showMessage('操作成功', 'index.php?act=merchant&op=merchant');

admin/control/orderstats.php

@@ -12,6 +12,7 @@ class orderstatsControl extends SystemControl
     {
         $type = $_GET['type'] ?? 'system';
         $page = "{$type}.order.stats";
+        $_GET['query_start_time'] = $_GET['query_start_time'] ?? date("Y-m-d 00:00:00", strtotime("-1 day"));
         $model_refill_order = Model('refill_order');
         $condition['type'] = $type;
         if (!empty($_GET['cid'])) {

data/config/xyz/refill.ini.php

@@ -933,7 +933,8 @@ $qianqian_phone = ['name' => 'qianqian', 'store_id' => 48, 'qualitys' => '1',
 //        ],
         30 => [
             ['goods_id' => 6529, 'price' => 28.59, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6529, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6529, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6529, 'price' => 28.65, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 6530, 'price' => 47.65, 'quality' => 1, 'card_type' => 'chinamobile'],
@@ -1950,27 +1951,27 @@ $xinhengyang_phone = ['name' => 'xinhengyang', 'store_id' => 100, 'qualitys' =>
 //        20 => [['goods_id' => 6894, 'price' => 19.12, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
         30 => [
             ['goods_id' => 6895, 'price' => 28.77, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6895, 'price' => 28.47, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6895, 'price' => 28.26, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6895, 'price' => 28.62, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 6896, 'price' => 47.95, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6896, 'price' => 47.45, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6896, 'price' => 47.1, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6896, 'price' => 47.7, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 6897, 'price' => 95.9, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6897, 'price' => 94.9, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6897, 'price' => 94.2, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6897, 'price' => 95.4, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 6898, 'price' => 191.8, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6898, 'price' => 189.8, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6898, 'price' => 188.4, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6898, 'price' => 190.8, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 6899, 'price' => 287.7, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6899, 'price' => 284.7, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6899, 'price' => 282.6, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6899, 'price' => 286.2, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
 //        500 => [['goods_id' => 6900, 'price' => 478, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
@@ -2581,27 +2582,27 @@ $guochuang_nation_phone = ['name' => 'guochuang_nation', 'store_id' => 121, 'qua
         ],
         30 => [
             ['goods_id' => 7062, 'price' => 30.33, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7062, 'price' => 30.024, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7062, 'price' => 30.03, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7062, 'price' => 30.33, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 7063, 'price' => 50.125, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7063, 'price' => 50.04, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7063, 'price' => 50.05, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7063, 'price' => 50.35, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 7064, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7064, 'price' => 100.08, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7064, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7064, 'price' => 100.4, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 7065, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7065, 'price' => 200.16, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7065, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7065, 'price' => 200.46, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 7066, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7066, 'price' => 300.24, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7066, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7066, 'price' => 300.69, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
@@ -4316,32 +4317,32 @@ $huoshenguo_phone = ['name' => 'huoshenguo', 'store_id' => 180,'qualitys' => '1'
 //        ],
         30 => [
             ['goods_id' => 7522, 'price' => 28.74, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7522, 'price' => 28.38, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7522, 'price' => 28.26, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7522, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 7523, 'price' => 47.9, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7523, 'price' => 47.3, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7523, 'price' => 47.1, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7523, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 7524, 'price' => 95.8, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7524, 'price' => 94.6, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7524, 'price' => 94.2, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7524, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 7525, 'price' => 191.6, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7525, 'price' => 189.2, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7525, 'price' => 188.4, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7525, 'price' => 189.6, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 7526, 'price' => 287.4, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7526, 'price' => 283.8, 'quality' => 1, 'card_type' => 'chinaunicom'],
+//            ['goods_id' => 7526, 'price' => 283.8, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7526, 'price' => 284.4, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         500 => [
             ['goods_id' => 7527, 'price' => 479, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7527, 'price' => 473, 'quality' => 1, 'card_type' => 'chinaunicom'],
+//            ['goods_id' => 7527, 'price' => 473, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7527, 'price' => 474, 'quality' => 1, 'card_type' => 'chinatelecom']
         ]
     ],
@@ -4410,17 +4411,17 @@ $chizeng_normal_phone = ['name' => 'chizeng_normal', 'store_id' => 182,'qualitys
             ['goods_id' => 7538, 'price' => 28.65, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 7539, 'price' => 47.9, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7539, 'price' => 47.75, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7539, 'price' => 47.75, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7539, 'price' => 47.75, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 7540, 'price' => 95.8, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7540, 'price' => 95.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7540, 'price' => 95.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7540, 'price' => 95.5, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
-            ['goods_id' => 7541, 'price' => 191.6, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7541, 'price' => 191, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7541, 'price' => 191, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7541, 'price' => 191, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
@@ -4558,22 +4559,22 @@ $ruixunda_lt_phone = ['name' => 'ruixunda_lt', 'store_id' => 187,'qualitys' => '
 //        10 => [['goods_id' => 7585, 'price' => 9.45, 'quality' => 1, 'card_type' => 'chinaunicom']],
 //        20 => [['goods_id' => 7586, 'price' => 18.9, 'quality' => 1, 'card_type' => 'chinaunicom']],
         30 => [
-            ['goods_id' => 7587, 'price' => 28.86, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7587, 'price' => 28.71, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7587, 'price' => 28.26, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7587, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 7588, 'price' => 48.1, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7588, 'price' => 47.85, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7588, 'price' => 47.1, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7588, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 7589, 'price' => 96.2, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7589, 'price' => 95.7, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7589, 'price' => 94.2, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7589, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
-            ['goods_id' => 7590, 'price' => 192.4, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7590, 'price' => 191.4, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7590, 'price' => 188.4, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7590, 'price' => 189.6, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],

helper/refill/api/xyz/guochuang/config.php

@@ -64,15 +64,15 @@ class config
     const Price = [
         //移动
         "4-10-2" => 9.99, "4-20-2" => 19.98, "4-30-2" => 29.895, "4-50-2" => 49.825, "4-100-2" => 99.65, "4-200-2" => 199.3, "4-300-2" => 298.95, "4-500-2" => 498.25,//天津 2
-        "4-10-6" => 9.745, "4-20-6" => 19.49, "4-30-6" => 29.235, "4-50-6" => 48.725, "4-100-6" => 97.45, "4-200-6" => 194.9, "4-300-6" => 292.35, "4-500-6" => 487.25,//辽宁 6
+        "4-10-6" => 9.74, "4-20-6" => 19.48, "4-30-6" => 29.22, "4-50-6" => 48.7, "4-100-6" => 97.4, "4-200-6" => 194.8, "4-300-6" => 292.2, "4-500-6" => 487,//辽宁 6
         "4-10-9" => 9.94, "4-20-9" => 19.88, "4-30-9" => 29.82, "4-50-9" => 49.7, "4-100-9" => 99.4,//上海 9
         "4-10-8" => 9.945, "4-20-8" => 19.89, "4-30-8" => 29.835, "4-50-8" => 49.725, "4-100-8" => 99.45, "4-200-8" => 198.9, "4-300-8" => 298.35, "4-500-8" => 497.25 ,//黑龙江 8
-        "4-10-29" => 9.8, "4-20-29" => 19.6, "4-30-29" => 29.4, "4-50-29" => 49, "4-100-29" => 98, "4-200-29" => 196, "4-300-29" => 294, "4-500-29" => 490,//青海 29
+        "4-10-29" => 9.79, "4-20-29" => 19.58, "4-30-29" => 29.37, "4-50-29" => 48.95, "4-100-29" => 97.9, "4-200-29" => 195.8, "4-300-29" => 293.7, "4-500-29" => 489.5,//青海 29
         "4-10-28" => 9.985, "4-20-28" => 19.97, "4-30-28" => 29.955, "4-50-28" => 49.925, "4-100-28" => 99.85, "4-200-28" => 199.7, "4-300-28" => 299.55, "4-500-28" => 499.25,//甘肃 28
         "4-10-13" => 10.22, "4-20-13" => 19.94, "4-30-13" => 29.91, "4-50-13" => 49.85, "4-100-13" => 99.7, "4-200-13" => 199.4, "4-300-13" => 300.9, "4-500-13" => 501.5,//福建 13
-        "4-10-5" => 9.99, "4-20-5" => 19.98, "4-30-5" => 29.97, "4-50-5" => 49.95, "4-100-5" => 100.2, "4-200-5" => 200.4, "4-300-5" => 300.6, "4-500-5" => 501,//内蒙古 5
+        "4-10-5" => 9.99, "4-20-5" => 19.98, "4-30-5" => 29.97, "4-50-5" => 49.95, "4-100-5" => 99.9, "4-200-5" => 200.4, "4-300-5" => 300.6, "4-500-5" => 501,//内蒙古 5
         "4-30-18" => 29.835, "4-50-18" => 49.725, "4-100-18" => 99.45, "4-200-18" => 198.3,//湖南 18
-        "4-10-19" => 9.965, "4-20-19" => 19.93, "4-30-19" => 29.895, "4-50-19" => 49.825, "4-100-19" => 99.65, "4-200-19" => 199.3, "4-300-19" => 298.95, "4-500-19" => 498.25,//广东 19
+        "4-10-19" => 9.97, "4-20-19" => 19.94, "4-30-19" => 29.895, "4-50-19" => 49.825, "4-100-19" => 99.65, "4-200-19" => 199.3, "4-300-19" => 298.95, "4-500-19" => 498.25,//广东 19
         "4-10-7" => 9.82, "4-20-7" => 19.64, "4-30-7" => 29.46, "4-50-7" => 49.1, "4-100-7" => 98.2, "4-200-7" => 196.4, "4-300-7" => 294.6, "4-500-7" => 491,//吉林 7
         "4-10-1" => 10.31, "4-20-1" => 20.32, "4-30-1" => 30.33, "4-50-1" => 50.35, "4-100-1" => 100.4, "4-200-1" => 200.3, "4-300-1" => 300.45, "4-500-1" => 500.75,//北京 1
         "4-10-22" => 10.015, "4-20-22" => 20.03, "4-30-22" => 30.045, "4-50-22" => 50.075, "4-100-22" => 100.15, "4-200-22" => 200.3, "4-300-22" => 300.45, "4-500-22" => 500.75,//重庆 22

helper/refill/api/xyz/huoshenguo/config.php

@@ -23,12 +23,10 @@ class config
             500 => 100039,
         ],
         mtopcard\ChinaUnicomCard => [
-            30  => 100034,
-            50  => 100035,
-            100 => 100036,
-            200 => 100037,
-            300 => 100046,
-            500 => 100047,
+            30  => 100105,
+            50  => 100106,
+            100 => 100107,
+            200 => 100108,
         ],
         mtopcard\ChinaTelecomCard => [
             30  => 100012,

helper/refill/api/xyz/huoshenguo/开户信息.txt

@@ -38,4 +38,10 @@ appSecret：JKMrdDVUHUwJZIDV
 100062	高价联通30
 100063	高价联通50
 100064	高价联通100
-100065	高价联通200
+100065	高价联通200
+
+2022.3.9修改联通编码
+100105 电渠联通(快充)30
+100106 电渠联通(快充)50
+100107 电渠联通(快充)100
+100108 电渠联通(快充)200

util/test.sh

@@ -23,3 +23,13 @@ else
   exit
 fi
 
+
+server_ip='39.103.141.163'
+vdb=$(df -h | grep /dev/vdb1 | awk 'BEGIN{OFS=","}{print $1,$2,$3,$4}')
+vdc=$(df -h | grep /dev/vdc1 | awk 'BEGIN{OFS=","}{print $1,$2,$3,$4}')
+echo "HSET vdb $server_ip $vdb" | redis-cli -h '127.0.0.1' -p 6379
+echo "HSET vdc $server_ip $vdc" | redis-cli -h '127.0.0.1' -p 6379
+
+
+echo "HGET vdb $server_ip" | redis-cli -h '127.0.0.1' -p 6379
+echo "HGET vdc $server_ip" | redis-cli -h '127.0.0.1' -p 6379