stanley-king преди 4 години
родител
ревизия
6245ea939d
променени са 2 файла, в които са добавени 30 реда и са изтрити 26 реда
  1. 2 2
      helper/refill/RefillBase.php
  2. 28 24
      helper/refill/util.php

+ 2 - 2
helper/refill/RefillBase.php

@@ -331,7 +331,7 @@ class RefillBase
             if ($state)
             {
                 //提交成功
-                util::incr_comit($channel_name,$card_type,$amount,$quality,true);
+                util::incr_commit($channel_name,$card_type,$amount,$quality,true);
                 $trade_no = $errmsg;
                 if ($provider->refill_type() == 'api') {
                     $logic_vr_order = Logic("vr_order");
@@ -351,7 +351,7 @@ class RefillBase
             }
             else {
                 //提交失败
-                util::incr_comit($channel_name,$card_type,$amount,$quality,false);
+                util::incr_commit($channel_name,$card_type,$amount,$quality,false);
                 Log::record("channel:{$channel_name} err:{$errmsg}");
                 $logic_vr_order = Logic("vr_order");
                 $order_info = Model('vr_order')->getOrderInfo(['order_id' => $order_id]);

+ 28 - 24
helper/refill/util.php

@@ -254,7 +254,7 @@ class util
     }
 
     //统计提交订单数据
-    public static function incr_comit($chname, $card_type, $amout, $quality, $fsuccess = true)
+    public static function incr_commit($chname, $card_type, $spec, $quality, $fsuccess = true)
     {
         $ins = Cache::getInstance('cacheredis');
 
@@ -263,33 +263,37 @@ class util
         $min = $sec - $sec % 60;
 
         if ($fsuccess) {
-            $key_sec = "succ-{$chname}-{$quality}-{$card_type}-{$amout}-{$sec}";
-            $key_min = "succm-{$chname}-{$quality}-{$card_type}-{$amout}-{$min}";
+            $key_sec = "succ-{$chname}-{$quality}-{$card_type}-{$spec}-{$sec}";
+            $key_min = "succm-{$chname}-{$quality}-{$card_type}-{$spec}-{$min}";
         } else {
-            $key_sec = "fail-{$chname}-{$quality}-{$card_type}-{$amout}-{$sec}";
-            $key_min = "failm-{$chname}-{$quality}-{$card_type}-{$amout}-{$min}";
+            $key_sec = "fail-{$chname}-{$quality}-{$card_type}-{$spec}-{$sec}";
+            $key_min = "failm-{$chname}-{$quality}-{$card_type}-{$spec}-{$min}";
         }
 
-        $ins->hIncrBy($name,$key_sec,1);
-        $ins->hIncrBy($name,$key_min,1);
+        $val = $ins->hIncrBy($name,$key_sec,1);
+        Log::record("incr_commit sec name = {$name} key={$key_sec} val={$val}",Log::DEBUG);
+        $val = $ins->hIncrBy($name,$key_min,1);
+        Log::record("incr_commit min name = {$name} key={$key_min} val={$val}",Log::DEBUG);
     }
 
-    public static function hget_commit_sec($chname, $card_type, $amout, $quality, $time_stamp, $fsuccess = true)
+    public static function hget_commit_sec($chname, $card_type, $spec, $quality, $time_stamp, $fsuccess = true)
     {
         $ins = Cache::getInstance('cacheredis');
 
         $name = 'channel_monitor_commit';
         if ($fsuccess) {
-            $key_sec = "succ-{$chname}-{$quality}-{$card_type}-{$amout}-{$time_stamp}";
+            $key_sec = "succ-{$chname}-{$quality}-{$card_type}-{$spec}-{$time_stamp}";
         } else {
-            $key_sec = "fail-{$chname}-{$quality}-{$card_type}-{$amout}-{$time_stamp}";
+            $key_sec = "fail-{$chname}-{$quality}-{$card_type}-{$spec}-{$time_stamp}";
         }
         $value = $ins->hGet($name,'',$key_sec);
 
+        Log::record("hget_commit_sec sec name = {$name} key={$key_sec} val={$value}",Log::DEBUG);
+
         return intval($value);
     }
 
-    public static function hget_commit_min($chname, $card_type, $amout, $quality, $time_stamp, $fsuccess = true)
+    public static function hget_commit_min($chname, $card_type, $spec, $quality, $time_stamp, $fsuccess = true)
     {
         $ins = Cache::getInstance('cacheredis');
 
@@ -297,9 +301,9 @@ class util
         $min = $time_stamp - $time_stamp % 60;
 
         if ($fsuccess) {
-            $key_sec = "succm-{$chname}-{$quality}-{$card_type}-{$amout}-{$min}";
+            $key_sec = "succm-{$chname}-{$quality}-{$card_type}-{$spec}-{$min}";
         } else {
-            $key_sec = "failm-{$chname}-{$quality}-{$card_type}-{$amout}-{$min}";
+            $key_sec = "failm-{$chname}-{$quality}-{$card_type}-{$spec}-{$min}";
         }
         $value = $ins->hGet($name,'',$key_sec);
 
@@ -307,7 +311,7 @@ class util
     }
 
     //统计回调通知数据
-    public static function incr_notify($chname, $card_type, $amout, $quality, $fsuccess = true)
+    public static function incr_notify($chname, $card_type, $spec, $quality, $fsuccess = true)
     {
         $ins = Cache::getInstance('cacheredis');
 
@@ -316,33 +320,33 @@ class util
         $min = $sec - $sec % 60;
 
         if ($fsuccess) {
-            $key_sec = "succ-{$chname}-{$quality}-{$card_type}-{$amout}-{$sec}";
-            $key_min = "succm-{$chname}-{$quality}-{$card_type}-{$amout}-{$min}";
+            $key_sec = "succ-{$chname}-{$quality}-{$card_type}-{$spec}-{$sec}";
+            $key_min = "succm-{$chname}-{$quality}-{$card_type}-{$spec}-{$min}";
         } else {
-            $key_sec = "fail-{$chname}-{$quality}-{$card_type}-{$amout}-{$sec}";
-            $key_min = "failm-{$chname}-{$quality}-{$card_type}-{$amout}-{$min}";
+            $key_sec = "fail-{$chname}-{$quality}-{$card_type}-{$spec}-{$sec}";
+            $key_min = "failm-{$chname}-{$quality}-{$card_type}-{$spec}-{$min}";
         }
 
         $ins->hIncrBy($name,$key_sec,1);
         $ins->hIncrBy($name,$key_min,1);
     }
 
-    public static function hget_notify_sec($chname, $card_type, $amout, $quality, $time_stamp, $fsuccess = true)
+    public static function hget_notify_sec($chname, $card_type, $spec, $quality, $time_stamp, $fsuccess = true)
     {
         $ins = Cache::getInstance('cacheredis');
 
         $name = 'channel_monitor_notify';
         if ($fsuccess) {
-            $key_sec = "succ-{$chname}-{$quality}-{$card_type}-{$amout}-{$time_stamp}";
+            $key_sec = "succ-{$chname}-{$quality}-{$card_type}-{$spec}-{$time_stamp}";
         } else {
-            $key_sec = "fail-{$chname}-{$quality}-{$card_type}-{$amout}-{$time_stamp}";
+            $key_sec = "fail-{$chname}-{$quality}-{$card_type}-{$spec}-{$time_stamp}";
         }
         $value = $ins->hGet($name,'',$key_sec);
 
         return intval($value);
     }
 
-    public static function hget_notify_min($chname, $card_type, $amout, $quality, $time_stamp, $fsuccess = true)
+    public static function hget_notify_min($chname, $card_type, $spec, $quality, $time_stamp, $fsuccess = true)
     {
         $ins = Cache::getInstance('cacheredis');
 
@@ -350,9 +354,9 @@ class util
         $min = $time_stamp - $time_stamp % 60;
 
         if ($fsuccess) {
-            $key_sec = "succm-{$chname}-{$quality}-{$card_type}-{$amout}-{$min}";
+            $key_sec = "succm-{$chname}-{$quality}-{$card_type}-{$spec}-{$min}";
         } else {
-            $key_sec = "failm-{$chname}-{$quality}-{$card_type}-{$amout}-{$min}";
+            $key_sec = "failm-{$chname}-{$quality}-{$card_type}-{$spec}-{$min}";
         }
         $value = $ins->hGet($name,'',$key_sec);