xingzy_normal yd 955

admin/control/ordersendlist.php

@@ -119,7 +119,7 @@ class ordersendlistControl extends SystemControl
         }
 
         $fields = 'refill_order.*,vr_order.order_state';
-        $order_by = 'refill_order.quality asc,refill_order.order_time asc';
+        $order_by = "( {$cur_time} - refill_order.commit_time ) desc";
         $order_list = $model_refill_order->getMerchantTimeOut($orders_cond, 200, $fields, $order_by);
         $order_stat = Model('')->table('refill_order,vr_order,merchant')
             ->join('inner,inner')
@@ -196,7 +196,7 @@ class ordersendlistControl extends SystemControl
         $condition['refill_order.neterr'] = 1;
         $condition['vr_order.order_state'] = ORDER_STATE_PAY;
 
-        $order_list = $model_refill_order->getMerchantOrderList($condition, 50, 'refill_order.*,vr_order.order_state', 'refill_order.order_time asc');
+        $order_list = $model_refill_order->getMerchantOrderList($condition, 200, 'refill_order.*,vr_order.order_state', 'refill_order.order_time asc');
         $merchant_list = Model('')->table('merchant')->limit(1000)->order('name asc')->select();
         $order_list = $this->orderFormat($order_list, $merchant_list);
 
@@ -330,9 +330,7 @@ class ordersendlistControl extends SystemControl
             $condition['refill_order.notify_time'] = [['gt', $start_day], ['lt', ($cur_time - $notify_time)], 'and'];
         }
 
-
-
-        $order_list = $model_refill_order->getMerchantOrderList($condition, '', 'refill_order.*,vr_order.order_state', 'refill_order.notify_time asc', 1000);
+        $order_list = $model_refill_order->getMerchantOrderList($condition, 200, 'refill_order.*,vr_order.order_state', 'refill_order.notify_time asc', 1000);
         $merchant_list = Model('')->table('merchant')->limit(1000)->order('name asc')->select();
         $order_list = $this->orderFormat($order_list, $merchant_list);
 

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

@@ -303,17 +303,11 @@
                     </td>
                     <td class="align-right">
                         <?php if (empty($order['notify_time'])) {
-                            if ($order['diff_time'] > 0 && $order['diff_time'] <= 900) {
+                            if ($order['diff_time'] > 180) {
                                 ?>
-                                <span style="color: #af1ddf"><?php echo $order['diff_time_text'] ?></span>
-                            <?php } elseif ($order['diff_time'] > 900 && $order['diff_time'] <= 1800) { ?>
-                                <span style="color: #c18f1f"><?php echo $order['diff_time_text'] ?></span>
-                            <?php } elseif ($order['diff_time'] > 1800 && $order['diff_time'] <= 3600) { ?>
-                                <span style="color: #fd9d0e"><?php echo $order['diff_time_text'] ?></span>
-                            <?php } elseif ($order['diff_time'] > 3600) { ?>
                                 <span style="color: #f30707"><?php echo $order['diff_time_text'] ?></span>
-                            <?php } else {
-                                ?>
+
+                            <?php } else { ?>
                                 <?php echo $order['diff_time_text'] ?>
                             <?php } ?>
                         <?php } else { ?>
@@ -322,21 +316,15 @@
                     </td>
                     <td class="align-right">
                         <?php if (empty($order['notify_time'])) {
-                            if ($order['total_diff_time'] > 0 && $order['total_diff_time'] <= 900) {
+                            if ($order['total_diff_time'] > 180) {
                                 ?>
-                                <span style="color: #af1ddf"><?php echo $order['total_diff_time_text'] ?></span>
-                            <?php } elseif ($order['total_diff_time'] > 900 && $order['total_diff_time'] <= 1800) { ?>
-                                <span style="color: #c18f1f"><?php echo $order['total_diff_time_text'] ?></span>
-                            <?php } elseif ($order['total_diff_time'] > 1800 && $order['total_diff_time'] <= 3600) { ?>
-                                <span style="color: #fd9d0e"><?php echo $order['total_diff_time_text'] ?></span>
-                            <?php } elseif ($order['total_diff_time'] > 3600) { ?>
                                 <span style="color: #f30707"><?php echo $order['total_diff_time_text'] ?></span>
                             <?php } else {
                                 ?>
-                                <?php echo $order['diff_time_text'] ?>
+                                <?php echo $order['total_diff_time_text'] ?>
                             <?php } ?>
                         <?php } else { ?>
-                            <?php echo $order['diff_time_text'] ?>
+                            <?php echo $order['total_diff_time_text'] ?>
                         <?php } ?>
                     </td>
                     <td class="align-center"><?php echo orderState($order); ?></td>

data/config/win/refill.ini.php

@@ -2841,18 +2841,22 @@ $xingzy_normal_phone = ['name' => 'xingzy_normal', 'store_id' => 137, 'qualitys'
 //        10 => [['goods_id' => 7179, 'price' => 9.55, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
 //        20 => [['goods_id' => 7180, 'price' => 19.1, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
         30 => [
+            ['goods_id' => 7181, 'price' => 28.65, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7181, 'price' => 28.65, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7181, 'price' => 28.74, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
+            ['goods_id' => 7182, 'price' => 47.75, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7182, 'price' => 47.75, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7182, 'price' => 47.9, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
+            ['goods_id' => 7183, 'price' => 95.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7183, 'price' => 95.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7183, 'price' => 95.8, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
+            ['goods_id' => 7184, 'price' => 191, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7184, 'price' => 191, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7184, 'price' => 191.6, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],

data/config/xyz/refill.ini.php

@@ -2841,18 +2841,22 @@ $xingzy_normal_phone = ['name' => 'xingzy_normal', 'store_id' => 137, 'qualitys'
 //        10 => [['goods_id' => 7179, 'price' => 9.55, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
 //        20 => [['goods_id' => 7180, 'price' => 19.1, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
         30 => [
+            ['goods_id' => 7181, 'price' => 28.65, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7181, 'price' => 28.65, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7181, 'price' => 28.74, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
+            ['goods_id' => 7182, 'price' => 47.75, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7182, 'price' => 47.75, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7182, 'price' => 47.9, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
+            ['goods_id' => 7183, 'price' => 95.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7183, 'price' => 95.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7183, 'price' => 95.8, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
+            ['goods_id' => 7184, 'price' => 191, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7184, 'price' => 191, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7184, 'price' => 191.6, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],

data/config/xyzadm/refill.ini.php

@@ -2841,18 +2841,22 @@ $xingzy_normal_phone = ['name' => 'xingzy_normal', 'store_id' => 137, 'qualitys'
 //        10 => [['goods_id' => 7179, 'price' => 9.55, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
 //        20 => [['goods_id' => 7180, 'price' => 19.1, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
         30 => [
+            ['goods_id' => 7181, 'price' => 28.65, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7181, 'price' => 28.65, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7181, 'price' => 28.74, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
+            ['goods_id' => 7182, 'price' => 47.75, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7182, 'price' => 47.75, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7182, 'price' => 47.9, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
+            ['goods_id' => 7183, 'price' => 95.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7183, 'price' => 95.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7183, 'price' => 95.8, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
+            ['goods_id' => 7184, 'price' => 191, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7184, 'price' => 191, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7184, 'price' => 191.6, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],