update homeop

mobile/control/merchant_info.php

@@ -121,9 +121,10 @@ class merchant_infoControl extends mbMerchantControl
         return $result;
     }
 
-    private function isSame($arr1, $arr2) {
-        sort($arr1);
-        sort($arr2);
+    private function isSame($arr1, $arr2)
+    {
+        ksort($arr1);
+        ksort($arr2);
         return $arr1 == $arr2;
     }
 

mobile/control/merchant_order.php

@@ -14,6 +14,7 @@ class merchant_orderControl extends mbMerchantControl
 
         $cond['mchid'] = $this->mchid();
         $cond['inner_status'] = 0;
+        $cond['refill_order.order_time'] = ['time', [strtotime(date("Y-m-d")), strtotime(date("Y-m-d"))]];
         if (!empty($_GET['card_type'])) {
             $cond['refill_order.card_type'] = $_GET['card_type'];
         }
@@ -63,9 +64,12 @@ class merchant_orderControl extends mbMerchantControl
             if (isset($order['notify_time'])) {
                 $order['notify_time'] = date('Y-m-d H:i:s', $order['notify_time']);
             }
-            if($order['channel_name'] != 'bjb'){
+            if($order['channel_name'] != 'bjb') {
                 $order['ch_trade_no'] = '';
             }
+            if ($order['order_state'] == ORDER_STATE_NEW || $order['order_state'] == ORDER_STATE_PAY) {
+                $order['order_state'] = ORDER_STATE_SEND;
+            }
             $order['order_state_text'] = $this->_orderState($order['order_state']);
             $order['card_type_name'] = $this->scard_type($order['card_type']);
             $data[] = $order;