update

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

@@ -102,11 +102,11 @@
                     <td><?php echo $order['ch_trade_no']; ?></td>
                     <td><?php echo $order['official_sn']; ?></td>
                     <td class="align-center"><?php echo $order['card_type_text']; ?></td>
-                    <td class="align-center"><?php echo $order['mch_amount']; ?></td>
+                    <td class="align-center"><?php echo $order['refill_amount']; ?></td>
                     <td class="nowrap align-center"><?php echo date('Y-m-d H:i:s', $order['order_time']); ?></td>
                     <td class="align-center"><?php echo $order['notify_time'] ? date('Y-m-d H:i', $order['notify_time']) : $lang['no_limit']; ?></td>
-                    <td class="align-center"><?php echo $order['refill_amount']; ?></td>
                     <td class="align-center"><?php echo $order['channel_name']; ?></td>
+                    <td class="align-center"><?php echo $order['mch_amount']; ?></td>
                     <td class="align-center"><?php echo $order['channel_amount']; ?></td>
                     <td class="align-center"><?php echo orderState($order); ?></td>
                     <td class="w144 align-center">

data/config/win/refill.ini.php

@@ -17,10 +17,12 @@ $suhctm_oil = ['name' => 'suhctm', 'store_id' => 7, 'card_type' => ['sinopec'],
     'period' => ['start' => '8:30', 'end' => '22:20'], 'refill_type' => 'api'];
 
 $suhcpdd_oil = ['name' => 'suhcpdd', 'store_id' => 7, 'card_type' => ['sinopec'],
-    'amount' => [100 => ['goods_id' => 6290, 'price' => 96.8],
-        200 => ['goods_id' => 6291, 'price' => 193.6],
-        500 => ['goods_id' => 6292, 'price' => 484],
-        1000 => ['goods_id' => 6293, 'price' => 968]],
+    'amount' => [
+//        100 => ['goods_id' => 6290, 'price' => 96.8],
+//        200 => ['goods_id' => 6291, 'price' => 193.6],
+//        500 => ['goods_id' => 6292, 'price' => 484],
+        1000 => ['goods_id' => 6293, 'price' => 968]
+    ],
     'period' => ['start' => '8:30', 'end' => '22:20'], 'refill_type' => 'api'];
 
 //赵梓暄提供的加油通道
@@ -48,8 +50,8 @@ $saihu_oil = ['name' => 'saihu', 'store_id' => 15, 'card_type' => ['sinopec'],
 
 $oil_providers = [
     ['name' => 'suhc', 'cfg' => $suhc_oil, 'opened' => false, 'sort' => 3],
-    ['name' => 'suhctm', 'cfg' => $suhctm_oil, 'opened' => true, 'sort' => 2],
-    ['name' => 'suhcpdd', 'cfg' => $suhcpdd_oil, 'opened' => false, 'sort' => 1],
+    ['name' => 'suhctm', 'cfg' => $suhctm_oil, 'opened' => true, 'sort' => 1],
+    ['name' => 'suhcpdd', 'cfg' => $suhcpdd_oil, 'opened' => true, 'sort' => 2],
     ['name' => 'zzx', 'cfg' => $zzx_oil, 'opened' => false, 'sort' => 5],
     ['name' => 'lx', 'cfg' => $lx_oil, 'opened' => false, 'sort' => 1],
     ['name' => 'saihu', 'cfg' => $saihu_oil, 'opened' => false, 'sort' => 6]];
@@ -67,7 +69,7 @@ $bxtwt_phone = ['name' => 'bxtwt', 'store_id' => 10, 'card_type' => ['chinamobil
         200 => ['goods_id' => 6300, 'price' => 192]],
     'refill_type' => 'api'];
 
-$bjb_phone = ['name' => 'bjb', 'store_id' => 12, 'card_type' => ['chinaunicom', 'chinatelecom'],
+$bjb_phone = ['name' => 'bjb', 'store_id' => 12, 'card_type' => ['chinamobile' ,/*'chinaunicom', */'chinatelecom'],
     'amount' => [10 => ['goods_id' => 6305, 'price' => 9.55],
         20 => ['goods_id' => 6306, 'price' => 19.1],
         30 => ['goods_id' => 6301, 'price' => 28.65],
@@ -83,10 +85,10 @@ $yifa_phone = ['name' => 'yifa', 'store_id' => 16, 'card_type' => ['chinamobile'
     'refill_type' => 'api'];
 
 $jiec_phone = ['name' => 'jiec', 'store_id' => 17, 'card_type' => ['chinaunicom', 'chinatelecom'],
-    'amount' => [30 => ['goods_id' => 6323, 'price' => 28.74],
-        50 => ['goods_id' => 6324, 'price' => 47.9],
-        100 => ['goods_id' => 6325, 'price' => 95.8],
-        200 => ['goods_id' => 6326, 'price' => 191.6]], 'official_sn' => true, 'refill_type' => 'api'];
+    'amount' => [30 => ['goods_id' => 6323, 'price' => 28.65],
+        50 => ['goods_id' => 6324, 'price' => 47.75],
+        100 => ['goods_id' => 6325, 'price' => 95.5],
+        200 => ['goods_id' => 6326, 'price' => 191]], 'official_sn' => true, 'refill_type' => 'api'];
 
 $phone_providers = [
     ['name' => 'beixt', 'cfg' => $beixt_phone, 'opened' => false, 'sort' => 1],