racc/lz_refill

racc/control/lzrefill.php

@@ -97,11 +97,11 @@ class lzrefillControl extends lzbaseControl
             'notify_url' => $notify_url,
             'org_quality' => $quality
         ];
+        refill\util::push_queue_order($this->mchid(), $mch_order, ORDER_STATE_QUEUE);
+        Model('refill_order')->add_detail($this->mchid(),$mch_order,$params,ORDER_STATE_QUEUE);
 
         $ret = refill\util::push_add($params);
         if ($ret) {
-            refill\util::push_queue_order($this->mchid(), $mch_order, ORDER_STATE_QUEUE);
-            Model('refill_order')->add_detail($this->mchid(),$mch_order,$params,ORDER_STATE_QUEUE);
             return self::outsuccess($this->merchant_available);
         } else {
             return self::outerr(-6, $this->merchant_available);
@@ -216,11 +216,11 @@ class lzrefillControl extends lzbaseControl
             'quantity' => $quantity,
             'third_card_type' => $third_card_type
         ];
+        refill\util::push_queue_order($this->mchid(), $mch_order, ORDER_STATE_QUEUE);
+        Model('refill_order')->add_detail($this->mchid(),$mch_order,$params,ORDER_STATE_QUEUE);
 
         $ret = refill\util::push_addthird($params);
         if($ret) {
-            refill\util::push_queue_order($this->mchid(), $mch_order, ORDER_STATE_QUEUE);
-            Model('refill_order')->add_detail($this->mchid(),$mch_order,$params,ORDER_STATE_QUEUE);
             return self::outsuccess($this->merchant_available);
         }
         else {
@@ -238,14 +238,12 @@ class lzrefillControl extends lzbaseControl
 
     private function check_mchorder($mchid,$mch_order)
     {
-        if(empty($mch_order)) {
+        if (empty($mch_order)) {
             return false;
-        }
-        else {
+        } else {
             $refill_order = Model('refill_order');
-            $ret = $refill_order->getOrderInfo(['mchid' => $mchid,'mch_order' => $mch_order]);
-
-            return empty($ret);
+            $ret = $refill_order->exist($mchid, $mch_order);
+            return ($ret == false);
         }
     }