Merge branch 'raccount' into rchannel

admin/control/ordersendlist.php

@@ -160,7 +160,7 @@ class ordersendlistControl extends SystemControl
         $start_day = strtotime("-5 days",$cur_time);
         $extra_conds = [
             ['between', [$cur_time - 3600, $cur_time - 1800]],
-            [$start_day, $cur_time - 3600]
+            ['between', [$start_day, $cur_time - 3600]]
         ];
 
         if (array_key_exists($timeout_type, $this->mTimeouts)) {

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

@@ -346,13 +346,13 @@
             <?php } ?>
         <?php } else { ?>
             <tr class="no_data">
-                <td colspan="17"><?php echo $lang['nc_no_record']; ?></td>
+                <td colspan="18"><?php echo $lang['nc_no_record']; ?></td>
             </tr>
         <?php } ?>
         </tbody>
         <tfoot>
         <tr class="tfoot">
-            <td colspan="17" id="dataFuncs">
+            <td colspan="18" id="dataFuncs">
                 <div class="pagination"> <?php echo $output['show_page']; ?> </div>
             </td>
         </tr>

data/config/win/refill.ini.php

@@ -1900,42 +1900,42 @@ $xinhengyang_phone = ['name' => 'xinhengyang', 'store_id' => 100, 'qualitys' =>
 $miaoxt_phone = ['name' => 'miaoxt', 'store_id' => 101, 'qualitys' => '2',
     'amount' => [
         10 => [
-            ['goods_id' => 6901, 'price' => 10.03, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6901, 'price' => 10.025, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6901, 'price' => 10.05, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6901, 'price' => 10.03, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         20 => [
-            ['goods_id' => 6902, 'price' => 20.06, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6902, 'price' => 20.05, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6902, 'price' => 20.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6902, 'price' => 20.06, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         30 => [
-            ['goods_id' => 6903, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6903, 'price' => 30.075, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6903, 'price' => 30.12, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6903, 'price' => 30.09, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6904, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6904, 'price' => 50.125, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6904, 'price' => 50, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6904, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6905, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6905, 'price' => 100.25, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6905, 'price' => 100, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6905, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6906, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6906, 'price' => 200.5, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6906, 'price' => 200, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6906, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
-            ['goods_id' => 6907, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6907, 'price' => 300.75, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6907, 'price' => 300, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6907, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
-            ['goods_id' => 6908, 'price' => 501, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6908, 'price' => 501.25, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6908, 'price' => 500, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6908, 'price' => 501, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
@@ -2280,23 +2280,27 @@ $xianzhibb_phone = ['name' => 'xianzhibb', 'store_id' => 117, 'qualitys' => '1',
         ],
         30 => [
             ['goods_id' => 7021, 'price' => 28.65, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7021, 'price' => 28.56, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 7021, 'price' => 28.35, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7021, 'price' => 28.56, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 7022, 'price' => 47.75, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7022, 'price' => 47.6, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 7022, 'price' => 47.25, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7022, 'price' => 47.6, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 7023, 'price' => 95.5, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7023, 'price' => 95.2, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 7023, 'price' => 94.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7023, 'price' => 95.2, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 7024, 'price' => 191, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7024, 'price' => 190.4, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 7024, 'price' => 189, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7024, 'price' => 190.4, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 7025, 'price' => 286.5, 'quality' => 1, 'card_type' => 'chinamobile,chinatelecom'],
-            ['goods_id' => 7025, 'price' => 285.6, 'quality' => 1, 'card_type' => 'chinaunicom']
+            ['goods_id' => 7025, 'price' => 283.5, 'quality' => 1, 'card_type' => 'chinaunicom']
         ],
         500 => [
             ['goods_id' => 7026, 'price' => 477.5, 'quality' => 1, 'card_type' => 'chinamobile'],

data/config/xyz/refill.ini.php

@@ -1900,42 +1900,42 @@ $xinhengyang_phone = ['name' => 'xinhengyang', 'store_id' => 100, 'qualitys' =>
 $miaoxt_phone = ['name' => 'miaoxt', 'store_id' => 101, 'qualitys' => '2',
     'amount' => [
         10 => [
-            ['goods_id' => 6901, 'price' => 10.03, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6901, 'price' => 10.025, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6901, 'price' => 10.05, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6901, 'price' => 10.03, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         20 => [
-            ['goods_id' => 6902, 'price' => 20.06, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6902, 'price' => 20.05, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6902, 'price' => 20.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6902, 'price' => 20.06, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         30 => [
-            ['goods_id' => 6903, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6903, 'price' => 30.075, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6903, 'price' => 30.12, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6903, 'price' => 30.09, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6904, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6904, 'price' => 50.125, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6904, 'price' => 50, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6904, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6905, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6905, 'price' => 100.25, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6905, 'price' => 100, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6905, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6906, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6906, 'price' => 200.5, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6906, 'price' => 200, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6906, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
-            ['goods_id' => 6907, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6907, 'price' => 300.75, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6907, 'price' => 300, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6907, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
-            ['goods_id' => 6908, 'price' => 501, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6908, 'price' => 501.25, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6908, 'price' => 500, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6908, 'price' => 501, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
@@ -2280,23 +2280,27 @@ $xianzhibb_phone = ['name' => 'xianzhibb', 'store_id' => 117, 'qualitys' => '1',
         ],
         30 => [
             ['goods_id' => 7021, 'price' => 28.65, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7021, 'price' => 28.56, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 7021, 'price' => 28.35, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7021, 'price' => 28.56, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 7022, 'price' => 47.75, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7022, 'price' => 47.6, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 7022, 'price' => 47.25, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7022, 'price' => 47.6, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 7023, 'price' => 95.5, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7023, 'price' => 95.2, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 7023, 'price' => 94.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7023, 'price' => 95.2, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 7024, 'price' => 191, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7024, 'price' => 190.4, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 7024, 'price' => 189, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7024, 'price' => 190.4, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 7025, 'price' => 286.5, 'quality' => 1, 'card_type' => 'chinamobile,chinatelecom'],
-            ['goods_id' => 7025, 'price' => 285.6, 'quality' => 1, 'card_type' => 'chinaunicom']
+            ['goods_id' => 7025, 'price' => 283.5, 'quality' => 1, 'card_type' => 'chinaunicom']
         ],
         500 => [
             ['goods_id' => 7026, 'price' => 477.5, 'quality' => 1, 'card_type' => 'chinamobile'],

data/config/xyzadm/refill.ini.php

@@ -1900,42 +1900,42 @@ $xinhengyang_phone = ['name' => 'xinhengyang', 'store_id' => 100, 'qualitys' =>
 $miaoxt_phone = ['name' => 'miaoxt', 'store_id' => 101, 'qualitys' => '2',
     'amount' => [
         10 => [
-            ['goods_id' => 6901, 'price' => 10.03, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6901, 'price' => 10.025, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6901, 'price' => 10.05, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6901, 'price' => 10.03, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         20 => [
-            ['goods_id' => 6902, 'price' => 20.06, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6902, 'price' => 20.05, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6902, 'price' => 20.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6902, 'price' => 20.06, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         30 => [
-            ['goods_id' => 6903, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6903, 'price' => 30.075, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6903, 'price' => 30.12, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6903, 'price' => 30.09, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6904, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6904, 'price' => 50.125, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6904, 'price' => 50, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6904, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6905, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6905, 'price' => 100.25, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6905, 'price' => 100, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6905, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6906, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6906, 'price' => 200.5, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6906, 'price' => 200, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6906, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
-            ['goods_id' => 6907, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6907, 'price' => 300.75, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6907, 'price' => 300, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6907, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
-            ['goods_id' => 6908, 'price' => 501, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6908, 'price' => 501.25, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6908, 'price' => 500, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6908, 'price' => 501, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
@@ -2280,23 +2280,27 @@ $xianzhibb_phone = ['name' => 'xianzhibb', 'store_id' => 117, 'qualitys' => '1',
         ],
         30 => [
             ['goods_id' => 7021, 'price' => 28.65, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7021, 'price' => 28.56, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 7021, 'price' => 28.35, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7021, 'price' => 28.56, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 7022, 'price' => 47.75, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7022, 'price' => 47.6, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 7022, 'price' => 47.25, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7022, 'price' => 47.6, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 7023, 'price' => 95.5, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7023, 'price' => 95.2, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 7023, 'price' => 94.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7023, 'price' => 95.2, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 7024, 'price' => 191, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7024, 'price' => 190.4, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 7024, 'price' => 189, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7024, 'price' => 190.4, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 7025, 'price' => 286.5, 'quality' => 1, 'card_type' => 'chinamobile,chinatelecom'],
-            ['goods_id' => 7025, 'price' => 285.6, 'quality' => 1, 'card_type' => 'chinaunicom']
+            ['goods_id' => 7025, 'price' => 283.5, 'quality' => 1, 'card_type' => 'chinaunicom']
         ],
         500 => [
             ['goods_id' => 7026, 'price' => 477.5, 'quality' => 1, 'card_type' => 'chinamobile'],