stanley-king 1 年之前
父節點
當前提交
2145aea58d

+ 9 - 11
helper/refill/api/zy/by_online_kami_cb/RefillCallBack.php

@@ -29,17 +29,15 @@ class RefillCallBack implements refill\IRefillCallBack
             return [false, false, false, false];
         }
         $order_id = $order_info['order_id'];
-        return [$order_id, false, false, false];
 
-//        if ($status === 7) {
-//            $data['official_sn'] = strtolower($params['charge_id']) == 'null' ? '' : $params['charge_id'];
-//            Model('refill_order')->edit($order_id, $data);
-//            QueueClient::async_push("QueryRefund", ['order_id' => $order_id], 3600);
-//            return [$order_id, true, false, true];
-//        } elseif (in_array($status, [3, 4, 6], true)) {
-//            return [$order_id, false, true, true];
-//        } else {
-//            return [$order_id, false, false, false];
-//        }
+        if ($status === 7) {
+            $data['official_sn'] = strtolower($params['charge_id']) == 'null' ? '' : $params['charge_id'];
+            Model('refill_order')->edit($order_id, $data);
+            return [$order_id, true, false, true];
+        } elseif (in_array($status, [3, 4, 6], true)) {
+            return [$order_id, false, true, true];
+        } else {
+            return [$order_id, false, false, false];
+        }
     }
 }

+ 7 - 98
helper/refill/api/zy/by_online_kami_cb/RefillPhone.php

@@ -16,11 +16,6 @@ class RefillPhone extends refill\IRefillPhone
         parent::__construct($cfgs);
     }
 
-    public function callback()
-    {
-        return false;
-    }
-
     private function req_params(int $phone, int $amount, int $card_type, string $order_sn, $regin_no)
     {
         $params['appId'] = config::APP_ID;
@@ -61,14 +56,17 @@ class RefillPhone extends refill\IRefillPhone
             $resp = json_decode($resp, true);
             if (empty($resp)) {
                 return [false, '系统错误', true];
-            } elseif ($resp['code'] === 1000) {
+            }
+            elseif ($resp['code'] === 1000) {
                 Model()->table('refill_order')->where(['order_sn' => $order_sn])->update(['official_sn' => $resp['data']['charge_id']]);
                 return [true, $resp['data']['order_sn'], false];
-            } elseif ($resp['code'] === 1001) {
+            }
+            elseif ($resp['code'] === 1001) {
                 $err = 998;
                 $net_errno = "HTTP-$err";
                 return [false, $resp['msg'], true];
-            } else {
+            }
+            else {
                 return [false, $resp['msg'], false];
             }
         }
@@ -116,11 +114,10 @@ class RefillPhone extends refill\IRefillPhone
                         } else {
                             $order_state = ORDER_STATE_SEND;
                         }
-
                         return [true, $order_state, $charge_id];
                     }
                     elseif(time() - $refill_info['commit_time'] >= 2700) {
-                        //return [true, ORDER_STATE_NOEXIST, $charge_id];
+//                        return [true, ORDER_STATE_NOEXIST, $charge_id];
                         return [true, ORDER_STATE_CANCEL, $charge_id];
                     }
                     else {
@@ -134,44 +131,6 @@ class RefillPhone extends refill\IRefillPhone
         }
     }
 
-//    public function query($refill_info)
-//    {
-//        $params['appId'] = config::APP_ID;
-//        $params['version'] = '1.0';
-//        $params['merchantOrderNo'] = $refill_info['order_sn'];
-//        $sign = config::sign($params);
-//        $params['sign'] = $sign;
-//
-//        $resp = http_request(config::QUERY_URL, $params);
-//
-//        if (empty($resp)) {
-//            return [false, '网络错误', ''];
-//        } else {
-//            Log::record($resp, Log::DEBUG);
-//            $resp = json_decode($resp, true);
-//            if (empty($resp)) {
-//                return [false, '网络错误'];
-//            } elseif ($resp['code'] === 1000) {
-//                $status = $resp['data']['order_status'];
-//                if ($status === 7) {
-//                    $updata['official_sn'] = $resp['data']['charge_id'];
-//                    Model('refill_order')->edit($refill_info['order_id'], $updata);
-//                    $order_state = ORDER_STATE_SUCCESS;
-//                } elseif (in_array($status, [3, 4, 6], true)) {
-//                    $order_state = ORDER_STATE_CANCEL;
-//                } elseif (in_array($status, [0, 1, 2, 5], true)) {
-//                    $order_state = ORDER_STATE_SEND;
-//                } else {
-//                    return [false, $status];
-//                }
-//
-//                return [true, $order_state];
-//            } else {
-//                return [false, $resp['msg']];
-//            }
-//        }
-//    }
-
     public function balance()
     {
         $params['appId'] = config::APP_ID;
@@ -195,54 +154,4 @@ class RefillPhone extends refill\IRefillPhone
             }
         }
     }
-
-    private function exist($card_no)
-    {
-        $ins = Cache::getInstance('cacheredis');
-        $today = strtotime(date('Ymd', time()));
-
-        $name = "unique_tongfu_{$today}";
-        $key = "$card_no";
-
-        $value = $ins->hget($name, '', $key);
-        if ($value === false) {
-            $ins->hset($name, '', [$key => 1]);
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    //[是否需要返销,是否网络错误]
-    public function need_refund($refill_info)
-    {
-        $params['appId'] = config::APP_ID;
-        $params['version'] = '1.0';
-        $params['merchantOrderNo'] = $refill_info['order_sn'];
-        $sign = config::sign($params);
-        $params['sign'] = $sign;
-
-        $resp = http_request(config::QUERY_URL, $params);
-
-        if (empty($resp)) {
-            return [false, true];
-        } else {
-            Log::record($resp, Log::DEBUG);
-            $resp = json_decode($resp, true);
-            if (empty($resp)) {
-                return [false, true];
-            } elseif ($resp['code'] === 1000) {
-                $status = $resp['data']['order_status'];
-                $succeed = $resp['data']['is_true'];
-
-                if ($status === 7 and $succeed === false) {
-                    return [true, false];
-                } else {
-                    return [false, false];
-                }
-            } else {
-                return [false, false];
-            }
-        }
-    }
 }