Merge branch 'ralbex' of 39.97.239.116:gyfl/xyzshop into ralbex

data/config/win/refill.ini.php

@@ -146,10 +146,10 @@ $feinimoshu_oil = ['name' => 'feinimoshu', 'store_id' => 57, 'qualitys' => '1',
 
 $xiaoniu_oil = ['name' => 'xiaoniu', 'store_id' => 77,'qualitys' => '3',
     'amount' => [
-        100 => [['goods_id' => 6740, 'price' => 97.7, 'quality' => 3, 'card_type' => 'sinopec']],
-        200 => [['goods_id' => 6741, 'price' => 195.4, 'quality' => 3, 'card_type' => 'sinopec']],
-        500 => [['goods_id' => 6742, 'price' => 488.5, 'quality' => 3, 'card_type' => 'sinopec']],
-        1000 => [['goods_id' => 6743, 'price' => 977, 'quality' => 3, 'card_type' => 'sinopec']]
+        100 => [['goods_id' => 6740, 'price' => 98, 'quality' => 3, 'card_type' => 'sinopec']],
+        200 => [['goods_id' => 6741, 'price' => 196, 'quality' => 3, 'card_type' => 'sinopec']],
+        500 => [['goods_id' => 6742, 'price' => 490, 'quality' => 3, 'card_type' => 'sinopec']],
+        1000 => [['goods_id' => 6743, 'price' => 980, 'quality' => 3, 'card_type' => 'sinopec']]
     ],
     'period' => [], 'refill_type' => 'api'];
 
@@ -1951,35 +1951,35 @@ $guochuang_phone = ['name' => 'guochuang', 'store_id' => 106, 'qualitys' => '2',
 $xianghongrui_phone = ['name' => 'xianghongrui', 'store_id' => 107,'qualitys' => '1',
     'amount' => [
         10 => [
-            ['goods_id' => 6949, 'price' => 9.48, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6949, 'price' => 9.53, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6949, 'price' => 9.5, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         20 => [
-            ['goods_id' => 6950, 'price' => 18.96, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6950, 'price' => 19.06, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6950, 'price' => 19, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         30 => [
-            ['goods_id' => 6951, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6951, 'price' => 28.59, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6951, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6952, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6952, 'price' => 47.65, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6952, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6953, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6953, 'price' => 95.3, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6953, 'price' => 95, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6954, 'price' => 189.6, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6954, 'price' => 190.6, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6954, 'price' => 190, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         300 => [
-            ['goods_id' => 6955, 'price' => 284.4, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6955, 'price' => 285.9, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6955, 'price' => 285, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         500 => [
-            ['goods_id' => 6956, 'price' => 474, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6956, 'price' => 476.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6956, 'price' => 475, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ]
     ],

data/config/xyz/refill.ini.php

@@ -146,10 +146,10 @@ $feinimoshu_oil = ['name' => 'feinimoshu', 'store_id' => 57, 'qualitys' => '1',
 
 $xiaoniu_oil = ['name' => 'xiaoniu', 'store_id' => 77,'qualitys' => '3',
     'amount' => [
-        100 => [['goods_id' => 6740, 'price' => 97.7, 'quality' => 3, 'card_type' => 'sinopec']],
-        200 => [['goods_id' => 6741, 'price' => 195.4, 'quality' => 3, 'card_type' => 'sinopec']],
-        500 => [['goods_id' => 6742, 'price' => 488.5, 'quality' => 3, 'card_type' => 'sinopec']],
-        1000 => [['goods_id' => 6743, 'price' => 977, 'quality' => 3, 'card_type' => 'sinopec']]
+        100 => [['goods_id' => 6740, 'price' => 98, 'quality' => 3, 'card_type' => 'sinopec']],
+        200 => [['goods_id' => 6741, 'price' => 196, 'quality' => 3, 'card_type' => 'sinopec']],
+        500 => [['goods_id' => 6742, 'price' => 490, 'quality' => 3, 'card_type' => 'sinopec']],
+        1000 => [['goods_id' => 6743, 'price' => 980, 'quality' => 3, 'card_type' => 'sinopec']]
     ],
     'period' => [], 'refill_type' => 'api'];
 
@@ -1951,35 +1951,35 @@ $guochuang_phone = ['name' => 'guochuang', 'store_id' => 106, 'qualitys' => '2',
 $xianghongrui_phone = ['name' => 'xianghongrui', 'store_id' => 107,'qualitys' => '1',
     'amount' => [
         10 => [
-            ['goods_id' => 6949, 'price' => 9.48, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6949, 'price' => 9.53, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6949, 'price' => 9.5, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         20 => [
-            ['goods_id' => 6950, 'price' => 18.96, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6950, 'price' => 19.06, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6950, 'price' => 19, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         30 => [
-            ['goods_id' => 6951, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6951, 'price' => 28.59, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6951, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6952, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6952, 'price' => 47.65, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6952, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6953, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6953, 'price' => 95.3, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6953, 'price' => 95, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6954, 'price' => 189.6, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6954, 'price' => 190.6, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6954, 'price' => 190, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         300 => [
-            ['goods_id' => 6955, 'price' => 284.4, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6955, 'price' => 285.9, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6955, 'price' => 285, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         500 => [
-            ['goods_id' => 6956, 'price' => 474, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6956, 'price' => 476.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6956, 'price' => 475, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ]
     ],

data/config/xyzadm/refill.ini.php

@@ -146,10 +146,10 @@ $feinimoshu_oil = ['name' => 'feinimoshu', 'store_id' => 57, 'qualitys' => '1',
 
 $xiaoniu_oil = ['name' => 'xiaoniu', 'store_id' => 77,'qualitys' => '3',
     'amount' => [
-        100 => [['goods_id' => 6740, 'price' => 97.7, 'quality' => 3, 'card_type' => 'sinopec']],
-        200 => [['goods_id' => 6741, 'price' => 195.4, 'quality' => 3, 'card_type' => 'sinopec']],
-        500 => [['goods_id' => 6742, 'price' => 488.5, 'quality' => 3, 'card_type' => 'sinopec']],
-        1000 => [['goods_id' => 6743, 'price' => 977, 'quality' => 3, 'card_type' => 'sinopec']]
+        100 => [['goods_id' => 6740, 'price' => 98, 'quality' => 3, 'card_type' => 'sinopec']],
+        200 => [['goods_id' => 6741, 'price' => 196, 'quality' => 3, 'card_type' => 'sinopec']],
+        500 => [['goods_id' => 6742, 'price' => 490, 'quality' => 3, 'card_type' => 'sinopec']],
+        1000 => [['goods_id' => 6743, 'price' => 980, 'quality' => 3, 'card_type' => 'sinopec']]
     ],
     'period' => [], 'refill_type' => 'api'];
 
@@ -1951,35 +1951,35 @@ $guochuang_phone = ['name' => 'guochuang', 'store_id' => 106, 'qualitys' => '2',
 $xianghongrui_phone = ['name' => 'xianghongrui', 'store_id' => 107,'qualitys' => '1',
     'amount' => [
         10 => [
-            ['goods_id' => 6949, 'price' => 9.48, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6949, 'price' => 9.53, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6949, 'price' => 9.5, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         20 => [
-            ['goods_id' => 6950, 'price' => 18.96, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6950, 'price' => 19.06, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6950, 'price' => 19, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         30 => [
-            ['goods_id' => 6951, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6951, 'price' => 28.59, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6951, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6952, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6952, 'price' => 47.65, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6952, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6953, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6953, 'price' => 95.3, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6953, 'price' => 95, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6954, 'price' => 189.6, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6954, 'price' => 190.6, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6954, 'price' => 190, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         300 => [
-            ['goods_id' => 6955, 'price' => 284.4, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6955, 'price' => 285.9, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6955, 'price' => 285, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         500 => [
-            ['goods_id' => 6956, 'price' => 474, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6956, 'price' => 476.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6956, 'price' => 475, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ]
     ],

mchsrv/control/refill_evidence.php

@@ -16,7 +16,7 @@ class refill_evidenceControl extends mbMerchantControl
         if ($_GET['start_time'] && $_GET['end_time']) {
             $cond['add_time'] = ['between', [$_GET['start_time'], $_GET['end_time']]];
         }
-        $list = $model_merchant->getRefillEvidence($cond, $this->page, '*', 'add_time desc', 10);
+        $list = $model_merchant->getRefillEvidence($cond, $this->page, '*', 'add_time desc', 10, true);
         $list = $this->RefillEvidenceFormat($list);
         $result['data'] = $list;
         $result['total'] = $model_merchant->gettotalpage();