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

admin/control/order_search.php

@@ -38,6 +38,11 @@ class order_searchControl extends SystemControl
             $order_sns = trim($_GET['order_sns'], ',');
             $condition['refill_order.order_sn'] = ['in', $order_sns];
         }
+        if (!empty($_GET['card_type'])) {
+            if (in_array($_GET['card_type'], ['1', '2', '4', '5', '6', '7'])) {
+                $condition['refill_order.card_type'] = intval($_GET['card_type']);
+            }
+        }
 
         if(!empty($condition)) {
             $condition['refill_order.inner_status'] = 0;

admin/control/ordersendlist.php

@@ -88,6 +88,9 @@ class ordersendlistControl extends SystemControl
 
         if (!empty($_GET['mchid'])) {
             $base_cond['refill_order.mchid'] = $_GET['mchid'];
+        } elseif(!empty($_GET['no_mchid'])) {
+            $no_mchid = explode(',', $_GET['no_mchid']);
+            $base_cond['refill_order.mchid'] = ['not in', $no_mchid];
         } elseif(!empty($mch_cond)) {
             $base_cond = array_merge($base_cond,$mch_cond);
         }

admin/templates/default/provider.price.php

@@ -33,6 +33,9 @@
     .scrollTable .fixed-bar {
         top: 115px!important;
     }
+    .tbodyd tr:last-child {
+        margin-bottom: 552px;
+    }
     .tbodyd tr:hover { background-color : #cbe9f3!important;}
     .tbodyd tr:hover td { background : none!important;}
 

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

@@ -220,7 +220,26 @@
                               rows="10"><?php echo $_GET['card_nos']; ?></textarea></td>
                 <th><label class="query_ors">商家单号（多行查询）</label></th>
                 <td><textarea name="mch_orders" id="mch_orders" cols="30"
-                              rows="10"><?php echo $_GET['mch_orders']; ?></textarea></td>
+                              rows="10"><?php echo $_GET['mch_orders']; ?></textarea>
+                            </td>
+                <th><label>充值类型</label></th>
+                <td>
+                    <select name="card_type" class="querySelect" style="height: 29px;">
+                        <option value=""><?php echo $lang['nc_please_choose']; ?></option>
+                        <option value="1"
+                                <?php if ($_GET['card_type'] == '1'){ ?>selected<?php } ?>>中石油</option>
+                        <option value="2"
+                                <?php if ($_GET['card_type'] == '2'){ ?>selected<?php } ?>>中石化</option>
+                        <option value="4"
+                                <?php if ($_GET['card_type'] == '4'){ ?>selected<?php } ?>>中国移动</option>
+                        <option value="5"
+                                <?php if ($_GET['card_type'] == '5'){ ?>selected<?php } ?>>中国联通</option>
+                        <option value="6"
+                                <?php if ($_GET['card_type'] == '6'){ ?>selected<?php } ?>>中国电信</option>
+                        <option value="7"
+                                <?php if ($_GET['card_type'] == '7'){ ?>selected<?php } ?>>增值业务</option>
+                    </select>
+                </td>
                 <td>
                     <a href="javascript:void(0);" id="ncsubmit" class="btn-search "
                        title="<?php echo $lang['nc_query']; ?>">&nbsp;

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

@@ -56,6 +56,9 @@
     .db-top {
         padding: 0 30px;
     }
+    #selest_nc {
+        width: 220px
+    }
 </style>
 
 <?php defined('InShopNC') or exit('Access Invalid!'); ?>
@@ -75,6 +78,8 @@
         <input type="hidden" name="act" value="OrderSendList"/>
         <input type="hidden" name="op" value="index"/>
         <input type="hidden" name="order_query" value=""/>
+        <input type="hidden" name="no_mchid" value=""/>
+        <input type="hidden" name="default_no_mch" value="<?php echo $_GET['no_mchid']; ?>"/>
         <table class="tb-type1 noborder search">
             <tr>
                 <th><label>客户名称</label></th>
@@ -196,8 +201,12 @@
                         </option>
                     </select>
                 </td>
+                <th><label style="width: 73px;">不包含客户</label></th>
+                <td>
+                    <div id="selest_nc"></div>
+                </td>
                 <td>
-                    <a href="javascript:void(0);" id="ncsubmit" class="btn-search "
+                    <a style="margin-left:15px;" href="javascript:void(0);" id="ncsubmit" class="btn-search "
                        title="<?php echo $lang['nc_query']; ?>">&nbsp;
                     </a>
                 </td>
@@ -343,6 +352,7 @@
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/js/jquery-ui/i18n/zh-CN.js"
         charset="utf-8"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL;?>/refill/layer.js"></script>
+<script type="text/javascript" src="<?php echo ADMIN_TEMPLATES_URL;?>/js/xm-select.js"></script>
 <script type="text/javascript" src="<?php echo ADMIN_TEMPLATES_URL;?>/layui/layui.js"></script>
 <link rel="stylesheet" type="text/css" href="<?php echo ADMIN_TEMPLATES_URL; ?>/layui/css/layui.css"/>
 <link rel="stylesheet" type="text/css"
@@ -350,6 +360,14 @@
 <script type="text/javascript">
     $(function () {
         $('#ncsubmit').click(function () {
+            
+        let selectArr = selest_nc.getValue();
+        let selectStr = ''
+        for (let i = 0; i < selectArr.length; i++) {
+             selectStr += selectArr[i].value+','
+        }
+        selectStr = selectStr.substr(0, selectStr.length-1)
+        $('input[name="no_mchid"]').val(selectStr);
             $('#formSearch').submit();
         });
         $('#query_start_time').datepicker({dateFormat: 'yy-mm-dd'});
@@ -408,6 +426,36 @@
                 }
             })
         })
+
+        // 获取不包含客户
+        let selest_nc
+        let default_no_mch = $('input[name="default_no_mch"]').val().split(',');
+        $.get('index.php?act=refill_order&op=merchant_data', function (data) {
+         data = JSON.parse(data)
+         if (default_no_mch) {
+           for (let index = 0; index < default_no_mch.length; index++) {
+             for (let j = 0; j < data.length; j++) {
+               if (default_no_mch[index] == data[j].value) {
+                 data[j].selected = true
+               }
+             }
+           }
+         }
+         selest_nc = xmSelect.render({
+           el: '#selest_nc',
+           size: 'mini',
+           filterable: true,
+           autoRow: true,
+           height: '500px',
+           style: {
+             minHeight: '27px',
+             lineHeight: '27px',
+             marginLeft: '4px'
+           },
+           language: 'zn',
+           data: data
+         })
+        })
         let isWring = '<?php echo $output['count'][1];?>';
         let setTimer
         let num

data/config/win/refill.ini.php

@@ -617,8 +617,8 @@ $wantong_phone = ['name' => 'wantong', 'store_id' => 36, 'qualitys' => '4',
 $zhongst_phone = ['name' => 'zhongst', 'store_id' => 39, 'qualitys' => '2',
     'amount' => [
         10 => [
-            ['goods_id' => 6464, 'price' => 10.04, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6464, 'price' => 10.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6464, 'price' => 10.25, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6464, 'price' => 10.15, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6464, 'price' => 10.01, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
 
@@ -1885,17 +1885,17 @@ $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.25, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6901, 'price' => 10.1, '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.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6902, 'price' => 20.2, '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.15, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6903, 'price' => 30.12, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6903, 'price' => 30.09, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
@@ -2432,32 +2432,32 @@ $guochuang_nation_phone = ['name' => 'guochuang_nation', 'store_id' => 121, 'qua
         ],
         30 => [
             ['goods_id' => 7062, 'price' => 30.21, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7062, 'price' => 30.381, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7062, 'price' => 30.12, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7062, 'price' => 30.39, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 7063, 'price' => 50.2, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7063, 'price' => 50.4, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7063, 'price' => 50.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7063, 'price' => 50.4, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 7064, 'price' => 100.4, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7064, 'price' => 100.25, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7064, 'price' => 100.4, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7064, 'price' => 100.45, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 7065, 'price' => 200.8, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7065, 'price' => 200.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7065, 'price' => 200.8, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7065, 'price' => 200.5, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 7066, 'price' => 301.2, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7066, 'price' => 300.75, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7066, 'price' => 301.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7066, 'price' => 300.75, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
             ['goods_id' => 7067, 'price' => 502, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7067, 'price' => 501.25, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7067, 'price' => 502, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7067, 'price' => 501.25, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
     ],
@@ -2564,16 +2564,16 @@ $hangtong_phone = ['name' => 'hangtong', 'store_id' => 126,'qualitys' => '1',
 $dashang_phone = ['name' => 'dashang', 'store_id' => 127, 'qualitys' => '2',
     'amount' => [
         10 => [
-            ['goods_id' => 7108, 'price' => 9.99, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7108, 'price' => 9.98, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7108, 'price' => 10.08, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7108, 'price' => 10.26, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         20 => [
-            ['goods_id' => 7109, 'price' => 19.98, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7109, 'price' => 19.96, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7109, 'price' => 20.16, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7109, 'price' => 20.32, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         30 => [
-            ['goods_id' => 7110, 'price' => 29.97, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7110, 'price' => 29.94, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7110, 'price' => 30.24, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7110, 'price' => 30.66, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 7111, 'price' => 49.875, 'quality' => 2, 'card_type' => 'chinaunicom'],
@@ -2711,17 +2711,17 @@ $chizeng_phone = ['name' => 'chizeng', 'store_id' => 133, 'qualitys' => '1',
             ['goods_id' => 7149, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 7150, 'price' => 47.45, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7150, 'price' => 47.85, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7150, 'price' => 47.25, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7150, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 7151, 'price' => 94.9, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7151, 'price' => 95.7, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7151, 'price' => 94.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7151, 'price' => 95, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
-            ['goods_id' => 7152, 'price' => 189.8, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7152, 'price' => 191.4, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7152, 'price' => 189, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7152, 'price' => 190, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
@@ -2875,7 +2875,7 @@ $xiaoniu_hf_phone = ['name' => 'xiaoniu_hf', 'store_id' => 141, 'qualitys' => '3
 
 $shuoruan_phone = ['name' => 'shuoruan', 'store_id' => 142, 'qualitys' => '2',
     'amount' => [
-//        10 => [['goods_id' => 7219, 'price' => 9.97, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        10 => [['goods_id' => 7219, 'price' => 10.3, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
 //        20 => [['goods_id' => 7220, 'price' => 19.94, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
 //        30 => [['goods_id' => 7221, 'price' => 29.91, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
         50 => [['goods_id' => 7222, 'price' => 49.85, 'quality' => 2, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],

data/config/xyz/refill.ini.php

@@ -1885,17 +1885,17 @@ $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.25, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6901, 'price' => 10.1, '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.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6902, 'price' => 20.2, '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.15, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6903, 'price' => 30.12, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6903, 'price' => 30.09, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
@@ -2432,32 +2432,32 @@ $guochuang_nation_phone = ['name' => 'guochuang_nation', 'store_id' => 121, 'qua
         ],
         30 => [
             ['goods_id' => 7062, 'price' => 30.21, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7062, 'price' => 30.381, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7062, 'price' => 30.12, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7062, 'price' => 30.39, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 7063, 'price' => 50.2, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7063, 'price' => 50.4, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7063, 'price' => 50.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7063, 'price' => 50.4, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 7064, 'price' => 100.4, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7064, 'price' => 100.25, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7064, 'price' => 100.4, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7064, 'price' => 100.45, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 7065, 'price' => 200.8, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7065, 'price' => 200.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7065, 'price' => 200.8, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7065, 'price' => 200.5, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 7066, 'price' => 301.2, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7066, 'price' => 300.75, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7066, 'price' => 301.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7066, 'price' => 300.75, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
             ['goods_id' => 7067, 'price' => 502, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7067, 'price' => 501.25, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7067, 'price' => 502, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7067, 'price' => 501.25, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
     ],
@@ -2564,16 +2564,16 @@ $hangtong_phone = ['name' => 'hangtong', 'store_id' => 126,'qualitys' => '1',
 $dashang_phone = ['name' => 'dashang', 'store_id' => 127, 'qualitys' => '2',
     'amount' => [
         10 => [
-            ['goods_id' => 7108, 'price' => 9.99, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7108, 'price' => 9.98, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7108, 'price' => 10.08, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7108, 'price' => 10.26, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         20 => [
-            ['goods_id' => 7109, 'price' => 19.98, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7109, 'price' => 19.96, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7109, 'price' => 20.16, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7109, 'price' => 20.32, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         30 => [
-            ['goods_id' => 7110, 'price' => 29.97, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7110, 'price' => 29.94, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7110, 'price' => 30.24, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7110, 'price' => 30.66, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 7111, 'price' => 49.875, 'quality' => 2, 'card_type' => 'chinaunicom'],
@@ -2711,17 +2711,17 @@ $chizeng_phone = ['name' => 'chizeng', 'store_id' => 133, 'qualitys' => '1',
             ['goods_id' => 7149, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 7150, 'price' => 47.45, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7150, 'price' => 47.85, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7150, 'price' => 47.25, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7150, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 7151, 'price' => 94.9, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7151, 'price' => 95.7, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7151, 'price' => 94.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7151, 'price' => 95, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
-            ['goods_id' => 7152, 'price' => 189.8, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7152, 'price' => 191.4, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7152, 'price' => 189, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7152, 'price' => 190, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],

data/config/xyzadm/refill.ini.php

@@ -1885,17 +1885,17 @@ $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.25, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6901, 'price' => 10.1, '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.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6902, 'price' => 20.2, '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.15, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6903, 'price' => 30.12, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6903, 'price' => 30.09, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
@@ -2432,32 +2432,32 @@ $guochuang_nation_phone = ['name' => 'guochuang_nation', 'store_id' => 121, 'qua
         ],
         30 => [
             ['goods_id' => 7062, 'price' => 30.21, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7062, 'price' => 30.381, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7062, 'price' => 30.12, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7062, 'price' => 30.39, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 7063, 'price' => 50.2, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7063, 'price' => 50.4, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7063, 'price' => 50.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7063, 'price' => 50.4, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         100 => [
             ['goods_id' => 7064, 'price' => 100.4, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7064, 'price' => 100.25, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7064, 'price' => 100.4, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7064, 'price' => 100.45, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         200 => [
             ['goods_id' => 7065, 'price' => 200.8, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7065, 'price' => 200.5, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7065, 'price' => 200.8, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7065, 'price' => 200.5, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         300 => [
             ['goods_id' => 7066, 'price' => 301.2, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7066, 'price' => 300.75, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7066, 'price' => 301.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7066, 'price' => 300.75, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         500 => [
             ['goods_id' => 7067, 'price' => 502, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7067, 'price' => 501.25, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7067, 'price' => 502, 'quality' => 2, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7067, 'price' => 501.25, 'quality' => 2, 'card_type' => 'chinatelecom']
         ]
     ],
@@ -2564,16 +2564,16 @@ $hangtong_phone = ['name' => 'hangtong', 'store_id' => 126,'qualitys' => '1',
 $dashang_phone = ['name' => 'dashang', 'store_id' => 127, 'qualitys' => '2',
     'amount' => [
         10 => [
-            ['goods_id' => 7108, 'price' => 9.99, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7108, 'price' => 9.98, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7108, 'price' => 10.08, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7108, 'price' => 10.26, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         20 => [
-            ['goods_id' => 7109, 'price' => 19.98, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7109, 'price' => 19.96, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7109, 'price' => 20.16, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7109, 'price' => 20.32, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         30 => [
-            ['goods_id' => 7110, 'price' => 29.97, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 7110, 'price' => 29.94, 'quality' => 2, 'card_type' => 'chinatelecom']
+            ['goods_id' => 7110, 'price' => 30.24, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7110, 'price' => 30.66, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         50 => [
             ['goods_id' => 7111, 'price' => 49.875, 'quality' => 2, 'card_type' => 'chinaunicom'],
@@ -2711,17 +2711,17 @@ $chizeng_phone = ['name' => 'chizeng', 'store_id' => 133, 'qualitys' => '1',
             ['goods_id' => 7149, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 7150, 'price' => 47.45, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7150, 'price' => 47.85, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7150, 'price' => 47.25, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7150, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 7151, 'price' => 94.9, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7151, 'price' => 95.7, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7151, 'price' => 94.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7151, 'price' => 95, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         200 => [
-            ['goods_id' => 7152, 'price' => 189.8, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 7152, 'price' => 191.4, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 7152, 'price' => 189, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 7152, 'price' => 190, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],