dev

helper/refill/RefillBase.php

@@ -492,7 +492,7 @@ class RefillBase
 
             $start = microtime(true);
             $net_errno = "";
-            $params = $order->channel_params($order_id,$order_sn,$goods_id);
+            $params = $order->channel_params($order_id, $order_sn, $goods_id, $ch_price);
 
             $card_no = $order->card_no();
             $card_type = $order->card_type();

helper/refill/api/xyz/huiyuan/RefillPhone.php

@@ -19,7 +19,7 @@ class RefillPhone extends refill\IRefillPhone
     {
         $params['agent_id'] = config::AGENT_ID;
         $params['bill_id'] = $order_sn;
-        $params['bill_time'] = date("YmdHis", time()-1);
+        $params['bill_time'] = date("YmdHis", time() - 1);
         $params['supply_type'] = 1;
         $params['supply_id'] = 1;
         $params['product_code'] = config::Product[$card_type][$amount];
@@ -66,22 +66,18 @@ class RefillPhone extends refill\IRefillPhone
                 }
                 return [true, $resp['jnet_bill_no'], false];
             }
-            elseif (in_array($ret_code, ['-1', '997', '998'], true))
-            {
-                QueueClient::async_push("QueryRefillState",['order_id' => $order_id],5);
+            elseif (in_array($ret_code, ['-1', '997', '998'], true)) {
+                QueueClient::async_push("QueryRefillState", ['order_id' => $order_id], 5);
                 return [true, $resp['jnet_bill_no'], false];
             }
-            elseif (in_array($ret_code, config::ERR_NOS, true))
-            {
+            elseif (in_array($ret_code, config::ERR_NOS, true)) {
                 return [false, $resp['ret_msg'], false];
             }
-            elseif (in_array($ret_code, ['5', '100', '999'], true))
-            {
+            elseif (in_array($ret_code, ['5', '100', '999'], true)) {
                 $net_errno = "HTTP-{$ret_code}";
                 return [false, $resp['ret_msg'], true];
             }
-            else
-            {
+            else {
                 $err = 998;
                 $net_errno = "HTTP-{$err}";
                 return [false, $resp['ret_msg'], true];
@@ -210,7 +206,6 @@ class RefillPhone extends refill\IRefillPhone
                 $result[$key] = $val;
             }
         }
-
         return $result;
     }
-}
+}

helper/refill/order.php

@@ -397,12 +397,12 @@ class order
         return $ext;
     }
 
-    public function channel_params($order_id, $order_sn, $goods_id)
+    public function channel_params($order_id, $order_sn, $goods_id, $ch_price)
     {
         $params = ['order_sn' => $order_sn, 'idcard' => $this->mIdCard, 'card_name' => $this->mCardName,
             'buyer_id' => $this->mBuyerId,
             'quality' => $this->mCurQuality, 'order_id' => $order_id, 'regin_no' => $this->mRegionNo,
-            'mchid' => $this->mMchid];
+            'mchid' => $this->mMchid,'ch_price' => $ch_price];
 
         if ($this->is_third()) {
             $params['quantity'] = $this->mQuantity;

test/TestRefund.php

@@ -147,8 +147,8 @@ class TestRefund extends TestCase
 
         $provider = $getProvider('by_online');
 
-        $order_sn = '2894080738681963430041';
+        $order_sn = '3692570738687490664420';
 //        $order_sn = '54821685230140381770';
-        [$succ, $resp] = $provider->query(['order_sn' => $order_sn, 'official_sn' => '1123052962366637']);
+        [$succ, $resp] = $provider->query(['order_sn' => $order_sn, 'official_sn' => '1123052962367638']);
     }
 }