merchant admin update

mobile/control/merchant_info.php

@@ -144,20 +144,22 @@ class merchant_infoControl extends mbMerchantControl
 
     private function PdLogFormat($pdlog)
     {
+        $data = [];
         foreach ($pdlog as $key => $value) {
             if (isset($value['lg_add_time'])) {
-                $pdlog[$key]['lg_add_time'] = date('Y-m-d H:i:s', $value['lg_add_time']);
+                $value['lg_add_time'] = date('Y-m-d H:i:s', $value['lg_add_time']);
             }
             if ($value['lg_type'] == 'order_pay') {
-                $pdlog[$key]['lg_type_text'] = '下单减款';
+                $value['lg_type_text'] = '下单减款';
             } elseif ($value['lg_type'] == 'order_cancel') {
-                $pdlog[$key]['lg_type_text'] = '下单失败返回余款';
+                $value['lg_type_text'] = '下单失败返回余款';
             } elseif ($value['lg_type'] == 'recharge') {
-                $pdlog[$key]['lg_type_text'] = '余款充值';
+                $value['lg_type_text'] = '余款充值';
             } else {
-                $pdlog[$key]['lg_type'] = 'unknown';
+                $value['lg_type'] = 'unknown';
             }
+            $data[] = $value;
         }
-        return $pdlog;
+        return $data;
     }
 }

mobile/control/merchant_order.php

@@ -30,17 +30,19 @@ class merchant_orderControl extends mbMerchantControl
 
     private function merchant_order_format($orders)
     {
-        foreach ($orders as $key => $order) {
+        $data = [];
+        foreach ($orders as $order) {
             if (isset($order['order_time'])) {
-                $orders[$key]['order_time'] = date('Y-m-d H:i:s', $order['order_time']);
+                $order['order_time'] = date('Y-m-d H:i:s', $order['order_time']);
             }
             if (isset($order['notify_time'])) {
-                $orders[$key]['notify_time'] = date('Y-m-d H:i:s', $order['notify_time']);
+                $order['notify_time'] = date('Y-m-d H:i:s', $order['notify_time']);
             }
-            $orders[$key]['order_state_text'] = $this->_orderState($order['order_state']);
-            $orders[$key]['card_type_name'] = $this->scard_type($order['card_type']);
+            $order['order_state_text'] = $this->_orderState($order['order_state']);
+            $order['card_type_name'] = $this->scard_type($order['card_type']);
+            $data[] = $order;
         }
-        return $orders;
+        return $data;
     }
 
     /**
@@ -58,27 +60,32 @@ class merchant_orderControl extends mbMerchantControl
             case ORDER_STATE_NEW:
                 $order_state_text = '待付款';
                 break;
+            case ORDER_STATE_SEND:
+                $order_state_text = '已发货';
+                break;
             case ORDER_STATE_PAY:
                 $order_state_text = '已支付';
                 break;
             case ORDER_STATE_SUCCESS:
                 $order_state_text = '已完成';
                 break;
+            default:
+                $order_state_text = '未知状态';
         }
         return $order_state_text;
     }
 
     private function scard_type(int $card_type)
     {
-        if ($card_type == 1) { //中石油
+        if ($card_type == mtopcard\PetroChinaCard) { //中石油
             return '中石油';
-        } elseif ($card_type == 2) { //中石化
+        } elseif ($card_type == mtopcard\SinopecCard) { //中石化
             return '中石化';
-        } elseif ($card_type == 4) { //中国移动
+        } elseif ($card_type == mtopcard\ChinaMobileCard) { //中国移动
             return '中国移动';
-        } elseif ($card_type == 5) { //中国联通
+        } elseif ($card_type == mtopcard\ChinaUnicomCard) { //中国联通
             return '中国联通';
-        } elseif ($card_type == 6) { //中国电信
+        } elseif ($card_type == mtopcard\ChinaTelecomCard) { //中国电信
             return '中国电信';
         } else {
             return 'unknown';

mobile/control/refill_evidence.php

@@ -56,16 +56,18 @@ class refill_evidenceControl extends mbMerchantControl
 
     private function RefillEvidenceFormat($list)
     {
+        $data = [];
         $check_status = ['申请中', '已通过', '已驳回'];
         foreach ($list as $key => $value) {
             if (isset($value['add_time'])) {
-                $list[$key]['add_time'] = date('Y-m-d H:i:s', $value['add_time']);
+                $value['add_time'] = date('Y-m-d H:i:s', $value['add_time']);
             }
-            $list[$key]['status_text'] = $check_status[$value['status'] - 1];
+            $value['status_text'] = $check_status[$value['status'] - 1];
             if ($value['voucher_name']) {
-                $list[$key]['voucher_path'] = UPLOAD_SITE_URL . '/' . ATTACH_UPFILE . DS . $value['voucher_name'];
+                $value['voucher_path'] = UPLOAD_SITE_URL . '/' . ATTACH_UPFILE . DS . $value['voucher_name'];
             }
+            $data[] = $value;
         }
-        return $list;
+        return $data;
     }
 }