update admin refill order list notify text

admin/control/merchant.php

@@ -574,6 +574,16 @@ class merchantControl extends SystemControl
         foreach ($order_list as $order_id => $order_info) {
             $order_list[$order_id]['card_type_text'] = $this->scard_type($order_info['card_type']);
             $order_list[$order_id]['mch_name'] = $merchants[$order_info['mchid']]['company_name'];
+            if($order_info['notify_time'] > 0)
+            {
+                $order_list[$order_id]['diff_time_text'] = $this->elapse_time($order_info['notify_time'] - $order_info['order_time']);
+                $order_list[$order_id]['diff_time'] = $order_info['notify_time'] - $order_info['order_time'];
+            }
+            else
+            {
+                $order_list[$order_id]['diff_time_text'] = $this->elapse_time(time() - $order_info['order_time']);
+                $order_list[$order_id]['diff_time'] = time() - $order_info['order_time'];
+            }
         }
         Tpl::output('stat', $stat[0]);
         Tpl::output('order_list', $order_list);
@@ -813,4 +823,36 @@ class merchantControl extends SystemControl
             return '未知';
         }
     }
+
+    private function elapse_time($seconds)
+    {
+        $minutes = intval($seconds / 60);
+        $second = intval($seconds % 60);
+        if($minutes >= 60) {
+            $minute = $minutes % 60;
+            $hours = intval($minutes / 60);
+            $result = "{$minute}分钟{$second}秒";
+        }
+        else {
+            $result = "{$minutes}分钟{$second}秒";
+        }
+
+        if(isset($hours))
+        {
+            if($hours >= 24) {
+                $hour = $hours % 24;
+                $day = intval($hours / 24);
+                $result = "{$hour}小时" . $result;
+            }
+            else {
+                $result = "{$hours}小时" . $result;
+            }
+        }
+
+        if(isset($day) && $day > 0) {
+            $result = "{$day}天" . $result;
+        }
+
+        return $result;
+    }
 }

admin/templates/default/refill.order.index.php

@@ -103,7 +103,20 @@
                     <td class="align-center"><?php echo $order['card_type_text']; ?></td>
                     <td class="align-center"><?php echo $order['refill_amount']; ?></td>
                     <td class="align-right"><?php echo date('Y-m-d H:i:s', $order['order_time']); ?></td>
-                    <td class="align-right"><?php echo $order['notify_time'] ? date('Y-m-d H:i', $order['notify_time']) : $lang['no_limit']; ?></td>
+                    <td class="align-right">
+                        <?php if(empty($order['notify_time'])) {
+                            if($order['diff_time'] > 1800 && $order['diff_time'] < 3600) {
+                        ?>
+                                <span style="color: #fd9d0e"><?php echo $order['diff_time_text']?></span>
+                            <?php }elseif($order['diff_time']) {?>
+                                <span style="color: #f30707"><?php echo $order['diff_time_text']?></span>
+                            <?php }else{?>
+                                <?php echo $order['diff_time_text']?>
+                            <?php }?>
+                        <?php }else{?>
+                         <?php echo $order['diff_time_text']?>
+                        <?php }?>
+                    </td>
                     <td class="align-center"><?php echo orderState($order); ?></td>
                     <td class="align-left"><?php echo $order['official_sn']; ?></td>
                     <td class="align-left"><?php echo $order['mch_order']; ?></td>

mobile/control/merchant_info.php

@@ -12,7 +12,7 @@ class merchant_infoControl extends mbMerchantControl
     {
         $mchid = $this->mchid();
         $model_merchant = Model('merchant');
-        $merchant_info = $model_merchant->getMerchantInfo(['mchid' => $mchid], 'mchid,admin_id,name,alarm_amount,ip_white_list,use_key');
+        $merchant_info = $model_merchant->getMerchantInfo(['mchid' => $mchid], 'mchid,admin_id,name,alarm_amount,ip_white_list,use_key,contact_name,contact_phone');
         $model_member = Model('member');
         $member_info = $model_member->getMemberInfo(['member_id' => $merchant_info['admin_id']], 'available_predeposit');
         if (empty($member_info)) {