Ver código fonte

Merge branch 'ralb' into forder

stanley-king 3 anos atrás
pai
commit
96ac3ded98
32 arquivos alterados com 1358 adições e 324 exclusões
  1. 14 2
      admin/control/ordersendlist.php
  2. 37 1
      admin/control/refill_detail.php
  3. 1 1
      admin/control/refill_order.php
  4. 1 1
      admin/templates/default/merchant.index.php
  5. 99 6
      admin/templates/default/refill.detail.php
  6. 2 0
      admin/templates/default/refill.order.index.php
  7. 2 0
      admin/templates/default/refill.order.neterr.index.php
  8. 2 0
      admin/templates/default/refill.order.notify.err.index.php
  9. 24 17
      admin/templates/default/refill.order.send.index.php
  10. 11 0
      crontab/control/date.php
  11. 194 77
      data/config/win/refill.ini.php
  12. 194 77
      data/config/xyz/refill.ini.php
  13. 194 77
      data/config/xyzadm/refill.ini.php
  14. 1 0
      docker/compose/xyz/conf/crontab/root
  15. 1 0
      helper/mtopcard/mtopcard.php
  16. 8 10
      helper/refill/RefillBase.php
  17. BIN
      helper/refill/api/xyz/cangbukami/APIdoc直冲.docx
  18. 71 0
      helper/refill/api/xyz/cangbukami/RefillCallBack.php
  19. 117 0
      helper/refill/api/xyz/cangbukami/RefillPhone.php
  20. 6 0
      helper/refill/api/xyz/cangbukami/account.txt
  21. 24 0
      helper/refill/api/xyz/cangbukami/config.php
  22. 55 0
      helper/refill/api/xyz/sialan/RefillCallBack.php
  23. 127 0
      helper/refill/api/xyz/sialan/RefillPhone.php
  24. 11 0
      helper/refill/api/xyz/sialan/account.txt
  25. 56 0
      helper/refill/api/xyz/sialan/config.php
  26. 51 51
      helper/refill/api/xyz/tiancheng/RefillCallBack.php
  27. 15 1
      helper/refill/policy/lingzh/policy.php
  28. 15 1
      helper/refill/policy/xyz/policy.php
  29. 1 1
      helper/refill/util.php
  30. 6 0
      mobile/callback/refill_sialan.php
  31. 1 1
      rdispatcher/proxy.php
  32. 17 0
      test/TestRefill.php

+ 14 - 2
admin/control/ordersendlist.php

@@ -1,6 +1,6 @@
 <?php
 
-
+require_once(BASE_HELPER_PATH . '/refill/RefillFactory.php');
 class ordersendlistControl extends SystemControl
 {
     public function __construct()
@@ -177,7 +177,19 @@ class ordersendlistControl extends SystemControl
                     $order_list[$order_id]['time_out_state'] = 1;
                 }
                 if(in_array($order_info['card_type'],[mtopcard\ChinaMobileCard,mtopcard\ChinaUnicomCard,mtopcard\ChinaTelecomCard])) {
-                    $order_list[$order_id]['time_out_state'] = 2;
+                    if (in_array($order_info['quality'], [
+                        \refill\Quality::SlowTwentyFour,
+                        \refill\Quality::SlowSix,
+                        \refill\Quality::SlowTwo,
+                        \refill\Quality::SlowFortyEight,
+                        \refill\Quality::SlowSeventyTwo])) {
+                        $order_list[$order_id]['time_out_state'] = 2;
+                    } elseif(in_array($order_info['mchid'],[10132])) {
+                        //重点机构
+                        $order_list[$order_id]['time_out_state'] = 3;
+                    } else {
+                        $order_list[$order_id]['time_out_state'] = 4;
+                    }
                 }
             }else{
                 $order_list[$order_id]['time_out_state'] = 0;

+ 37 - 1
admin/control/refill_detail.php

@@ -1,6 +1,7 @@
 <?php
+require_once(BASE_HELPER_PATH . '/refill/util.php');
 
-
+use refill\util;
 class refill_detailControl extends SystemControl
 {
     public function __construct()
@@ -136,4 +137,39 @@ class refill_detailControl extends SystemControl
         $excel_obj->generateXML($excel_obj->charset(L('exp_od_order'), CHARSET) . date('Y-m-d-H', time()));
         exit;
     }
+
+    public function order_disposeOp()
+    {
+        $id = $_GET['id'];
+        $type = $_GET['type'];
+        $condition['detail_id'] = ['in',$id];
+        $condition['order_state'] = ORDER_STATE_QUEUE;
+
+        $refill_detail = Model('refill_detail')->where($condition)->select();
+        $mod = Model('refill_order');
+        foreach ($refill_detail as $detail) {
+            $mchid = $detail['mchid'];
+            $mch_order = $detail['mch_order'];
+            Log::record("mchid: {$mchid} , mch_order: {$mch_order}", Log::DEBUG);
+            $refill_order = $mod->getOrderInfo(['mchid' => $mchid,'mch_order' => $mch_order]);
+            if (empty($refill_order)) {
+                Log::record("order dispose type:{$type}, params:{$detail['params']}",Log::DEBUG);
+                $params = json_decode($detail['params'],true);
+                if ($type == 'cancel') {
+                    //零元订单失败
+                    Log::record("cancel",Log::DEBUG);
+                    util::push_add_zero($params);
+                } elseif ($type == 'anew') {
+                    //重新补充
+                    Log::record("anew",Log::DEBUG);
+                    util::push_add($params);
+                } else {
+                    continue;
+                }
+            } else {
+                util::pop_queue_order($mchid,$mch_order);
+            }
+        }
+        showMessage('操作成功');
+    }
 }

+ 1 - 1
admin/control/refill_order.php

@@ -325,7 +325,7 @@ class refill_orderControl extends SystemControl
         $condition['refill_order.order_time'] = ['egt', $order_time];
         $condition['refill_order.mchid'] = $mchid;
 
-        $field = 'refill_order.order_sn,refill_order.commit_time,refill_order.notify_time,refill_order.channel_name,vr_order.order_state';
+        $field = 'refill_order.order_sn,refill_order.commit_time,refill_order.notify_time,refill_order.channel_name,vr_order.order_state,refill_order.err_msg';
         $order_list = $model_refill_order->getMerchantOrderList($condition, 1000, $field);
 
         foreach ($order_list as $order_id => $order_info) {

+ 1 - 1
admin/templates/default/merchant.index.php

@@ -20,7 +20,7 @@ defined('InShopNC') or exit('Access Invalid!'); ?>
             <tbody>
             <tr>
                 <th><label for="merchant_name"><?php echo $lang['merchant_name']; ?></label></th>
-                <td><input type="text" value="<?php echo $output['merchant_name']; ?>" name="merchant_name"
+                <td><input type="text" value="<?php echo $_GET['merchant_name']; ?>" name="merchant_name"
                            id="merchant_name" class="txt"></td>
                 <td><a href="javascript:void(0);" id="ncsubmit" class="btn-search "
                        title="<?php echo $lang['nc_query']; ?>">&nbsp;</a>

+ 99 - 6
admin/templates/default/refill.detail.php

@@ -133,6 +133,12 @@
                     <a href="#" class="btns" onclick="hCopyOrder(event)">
                         <span><i class="icon-edit"></i>拷贝客户单号</span>
                     </a>
+                    <a href="#" class="btns"  id="hFail">
+                        <span><i class="icon-edit"></i>批量失败</span>
+                    </a>
+                    <a href="#" class="btns" id="hSupplement">
+                        <span><i class="icon-edit"></i>批量补充</span>
+                    </a>
                 </td>
             </tr>
         </table>
@@ -148,6 +154,7 @@
             <th class="align-center">充值额度</th>
             <th class="align-right">下单日期</th>
             <th class="align-center">订单状态</th>
+            <th class="align-center"><?php echo $lang['nc_handle']; ?></th>            
         </tr>
         </thead>
         <tbody id="tbody">
@@ -165,6 +172,16 @@
                     <td class="align-center"><?php echo $order['params']['amount']; ?></td>
                     <td class="align-right"><?php echo date('Y-m-d H:i:s', $order['order_time']) ?? '/'; ?></td>
                     <td class="align-center"><?php echo $order['order_state_text']; ?></td>
+                    <td class="align-center">
+                        <!-- <a href="#">
+                                回调</a>
+                        | -->
+                        <a href="index.php?act=refill_detail&op=order_dispose&type=cancel&id=<?php echo $order['detail_id']; ?>" id="hdFail">
+                        回调失败</a>
+                        |
+                        <a href="index.php?act=refill_detail&op=order_dispose&type=anew&id=<?php echo $order['detail_id']; ?>">
+                        重新补充</a>
+                    </td>
                 </tr>
             <?php } ?>
         <?php } else { ?>
@@ -210,22 +227,87 @@
             elem: '#endTime',
             type: 'datetime'
         });
+ 
+
         //全选
-        $('#selectAll' ).click ( function () {
-            $(":checkbox[name='checkbox']").each(function(){
-            $(this).attr("checked", !$(this).attr("checked"));
-		});
-        let arr = [];
+          //全选
+          $('#selectAll' ).click ( function () {
+          if ($(this).text() == '全选') {
+              $("input[name='checkbox']").each(function() {
+                  this.checked = true;
+              })
+              $(this).text("取消全选")
+          } else {
+              $("input[name='checkbox']").each(function() {
+                  this.checked = false;
+              })
+              $(this).text("全选")
+
+          }
+     
+
+            })
+
+            
+
+            
+            //批量
+            $('#hFail').click(function () {
+                layer.confirm('您确定要批量失败', {
+                btn: ['确定','取消'],
+                title:'批量失败'
+            }, function(){
+
+
+             let arr = [];
             $("input:checkbox:checked").each(function (i) {
                 arr[i] = $(this).val();
             })
             let str = arr.join(",");
+            if (str != '') {
+            window.location.href =`index.php?act=refill_detail&op=order_dispose&id= ${str ? str : ''}&type=cancel`
             console.log(str);
+            layer.msg('批量成功', {icon: 1});
 
-            
+            } else {
+                layer.msg('请还没有任何操作,请先选择');
+            }
 
+		
+
+            }, function(){
+            });
             })
 
+                        //批量
+                $('#hSupplement').click(function () {
+                layer.confirm('您确定要批量补充', {
+                btn: ['确定','取消'],
+                title:'批量失败'
+            }, function(){
+
+
+             let arr = [];
+            $("input:checkbox:checked").each(function (i) {
+                arr[i] = $(this).val();
+            })
+            let str = arr.join(",");
+            if (str != '') {
+            window.location.href =`index.php?act=refill_detail&op=order_dispose&id= ${str ? str : ''}&type=anew`
+            console.log(str);
+            layer.msg('批量成功', {icon: 1});
+
+            } else {
+                layer.msg('请还没有任何操作,请先选择');
+            }
+
+		
+
+            }, function(){
+            });
+            })
+      
+
         // 表格hover时背景
         $('.trFlex').each(function () {
             let data_color = $(this).attr('data-timeout_State');
@@ -268,4 +350,15 @@
         document.execCommand("Copy"); // 执行浏览器复制命令
         oInput.parentNode.removeChild(oInput)
     }
+
+    //批量补充
+    // function hSupplement(e) {
+    //     layer.confirm('您确定要批量补充', {
+    //     btn: ['确定','取消'],
+    //     title:'批量补充'
+    // }, function(){
+    //     layer.msg('1', {icon: 1});
+    // }, function(){
+    // });
+    // }
 </script> 

+ 2 - 0
admin/templates/default/refill.order.index.php

@@ -558,6 +558,7 @@
                                          <td class="db-center">${item.diff_time_text}</td>
                                          <td class="db-center">${item.order_state_text}</td>
                                          <td class="db-center">${item.channel_name}</td>
+                                         <td class="db-center">${item.err_msg}</td>
 
 
                              <tr>
@@ -576,6 +577,7 @@
                                          <th class="db-right">耗时</th>
                                          <th class="db-right">订单状态</th>
                                          <th class="db-right">供方名称</th>
+                                         <th class="db-right">错误原因</th>
 
                              </tr>
                     </thead>

+ 2 - 0
admin/templates/default/refill.order.neterr.index.php

@@ -227,6 +227,7 @@
                                          <td class="db-center">${item.diff_time_text}</td>
                                          <td class="db-center">${item.order_state_text}</td>
                                          <td class="db-center">${item.channel_name}</td>
+                                         <td class="db-center">${item.err_msg}</td>
 
 
                              <tr>
@@ -245,6 +246,7 @@
                                          <th class="db-right">耗时</th>
                                          <th class="db-right">订单状态</th>
                                          <th class="db-right">供方名称</th>
+                                         <th class="db-right">错误原因</th>
 
                              </tr>
                     </thead>

+ 2 - 0
admin/templates/default/refill.order.notify.err.index.php

@@ -322,6 +322,7 @@
                                          <td class="db-center">${item.diff_time_text}</td>
                                          <td class="db-center">${item.order_state_text}</td>
                                          <td class="db-center">${item.channel_name}</td>
+                                         <td class="db-center">${item.err_msg}</td>
 
 
                              <tr>
@@ -340,6 +341,7 @@
                                          <th class="db-right">耗时</th>
                                          <th class="db-right">订单状态</th>
                                          <th class="db-right">供方名称</th>
+                                         <th class="db-right">错误原因</th>
 
                              </tr>
                     </thead>

+ 24 - 17
admin/templates/default/refill.order.send.index.php

@@ -395,6 +395,7 @@
                                          <td class="db-center">${item.diff_time_text}</td>
                                          <td class="db-center">${item.order_state_text}</td>
                                          <td class="db-center">${item.channel_name}</td>
+                                         <td class="db-center">${item.err_msg}</td>
 
 
                              <tr>
@@ -413,6 +414,7 @@
                                          <th class="db-right">耗时</th>
                                          <th class="db-right">订单状态</th>
                                          <th class="db-right">供方名称</th>
+                                         <th class="db-right">错误原因</th>
 
                              </tr>
                     </thead>
@@ -449,27 +451,32 @@
         // 表格hover时背景
         $('.trFlex').each(function () {
             let data_color = $(this).attr('data-timeout_State');
-         if (data_color == 1) {
-            $(this).css('background', '#f1dde6')
-         } else if (data_color == 2) {
-            $(this).css('background', '#f2f3c6')
-
-         } else {
-            $(this).css('background', '#fff')
-         }
+            if (data_color == 1) {
+                $(this).css('background', '#f1dde6')
+            } else if (data_color == 2) {
+                $(this).css('background', '#f2f3c6')
+            } else if (data_color == 3) {
+                $(this).css('background', '#ff7575')
+            } else if (data_color == 4) {
+                $(this).css('background', '#81C0C0')
+            } else {
+                $(this).css('background', '#fff')
+            }
             $(this).hover(function () {
                 $(this)[0].style.backgroundColor = '#cbe9f3'
             }, function () {
                 let data_color = $(this).attr('data-timeout_State');
-         if (data_color == 1) {
-            $(this).css('background', '#f1dde6')
-         } 
-         else if (data_color == 2) {
-            $(this).css('background', '#f2f3c6')
-
-         } else {
-            $(this).css('background', '#fff')
-         }
+                if (data_color == 1) {
+                    $(this).css('background', '#f1dde6')
+                } else if (data_color == 2) {
+                    $(this).css('background', '#f2f3c6')
+                } else if (data_color == 3) {
+                    $(this).css('background', '#ff7575')
+                } else if (data_color == 4) {
+                    $(this).css('background', '#81C0C0')
+                } else {
+                    $(this).css('background', '#fff')
+                }
             })
         })
         // 供方名称颜色

+ 11 - 0
crontab/control/date.php

@@ -115,6 +115,17 @@ class dateControl extends BaseCronControl
         $refill->run();
     }
 
+    public function merchant_availableOp()
+    {
+        $merchant = Model('merchant')->getMerchantList([], 1000, '', true,'merchant.mchid,member.available_predeposit');
+        $merchants = [];
+        foreach ($merchant as $value) {
+            $merchants[$value['mchid']] = $value['available_predeposit'];
+        }
+        $time = date("Y-m-d");
+        wcache("merchant_balance_{$time}", ['data' => serialize($merchants)], 'refill-');
+    }
+
     public function nine_clockOp()
     {
         //订单自动完成

+ 194 - 77
data/config/win/refill.ini.php

@@ -125,11 +125,11 @@ $zeheng_oil = ['name' => 'zeheng', 'store_id' => 51,'qualitys' => '1',
 
 $lingzh_oil = ['name' => 'lingzhoil', 'store_id' => 56, 'qualitys' => '1',
     'amount' => [
-        100 => [['goods_id' => 6579, 'price' => 97, 'quality' => 1, 'card_type' => 'sinopec,petrochina']],
-        200 => [['goods_id' => 6580, 'price' => 194, 'quality' => 1, 'card_type' => 'sinopec,petrochina']],
-        500 => [['goods_id' => 6581, 'price' => 485, 'quality' => 1, 'card_type' => 'sinopec,petrochina']],
-        1000 => [['goods_id' => 6582, 'price' => 970, 'quality' => 1, 'card_type' => 'sinopec,petrochina']],
-        2000 => [['goods_id' => 6583, 'price' => 1940, 'quality' => 1, 'card_type' => 'sinopec,petrochina']]
+        100 => [['goods_id' => 6579, 'price' => 97.2, 'quality' => 1, 'card_type' => 'sinopec,petrochina']],
+        200 => [['goods_id' => 6580, 'price' => 194.4, 'quality' => 1, 'card_type' => 'sinopec,petrochina']],
+        500 => [['goods_id' => 6581, 'price' => 486, 'quality' => 1, 'card_type' => 'sinopec,petrochina']],
+        1000 => [['goods_id' => 6582, 'price' => 972, 'quality' => 1, 'card_type' => 'sinopec,petrochina']],
+        2000 => [['goods_id' => 6583, 'price' => 1944, 'quality' => 1, 'card_type' => 'sinopec,petrochina']]
     ],
     'period' => [], 'refill_type' => 'api'];
 
@@ -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' => 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']]
+        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']]
     ],
     'period' => [], 'refill_type' => 'api'];
 
@@ -239,32 +239,32 @@ $lingzh_phone = ['name' => 'lingzh', 'store_id' => 28,'qualitys' => '1,3,4,5,6',
             ['goods_id' => 6390, 'price' => 17.98, 'quality' => 6, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']
         ],
         30 => [
-            ['goods_id' => 6391, 'price' => 28.59, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6391, 'price' => 28.53, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
+            ['goods_id' => 6391, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6391, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
             ['goods_id' => 6391, 'price' => 28.59, 'quality' => 3, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6391, 'price' => 26.85, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6391, 'price' => 26.97, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6391, 'price' => 26.97, 'quality' => 6, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6392, 'price' => 47.65, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6392, 'price' => 47.55, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
+            ['goods_id' => 6392, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6392, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
             ['goods_id' => 6392, 'price' => 47.65, 'quality' => 3, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6392, 'price' => 44.75, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6392, 'price' => 44.95, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6392, 'price' => 44.95, 'quality' => 6, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6393, 'price' => 95.3, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6393, 'price' => 95.1, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
+            ['goods_id' => 6393, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6393, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
             ['goods_id' => 6393, 'price' => 95.3, 'quality' => 3, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6393, 'price' => 89.5, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6393, 'price' => 89.9, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6393, 'price' => 89.9, 'quality' => 6, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6394, 'price' => 190.60, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6394, 'price' => 190.20, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
+            ['goods_id' => 6394, 'price' => 189.60, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6394, 'price' => 189.60, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
             ['goods_id' => 6394, 'price' => 190.60, 'quality' => 3, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6394, 'price' => 179, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6394, 'price' => 179.8, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
@@ -402,12 +402,12 @@ $afandeng_phone = ['name' => 'afandeng', 'store_id' => 27,'qualitys' => '1',
 
 $tongy_phone = ['name' => 'tongy', 'store_id' => 31,'qualitys' => '1',
     'amount' => [
-        30 => [['goods_id' => 6408, 'price' => 28.71, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        50 => [['goods_id' => 6409, 'price' => 47.85, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        100 => [['goods_id' => 6410, 'price' => 95.7, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        200 => [['goods_id' => 6411, 'price' => 191.4, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        300 => [['goods_id' => 6412, 'price' => 287.1, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        500 => [['goods_id' => 6413, 'price' => 478.5, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+        30 => [['goods_id' => 6408, 'price' => 28.74, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        50 => [['goods_id' => 6409, 'price' => 47.9, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        100 => [['goods_id' => 6410, 'price' => 95.8, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        200 => [['goods_id' => 6411, 'price' => 191.6, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        300 => [['goods_id' => 6412, 'price' => 287.4, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        500 => [['goods_id' => 6413, 'price' => 479, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
@@ -480,35 +480,35 @@ $xunyin_phone = ['name' => 'xunyin', 'store_id' => 35,'qualitys' => '2',
     'amount' => [
         10 => [
             ['goods_id' => 6438, 'price' => 10, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6438, 'price' => 9.97, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6438, 'price' => 10, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         20 => [
             ['goods_id' => 6439, 'price' => 20, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6439, 'price' => 19.94, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6439, 'price' => 20, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         30 => [
             ['goods_id' => 6440, 'price' => 30, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6440, 'price' => 29.91, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6440, 'price' => 30, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         50 => [
             ['goods_id' => 6441, 'price' => 50, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6441, 'price' => 49.85, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6441, 'price' => 50, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         100 => [
             ['goods_id' => 6442, 'price' => 100, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6442, 'price' => 99.7, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6442, 'price' => 100, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         200 => [
             ['goods_id' => 6443, 'price' => 200, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6443, 'price' => 199.4, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6443, 'price' => 200, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         300 => [
             ['goods_id' => 6444, 'price' => 300, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6444, 'price' => 299.1, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6444, 'price' => 300, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         500 => [
             ['goods_id' => 6445, 'price' => 500, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6445, 'price' => 498.5, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6445, 'price' => 500, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
         ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
@@ -526,16 +526,52 @@ $wantong_phone = ['name' => 'wantong', 'store_id' => 36, 'qualitys' => '4',
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
-$zhongst_phone = ['name' => 'zhongst', 'store_id' => 39, 'qualitys' => '5',
+$zhongst_phone = ['name' => 'zhongst', 'store_id' => 39, 'qualitys' => '2',
     'amount' => [
-        10 => [['goods_id' => 6464, 'price' => 9.1, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        20 => [['goods_id' => 6465, 'price' => 18.2, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        30 => [['goods_id' => 6466, 'price' => 27.3, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        50 => [['goods_id' => 6467, 'price' => 45.5, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        100 => [['goods_id' => 6468, 'price' => 91, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        200 => [['goods_id' => 6469, 'price' => 182, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        300 => [['goods_id' => 6470, 'price' => 273, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        500 => [['goods_id' => 6471, 'price' => 455, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+        10 => [
+            ['goods_id' => 6464, 'price' => 10.03, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6464, 'price' => 10.03, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6464, 'price' => 10.01, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+
+        20 => [
+            ['goods_id' => 6465, 'price' => 20.06, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6465, 'price' => 20.06, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6465, 'price' => 20.02, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+
+        30 => [
+            ['goods_id' => 6466, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6466, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6466, 'price' => 30.03, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+
+        50 => [
+            ['goods_id' => 6467, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6467, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6467, 'price' => 50.05, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+
+        100 => [
+            ['goods_id' => 6468, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6468, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6468, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        200 => [
+            ['goods_id' => 6469, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6469, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6469, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        300 => [
+            ['goods_id' => 6470, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6470, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6470, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        500 => [
+            ['goods_id' => 6471, 'price' => 501, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6471, 'price' => 501, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6471, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
@@ -568,35 +604,35 @@ $afandfs_phone = ['name' => 'afandfs', 'store_id' => 41, 'qualitys' => '1',
 $yunling_phone = ['name' => 'yunling', 'store_id' => 37, 'qualitys' => '1',
     'amount' => [
         10 => [
-            ['goods_id' => 6456, 'price' => 9.53, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6456, 'price' => 9.55, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6456, 'price' => 9.53, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         20 => [
-            ['goods_id' => 6457, 'price' => 19.06, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6457, 'price' => 19.1, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6457, 'price' => 19.06, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         30 => [
-            ['goods_id' => 6458, 'price' => 28.59, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6458, 'price' => 28.65, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6458, 'price' => 28.59, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6459, 'price' => 47.65, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6459, 'price' => 47.75, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6459, 'price' => 47.65, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6460, 'price' => 95.3, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6460, 'price' => 95.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6460, 'price' => 95.3, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6461, 'price' => 190.6, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6461, 'price' => 191, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6461, 'price' => 190.6, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         300 => [
-            ['goods_id' => 6462, 'price' => 285.9, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6462, 'price' => 286.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6462, 'price' => 285.9, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         500 => [
-            ['goods_id' => 6463, 'price' => 476.5, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6463, 'price' => 477.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6463, 'price' => 476.5, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ]
     ],
@@ -693,29 +729,51 @@ $weiyiman_phone = ['name' => 'weiyiman', 'store_id' => 45, 'qualitys' => '5',
 
 $yonghe_phone = ['name' => 'yonghe', 'store_id' => 46,'qualitys' => '2',
     'amount' => [
-        30 => [['goods_id' => 6520, 'price' => 29.955, 'quality' => 2, 'card_type' => 'chinamobile'],
+        10 => [
+            ['goods_id' => 6849, 'price' => 9.99, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6849, 'price' => 9.99, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+
+        20 => [
+            ['goods_id' => 6850, 'price' => 19.98, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6850, 'price' => 19.98, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+
+        30 => [
+            ['goods_id' => 6520, 'price' => 29.97, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6520, 'price' => 29.985, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6520, 'price' => 29.82, 'quality' => 2, 'card_type' => 'chinatelecom']],
+            ['goods_id' => 6520, 'price' => 29.97, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
 
-        50 => [['goods_id' => 6521, 'price' => 49.925, 'quality' => 2, 'card_type' => 'chinamobile'],
+        50 => [
+            ['goods_id' => 6521, 'price' => 49.95, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6521, 'price' => 49.975, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6521, 'price' => 49.7, 'quality' => 2, 'card_type' => 'chinatelecom']],
+            ['goods_id' => 6521, 'price' => 49.95, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
 
-        100 => [['goods_id' => 6522, 'price' => 99.85, 'quality' => 2, 'card_type' => 'chinamobile'],
+        100 => [
+            ['goods_id' => 6522, 'price' => 99.9, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6522, 'price' => 99.95, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6522, 'price' => 99.4, 'quality' => 2, 'card_type' => 'chinatelecom']],
+            ['goods_id' => 6522, 'price' => 99.9, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
 
-        200 => [['goods_id' => 6523, 'price' => 199.7, 'quality' => 2, 'card_type' => 'chinamobile'],
+        200 => [
+            ['goods_id' => 6523, 'price' => 199.8, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6523, 'price' => 199.9, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6523, 'price' => 198.8, 'quality' => 2, 'card_type' => 'chinatelecom']],
+            ['goods_id' => 6523, 'price' => 199.8, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
 
-        300 => [['goods_id' => 6524, 'price' => 299.55, 'quality' => 2, 'card_type' => 'chinamobile'],
+        300 => [
+            ['goods_id' => 6524, 'price' => 299.7, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6524, 'price' => 299.85, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6524, 'price' => 298.2, 'quality' => 2, 'card_type' => 'chinatelecom']],
+            ['goods_id' => 6524, 'price' => 299.7, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
 
-        500 => [['goods_id' => 6525, 'price' => 499.25, 'quality' => 2, 'card_type' => 'chinamobile'],
+        500 => [
+            ['goods_id' => 6525, 'price' => 499.5, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6525, 'price' => 499.75, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6525, 'price' => 497, 'quality' => 2, 'card_type' => 'chinatelecom']]
+            ['goods_id' => 6525, 'price' => 499.5, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
@@ -741,20 +799,20 @@ $qianqian_phone = ['name' => 'qianqian', 'store_id' => 48, 'qualitys' => '1',
 //            ['goods_id' => 74, 'price' => 19.06, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
 //        ],
         30 => [
-            ['goods_id' => 6529, 'price' => 28.59, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6529, 'price' => 28.53, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6529, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6529, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6530, 'price' => 47.65, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6530, 'price' => 47.55, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6530, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6530, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6531, 'price' => 95.3, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6531, 'price' => 95.1, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6531, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6531, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6532, 'price' => 190.6, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6532, 'price' => 190.2, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6532, 'price' => 189.6, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6532, 'price' => 189.6, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
@@ -847,21 +905,21 @@ $weiyiwt_phone = ['name' => 'weiyiwt', 'store_id' => 58,'qualitys' => '1',
             ['goods_id' => 6596, 'price' => 18.9, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         30 => [
-            ['goods_id' => 6597, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6597, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6597, 'price' => 28.8, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6597, 'price' => 28.35, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6598, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6598, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6598, 'price' => 48, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6598, 'price' => 47.25, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6599, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6599, 'price' => 95, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6599, 'price' => 94.5, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6600, 'price' => 189.6, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6600, 'price' => 190, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6600, 'price' => 189, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         300 => [
@@ -1315,19 +1373,19 @@ $cangbu_phone = ['name' => 'cangbu', 'store_id' => 78,'qualitys' => '1',
             ['goods_id' => 6745, 'price' => 18.96, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         30 => [
-            ['goods_id' => 6746, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6746, 'price' => 28.62, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6746, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
         ],
         50 => [
-            ['goods_id' => 6747, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6747, 'price' => 47.7, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6747, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
         ],
         100 => [
-            ['goods_id' => 6748, 'price' => 95, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6748, 'price' => 95.4, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6748, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6749, 'price' => 190, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6749, 'price' => 190.8, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6749, 'price' => 189.6, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         300 => [
@@ -1556,6 +1614,63 @@ $yuecheng_phone = ['name' => 'yuecheng', 'store_id' => 93, 'qualitys' => '2',
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
+$cangbukami_phone = ['name' => 'cangbukami', 'store_id' => 83, 'qualitys' => '3',
+    'amount' => [
+        20 => [['goods_id' => 6770, 'price' => 19.08, 'quality' => 3, 'card_type' => 'chinaunicom']],
+        30 => [['goods_id' => 6771, 'price' => 28.62, 'quality' => 3, 'card_type' => 'chinaunicom']],
+        50 => [['goods_id' => 6772, 'price' => 47.7, 'quality' => 3, 'card_type' => 'chinaunicom']],
+        100 => [['goods_id' => 6773, 'price' => 95.4, 'quality' => 3, 'card_type' => 'chinaunicom']],
+        200 => [['goods_id' => 6774, 'price' => 190.8, 'quality' => 3, 'card_type' => 'chinaunicom']],
+        300 => [['goods_id' => 6775, 'price' => 286.2, 'quality' => 3, 'card_type' => 'chinaunicom']],
+        500 => [['goods_id' => 6776, 'price' => 477, 'quality' => 3, 'card_type' => 'chinaunicom']]
+    ],
+    'official_sn' => true, 'refill_type' => 'api'];
+
+$sialan_phone = ['name' => 'sialan', 'store_id' => 94, 'qualitys' => '2',
+    'amount' => [
+        10 => [
+            ['goods_id' => 6851, 'price' => 10.02, 'quality' => 2, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 6851, 'price' => 9.93, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6851, 'price' => 10, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        20 => [
+            ['goods_id' => 6852, 'price' => 20.04, 'quality' => 2, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 6852, 'price' => 9.93, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6852, 'price' => 20, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        30 => [
+            ['goods_id' => 6853, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6853, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6853, 'price' => 30, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        50 => [
+            ['goods_id' => 6854, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6854, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6854, 'price' => 50, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        100 => [
+            ['goods_id' => 6855, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6855, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6855, 'price' => 100, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        200 => [
+            ['goods_id' => 6856, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6856, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6856, 'price' => 200, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        300 => [
+            ['goods_id' => 6857, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6857, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6857, 'price' => 300, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        500 => [
+            ['goods_id' => 6858, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6858, 'price' => 501, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6858, 'price' => 500, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ]
+    ],
+    'official_sn' => true, 'refill_type' => 'api'];
+
 $phone_providers = [
 //    ['name' => 'beixt', 'cfg' => $beixt_phone],
 //    ['name' => 'bxtwt', 'cfg' => $bxtwt_phone],
@@ -1620,7 +1735,9 @@ $phone_providers = [
     ['name' => 'hongxudayz996', 'cfg' => $hongxudayz996_phone],
     ['name' => 'hongxudagy996', 'cfg' => $hongxudagy996_phone],
     ['name' => 'bingdht', 'cfg' => $bingdht_phone],
-    ['name' => 'yuecheng', 'cfg' => $yuecheng_phone]
+    ['name' => 'yuecheng', 'cfg' => $yuecheng_phone],
+    ['name' => 'cangbukami', 'cfg' => $cangbukami_phone],
+    ['name' => 'sialan', 'cfg' => $sialan_phone]
 ];
 $config['phone_providers'] = $phone_providers;
 

+ 194 - 77
data/config/xyz/refill.ini.php

@@ -125,11 +125,11 @@ $zeheng_oil = ['name' => 'zeheng', 'store_id' => 51,'qualitys' => '1',
 
 $lingzh_oil = ['name' => 'lingzhoil', 'store_id' => 56, 'qualitys' => '1',
     'amount' => [
-        100 => [['goods_id' => 6579, 'price' => 97, 'quality' => 1, 'card_type' => 'sinopec,petrochina']],
-        200 => [['goods_id' => 6580, 'price' => 194, 'quality' => 1, 'card_type' => 'sinopec,petrochina']],
-        500 => [['goods_id' => 6581, 'price' => 485, 'quality' => 1, 'card_type' => 'sinopec,petrochina']],
-        1000 => [['goods_id' => 6582, 'price' => 970, 'quality' => 1, 'card_type' => 'sinopec,petrochina']],
-        2000 => [['goods_id' => 6583, 'price' => 1940, 'quality' => 1, 'card_type' => 'sinopec,petrochina']]
+        100 => [['goods_id' => 6579, 'price' => 97.2, 'quality' => 1, 'card_type' => 'sinopec,petrochina']],
+        200 => [['goods_id' => 6580, 'price' => 194.4, 'quality' => 1, 'card_type' => 'sinopec,petrochina']],
+        500 => [['goods_id' => 6581, 'price' => 486, 'quality' => 1, 'card_type' => 'sinopec,petrochina']],
+        1000 => [['goods_id' => 6582, 'price' => 972, 'quality' => 1, 'card_type' => 'sinopec,petrochina']],
+        2000 => [['goods_id' => 6583, 'price' => 1944, 'quality' => 1, 'card_type' => 'sinopec,petrochina']]
     ],
     'period' => [], 'refill_type' => 'api'];
 
@@ -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' => 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']]
+        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']]
     ],
     'period' => [], 'refill_type' => 'api'];
 
@@ -239,32 +239,32 @@ $lingzh_phone = ['name' => 'lingzh', 'store_id' => 28,'qualitys' => '1,3,4,5,6',
             ['goods_id' => 6390, 'price' => 17.98, 'quality' => 6, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']
         ],
         30 => [
-            ['goods_id' => 6391, 'price' => 28.59, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6391, 'price' => 28.53, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
+            ['goods_id' => 6391, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6391, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
             ['goods_id' => 6391, 'price' => 28.59, 'quality' => 3, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6391, 'price' => 26.85, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6391, 'price' => 26.97, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6391, 'price' => 26.97, 'quality' => 6, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6392, 'price' => 47.65, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6392, 'price' => 47.55, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
+            ['goods_id' => 6392, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6392, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
             ['goods_id' => 6392, 'price' => 47.65, 'quality' => 3, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6392, 'price' => 44.75, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6392, 'price' => 44.95, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6392, 'price' => 44.95, 'quality' => 6, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6393, 'price' => 95.3, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6393, 'price' => 95.1, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
+            ['goods_id' => 6393, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6393, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
             ['goods_id' => 6393, 'price' => 95.3, 'quality' => 3, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6393, 'price' => 89.5, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6393, 'price' => 89.9, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6393, 'price' => 89.9, 'quality' => 6, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6394, 'price' => 190.60, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6394, 'price' => 190.20, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
+            ['goods_id' => 6394, 'price' => 189.60, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6394, 'price' => 189.60, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
             ['goods_id' => 6394, 'price' => 190.60, 'quality' => 3, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6394, 'price' => 179, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6394, 'price' => 179.8, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
@@ -402,12 +402,12 @@ $afandeng_phone = ['name' => 'afandeng', 'store_id' => 27,'qualitys' => '1',
 
 $tongy_phone = ['name' => 'tongy', 'store_id' => 31,'qualitys' => '1',
     'amount' => [
-        30 => [['goods_id' => 6408, 'price' => 28.71, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        50 => [['goods_id' => 6409, 'price' => 47.85, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        100 => [['goods_id' => 6410, 'price' => 95.7, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        200 => [['goods_id' => 6411, 'price' => 191.4, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        300 => [['goods_id' => 6412, 'price' => 287.1, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        500 => [['goods_id' => 6413, 'price' => 478.5, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+        30 => [['goods_id' => 6408, 'price' => 28.74, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        50 => [['goods_id' => 6409, 'price' => 47.9, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        100 => [['goods_id' => 6410, 'price' => 95.8, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        200 => [['goods_id' => 6411, 'price' => 191.6, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        300 => [['goods_id' => 6412, 'price' => 287.4, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        500 => [['goods_id' => 6413, 'price' => 479, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
@@ -480,35 +480,35 @@ $xunyin_phone = ['name' => 'xunyin', 'store_id' => 35,'qualitys' => '2',
     'amount' => [
         10 => [
             ['goods_id' => 6438, 'price' => 10, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6438, 'price' => 9.97, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6438, 'price' => 10, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         20 => [
             ['goods_id' => 6439, 'price' => 20, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6439, 'price' => 19.94, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6439, 'price' => 20, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         30 => [
             ['goods_id' => 6440, 'price' => 30, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6440, 'price' => 29.91, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6440, 'price' => 30, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         50 => [
             ['goods_id' => 6441, 'price' => 50, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6441, 'price' => 49.85, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6441, 'price' => 50, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         100 => [
             ['goods_id' => 6442, 'price' => 100, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6442, 'price' => 99.7, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6442, 'price' => 100, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         200 => [
             ['goods_id' => 6443, 'price' => 200, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6443, 'price' => 199.4, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6443, 'price' => 200, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         300 => [
             ['goods_id' => 6444, 'price' => 300, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6444, 'price' => 299.1, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6444, 'price' => 300, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         500 => [
             ['goods_id' => 6445, 'price' => 500, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6445, 'price' => 498.5, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6445, 'price' => 500, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
         ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
@@ -526,16 +526,52 @@ $wantong_phone = ['name' => 'wantong', 'store_id' => 36, 'qualitys' => '4',
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
-$zhongst_phone = ['name' => 'zhongst', 'store_id' => 39, 'qualitys' => '5',
+$zhongst_phone = ['name' => 'zhongst', 'store_id' => 39, 'qualitys' => '2',
     'amount' => [
-        10 => [['goods_id' => 6464, 'price' => 9.1, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        20 => [['goods_id' => 6465, 'price' => 18.2, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        30 => [['goods_id' => 6466, 'price' => 27.3, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        50 => [['goods_id' => 6467, 'price' => 45.5, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        100 => [['goods_id' => 6468, 'price' => 91, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        200 => [['goods_id' => 6469, 'price' => 182, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        300 => [['goods_id' => 6470, 'price' => 273, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        500 => [['goods_id' => 6471, 'price' => 455, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+        10 => [
+            ['goods_id' => 6464, 'price' => 10.03, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6464, 'price' => 10.03, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6464, 'price' => 10.01, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+
+        20 => [
+            ['goods_id' => 6465, 'price' => 20.06, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6465, 'price' => 20.06, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6465, 'price' => 20.02, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+
+        30 => [
+            ['goods_id' => 6466, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6466, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6466, 'price' => 30.03, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+
+        50 => [
+            ['goods_id' => 6467, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6467, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6467, 'price' => 50.05, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+
+        100 => [
+            ['goods_id' => 6468, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6468, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6468, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        200 => [
+            ['goods_id' => 6469, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6469, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6469, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        300 => [
+            ['goods_id' => 6470, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6470, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6470, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        500 => [
+            ['goods_id' => 6471, 'price' => 501, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6471, 'price' => 501, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6471, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
@@ -568,35 +604,35 @@ $afandfs_phone = ['name' => 'afandfs', 'store_id' => 41, 'qualitys' => '1',
 $yunling_phone = ['name' => 'yunling', 'store_id' => 37, 'qualitys' => '1',
     'amount' => [
         10 => [
-            ['goods_id' => 6456, 'price' => 9.53, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6456, 'price' => 9.55, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6456, 'price' => 9.53, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         20 => [
-            ['goods_id' => 6457, 'price' => 19.06, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6457, 'price' => 19.1, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6457, 'price' => 19.06, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         30 => [
-            ['goods_id' => 6458, 'price' => 28.59, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6458, 'price' => 28.65, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6458, 'price' => 28.59, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6459, 'price' => 47.65, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6459, 'price' => 47.75, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6459, 'price' => 47.65, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6460, 'price' => 95.3, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6460, 'price' => 95.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6460, 'price' => 95.3, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6461, 'price' => 190.6, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6461, 'price' => 191, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6461, 'price' => 190.6, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         300 => [
-            ['goods_id' => 6462, 'price' => 285.9, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6462, 'price' => 286.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6462, 'price' => 285.9, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         500 => [
-            ['goods_id' => 6463, 'price' => 476.5, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6463, 'price' => 477.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6463, 'price' => 476.5, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ]
     ],
@@ -693,29 +729,51 @@ $weiyiman_phone = ['name' => 'weiyiman', 'store_id' => 45, 'qualitys' => '5',
 
 $yonghe_phone = ['name' => 'yonghe', 'store_id' => 46,'qualitys' => '2',
     'amount' => [
-        30 => [['goods_id' => 6520, 'price' => 29.955, 'quality' => 2, 'card_type' => 'chinamobile'],
+        10 => [
+            ['goods_id' => 6849, 'price' => 9.99, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6849, 'price' => 9.99, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+
+        20 => [
+            ['goods_id' => 6850, 'price' => 19.98, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6850, 'price' => 19.98, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+
+        30 => [
+            ['goods_id' => 6520, 'price' => 29.97, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6520, 'price' => 29.985, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6520, 'price' => 29.82, 'quality' => 2, 'card_type' => 'chinatelecom']],
+            ['goods_id' => 6520, 'price' => 29.97, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
 
-        50 => [['goods_id' => 6521, 'price' => 49.925, 'quality' => 2, 'card_type' => 'chinamobile'],
+        50 => [
+            ['goods_id' => 6521, 'price' => 49.95, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6521, 'price' => 49.975, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6521, 'price' => 49.7, 'quality' => 2, 'card_type' => 'chinatelecom']],
+            ['goods_id' => 6521, 'price' => 49.95, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
 
-        100 => [['goods_id' => 6522, 'price' => 99.85, 'quality' => 2, 'card_type' => 'chinamobile'],
+        100 => [
+            ['goods_id' => 6522, 'price' => 99.9, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6522, 'price' => 99.95, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6522, 'price' => 99.4, 'quality' => 2, 'card_type' => 'chinatelecom']],
+            ['goods_id' => 6522, 'price' => 99.9, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
 
-        200 => [['goods_id' => 6523, 'price' => 199.7, 'quality' => 2, 'card_type' => 'chinamobile'],
+        200 => [
+            ['goods_id' => 6523, 'price' => 199.8, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6523, 'price' => 199.9, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6523, 'price' => 198.8, 'quality' => 2, 'card_type' => 'chinatelecom']],
+            ['goods_id' => 6523, 'price' => 199.8, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
 
-        300 => [['goods_id' => 6524, 'price' => 299.55, 'quality' => 2, 'card_type' => 'chinamobile'],
+        300 => [
+            ['goods_id' => 6524, 'price' => 299.7, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6524, 'price' => 299.85, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6524, 'price' => 298.2, 'quality' => 2, 'card_type' => 'chinatelecom']],
+            ['goods_id' => 6524, 'price' => 299.7, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
 
-        500 => [['goods_id' => 6525, 'price' => 499.25, 'quality' => 2, 'card_type' => 'chinamobile'],
+        500 => [
+            ['goods_id' => 6525, 'price' => 499.5, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6525, 'price' => 499.75, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6525, 'price' => 497, 'quality' => 2, 'card_type' => 'chinatelecom']]
+            ['goods_id' => 6525, 'price' => 499.5, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
@@ -741,20 +799,20 @@ $qianqian_phone = ['name' => 'qianqian', 'store_id' => 48, 'qualitys' => '1',
 //            ['goods_id' => 74, 'price' => 19.06, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
 //        ],
         30 => [
-            ['goods_id' => 6529, 'price' => 28.59, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6529, 'price' => 28.53, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6529, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6529, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6530, 'price' => 47.65, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6530, 'price' => 47.55, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6530, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6530, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6531, 'price' => 95.3, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6531, 'price' => 95.1, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6531, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6531, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6532, 'price' => 190.6, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6532, 'price' => 190.2, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6532, 'price' => 189.6, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6532, 'price' => 189.6, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
@@ -847,21 +905,21 @@ $weiyiwt_phone = ['name' => 'weiyiwt', 'store_id' => 58,'qualitys' => '1',
             ['goods_id' => 6596, 'price' => 18.9, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         30 => [
-            ['goods_id' => 6597, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6597, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6597, 'price' => 28.8, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6597, 'price' => 28.35, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6598, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6598, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6598, 'price' => 48, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6598, 'price' => 47.25, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6599, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6599, 'price' => 95, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6599, 'price' => 94.5, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6600, 'price' => 189.6, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6600, 'price' => 190, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6600, 'price' => 189, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         300 => [
@@ -1315,19 +1373,19 @@ $cangbu_phone = ['name' => 'cangbu', 'store_id' => 78,'qualitys' => '1',
             ['goods_id' => 6745, 'price' => 18.96, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         30 => [
-            ['goods_id' => 6746, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6746, 'price' => 28.62, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6746, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
         ],
         50 => [
-            ['goods_id' => 6747, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6747, 'price' => 47.7, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6747, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
         ],
         100 => [
-            ['goods_id' => 6748, 'price' => 95, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6748, 'price' => 95.4, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6748, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6749, 'price' => 190, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6749, 'price' => 190.8, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6749, 'price' => 189.6, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         300 => [
@@ -1556,6 +1614,63 @@ $yuecheng_phone = ['name' => 'yuecheng', 'store_id' => 93, 'qualitys' => '2',
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
+$cangbukami_phone = ['name' => 'cangbukami', 'store_id' => 83, 'qualitys' => '3',
+    'amount' => [
+        20 => [['goods_id' => 6770, 'price' => 19.08, 'quality' => 3, 'card_type' => 'chinaunicom']],
+        30 => [['goods_id' => 6771, 'price' => 28.62, 'quality' => 3, 'card_type' => 'chinaunicom']],
+        50 => [['goods_id' => 6772, 'price' => 47.7, 'quality' => 3, 'card_type' => 'chinaunicom']],
+        100 => [['goods_id' => 6773, 'price' => 95.4, 'quality' => 3, 'card_type' => 'chinaunicom']],
+        200 => [['goods_id' => 6774, 'price' => 190.8, 'quality' => 3, 'card_type' => 'chinaunicom']],
+        300 => [['goods_id' => 6775, 'price' => 286.2, 'quality' => 3, 'card_type' => 'chinaunicom']],
+        500 => [['goods_id' => 6776, 'price' => 477, 'quality' => 3, 'card_type' => 'chinaunicom']]
+    ],
+    'official_sn' => true, 'refill_type' => 'api'];
+
+$sialan_phone = ['name' => 'sialan', 'store_id' => 94, 'qualitys' => '2',
+    'amount' => [
+        10 => [
+            ['goods_id' => 6851, 'price' => 10.02, 'quality' => 2, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 6851, 'price' => 10.02, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6851, 'price' => 10, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        20 => [
+            ['goods_id' => 6852, 'price' => 20.04, 'quality' => 2, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 6852, 'price' => 20.04, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6852, 'price' => 20, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        30 => [
+            ['goods_id' => 6853, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6853, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6853, 'price' => 30, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        50 => [
+            ['goods_id' => 6854, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6854, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6854, 'price' => 50, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        100 => [
+            ['goods_id' => 6855, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6855, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6855, 'price' => 100, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        200 => [
+            ['goods_id' => 6856, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6856, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6856, 'price' => 200, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        300 => [
+            ['goods_id' => 6857, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6857, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6857, 'price' => 300, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        500 => [
+            ['goods_id' => 6858, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6858, 'price' => 501, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6858, 'price' => 500, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ]
+    ],
+    'official_sn' => true, 'refill_type' => 'api'];
+
 $phone_providers = [
 //    ['name' => 'beixt', 'cfg' => $beixt_phone],
 //    ['name' => 'bxtwt', 'cfg' => $bxtwt_phone],
@@ -1620,7 +1735,9 @@ $phone_providers = [
     ['name' => 'hongxudayz996', 'cfg' => $hongxudayz996_phone],
     ['name' => 'hongxudagy996', 'cfg' => $hongxudagy996_phone],
     ['name' => 'bingdht', 'cfg' => $bingdht_phone],
-    ['name' => 'yuecheng', 'cfg' => $yuecheng_phone]
+    ['name' => 'yuecheng', 'cfg' => $yuecheng_phone],
+    ['name' => 'cangbukami', 'cfg' => $cangbukami_phone],
+    ['name' => 'sialan', 'cfg' => $sialan_phone]
 ];
 $config['phone_providers'] = $phone_providers;
 

+ 194 - 77
data/config/xyzadm/refill.ini.php

@@ -125,11 +125,11 @@ $zeheng_oil = ['name' => 'zeheng', 'store_id' => 51,'qualitys' => '1',
 
 $lingzh_oil = ['name' => 'lingzhoil', 'store_id' => 56, 'qualitys' => '1',
     'amount' => [
-        100 => [['goods_id' => 6579, 'price' => 97, 'quality' => 1, 'card_type' => 'sinopec,petrochina']],
-        200 => [['goods_id' => 6580, 'price' => 194, 'quality' => 1, 'card_type' => 'sinopec,petrochina']],
-        500 => [['goods_id' => 6581, 'price' => 485, 'quality' => 1, 'card_type' => 'sinopec,petrochina']],
-        1000 => [['goods_id' => 6582, 'price' => 970, 'quality' => 1, 'card_type' => 'sinopec,petrochina']],
-        2000 => [['goods_id' => 6583, 'price' => 1940, 'quality' => 1, 'card_type' => 'sinopec,petrochina']]
+        100 => [['goods_id' => 6579, 'price' => 97.2, 'quality' => 1, 'card_type' => 'sinopec,petrochina']],
+        200 => [['goods_id' => 6580, 'price' => 194.4, 'quality' => 1, 'card_type' => 'sinopec,petrochina']],
+        500 => [['goods_id' => 6581, 'price' => 486, 'quality' => 1, 'card_type' => 'sinopec,petrochina']],
+        1000 => [['goods_id' => 6582, 'price' => 972, 'quality' => 1, 'card_type' => 'sinopec,petrochina']],
+        2000 => [['goods_id' => 6583, 'price' => 1944, 'quality' => 1, 'card_type' => 'sinopec,petrochina']]
     ],
     'period' => [], 'refill_type' => 'api'];
 
@@ -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' => 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']]
+        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']]
     ],
     'period' => [], 'refill_type' => 'api'];
 
@@ -239,32 +239,32 @@ $lingzh_phone = ['name' => 'lingzh', 'store_id' => 28,'qualitys' => '1,3,4,5,6',
             ['goods_id' => 6390, 'price' => 17.98, 'quality' => 6, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']
         ],
         30 => [
-            ['goods_id' => 6391, 'price' => 28.59, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6391, 'price' => 28.53, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
+            ['goods_id' => 6391, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6391, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
             ['goods_id' => 6391, 'price' => 28.59, 'quality' => 3, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6391, 'price' => 26.85, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6391, 'price' => 26.97, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6391, 'price' => 26.97, 'quality' => 6, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6392, 'price' => 47.65, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6392, 'price' => 47.55, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
+            ['goods_id' => 6392, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6392, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
             ['goods_id' => 6392, 'price' => 47.65, 'quality' => 3, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6392, 'price' => 44.75, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6392, 'price' => 44.95, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6392, 'price' => 44.95, 'quality' => 6, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6393, 'price' => 95.3, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6393, 'price' => 95.1, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
+            ['goods_id' => 6393, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6393, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
             ['goods_id' => 6393, 'price' => 95.3, 'quality' => 3, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6393, 'price' => 89.5, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6393, 'price' => 89.9, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6393, 'price' => 89.9, 'quality' => 6, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6394, 'price' => 190.60, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6394, 'price' => 190.20, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
+            ['goods_id' => 6394, 'price' => 189.60, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6394, 'price' => 189.60, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
             ['goods_id' => 6394, 'price' => 190.60, 'quality' => 3, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6394, 'price' => 179, 'quality' => 4, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
             ['goods_id' => 6394, 'price' => 179.8, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
@@ -402,12 +402,12 @@ $afandeng_phone = ['name' => 'afandeng', 'store_id' => 27,'qualitys' => '1',
 
 $tongy_phone = ['name' => 'tongy', 'store_id' => 31,'qualitys' => '1',
     'amount' => [
-        30 => [['goods_id' => 6408, 'price' => 28.71, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        50 => [['goods_id' => 6409, 'price' => 47.85, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        100 => [['goods_id' => 6410, 'price' => 95.7, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        200 => [['goods_id' => 6411, 'price' => 191.4, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        300 => [['goods_id' => 6412, 'price' => 287.1, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        500 => [['goods_id' => 6413, 'price' => 478.5, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+        30 => [['goods_id' => 6408, 'price' => 28.74, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        50 => [['goods_id' => 6409, 'price' => 47.9, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        100 => [['goods_id' => 6410, 'price' => 95.8, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        200 => [['goods_id' => 6411, 'price' => 191.6, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        300 => [['goods_id' => 6412, 'price' => 287.4, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
+        500 => [['goods_id' => 6413, 'price' => 479, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
@@ -480,35 +480,35 @@ $xunyin_phone = ['name' => 'xunyin', 'store_id' => 35,'qualitys' => '2',
     'amount' => [
         10 => [
             ['goods_id' => 6438, 'price' => 10, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6438, 'price' => 9.97, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6438, 'price' => 10, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         20 => [
             ['goods_id' => 6439, 'price' => 20, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6439, 'price' => 19.94, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6439, 'price' => 20, 'quality' => 2, 'card_type' => 'chinatelecom']
         ],
         30 => [
             ['goods_id' => 6440, 'price' => 30, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6440, 'price' => 29.91, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6440, 'price' => 30, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         50 => [
             ['goods_id' => 6441, 'price' => 50, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6441, 'price' => 49.85, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6441, 'price' => 50, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         100 => [
             ['goods_id' => 6442, 'price' => 100, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6442, 'price' => 99.7, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6442, 'price' => 100, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         200 => [
             ['goods_id' => 6443, 'price' => 200, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6443, 'price' => 199.4, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6443, 'price' => 200, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         300 => [
             ['goods_id' => 6444, 'price' => 300, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6444, 'price' => 299.1, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6444, 'price' => 300, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         500 => [
             ['goods_id' => 6445, 'price' => 500, 'quality' => 2, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6445, 'price' => 498.5, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6445, 'price' => 500, 'quality' => 2, 'card_type' => 'chinaunicom,chinatelecom']
         ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
@@ -526,16 +526,52 @@ $wantong_phone = ['name' => 'wantong', 'store_id' => 36, 'qualitys' => '4',
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
-$zhongst_phone = ['name' => 'zhongst', 'store_id' => 39, 'qualitys' => '5',
+$zhongst_phone = ['name' => 'zhongst', 'store_id' => 39, 'qualitys' => '2',
     'amount' => [
-        10 => [['goods_id' => 6464, 'price' => 9.1, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        20 => [['goods_id' => 6465, 'price' => 18.2, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        30 => [['goods_id' => 6466, 'price' => 27.3, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        50 => [['goods_id' => 6467, 'price' => 45.5, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        100 => [['goods_id' => 6468, 'price' => 91, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        200 => [['goods_id' => 6469, 'price' => 182, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        300 => [['goods_id' => 6470, 'price' => 273, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        500 => [['goods_id' => 6471, 'price' => 455, 'quality' => 5, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
+        10 => [
+            ['goods_id' => 6464, 'price' => 10.03, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6464, 'price' => 10.03, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6464, 'price' => 10.01, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+
+        20 => [
+            ['goods_id' => 6465, 'price' => 20.06, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6465, 'price' => 20.06, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6465, 'price' => 20.02, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+
+        30 => [
+            ['goods_id' => 6466, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6466, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6466, 'price' => 30.03, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+
+        50 => [
+            ['goods_id' => 6467, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6467, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6467, 'price' => 50.05, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+
+        100 => [
+            ['goods_id' => 6468, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6468, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6468, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        200 => [
+            ['goods_id' => 6469, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6469, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6469, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        300 => [
+            ['goods_id' => 6470, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6470, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6470, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        500 => [
+            ['goods_id' => 6471, 'price' => 501, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6471, 'price' => 501, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6471, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
@@ -568,35 +604,35 @@ $afandfs_phone = ['name' => 'afandfs', 'store_id' => 41, 'qualitys' => '1',
 $yunling_phone = ['name' => 'yunling', 'store_id' => 37, 'qualitys' => '1',
     'amount' => [
         10 => [
-            ['goods_id' => 6456, 'price' => 9.53, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6456, 'price' => 9.55, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6456, 'price' => 9.53, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         20 => [
-            ['goods_id' => 6457, 'price' => 19.06, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6457, 'price' => 19.1, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6457, 'price' => 19.06, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         30 => [
-            ['goods_id' => 6458, 'price' => 28.59, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6458, 'price' => 28.65, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6458, 'price' => 28.59, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6459, 'price' => 47.65, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6459, 'price' => 47.75, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6459, 'price' => 47.65, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6460, 'price' => 95.3, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6460, 'price' => 95.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6460, 'price' => 95.3, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6461, 'price' => 190.6, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6461, 'price' => 191, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6461, 'price' => 190.6, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         300 => [
-            ['goods_id' => 6462, 'price' => 285.9, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6462, 'price' => 286.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6462, 'price' => 285.9, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         500 => [
-            ['goods_id' => 6463, 'price' => 476.5, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6463, 'price' => 477.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6463, 'price' => 476.5, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ]
     ],
@@ -693,29 +729,51 @@ $weiyiman_phone = ['name' => 'weiyiman', 'store_id' => 45, 'qualitys' => '5',
 
 $yonghe_phone = ['name' => 'yonghe', 'store_id' => 46,'qualitys' => '2',
     'amount' => [
-        30 => [['goods_id' => 6520, 'price' => 29.955, 'quality' => 2, 'card_type' => 'chinamobile'],
+        10 => [
+            ['goods_id' => 6849, 'price' => 9.99, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6849, 'price' => 9.99, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+
+        20 => [
+            ['goods_id' => 6850, 'price' => 19.98, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6850, 'price' => 19.98, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+
+        30 => [
+            ['goods_id' => 6520, 'price' => 29.97, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6520, 'price' => 29.985, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6520, 'price' => 29.82, 'quality' => 2, 'card_type' => 'chinatelecom']],
+            ['goods_id' => 6520, 'price' => 29.97, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
 
-        50 => [['goods_id' => 6521, 'price' => 49.925, 'quality' => 2, 'card_type' => 'chinamobile'],
+        50 => [
+            ['goods_id' => 6521, 'price' => 49.95, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6521, 'price' => 49.975, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6521, 'price' => 49.7, 'quality' => 2, 'card_type' => 'chinatelecom']],
+            ['goods_id' => 6521, 'price' => 49.95, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
 
-        100 => [['goods_id' => 6522, 'price' => 99.85, 'quality' => 2, 'card_type' => 'chinamobile'],
+        100 => [
+            ['goods_id' => 6522, 'price' => 99.9, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6522, 'price' => 99.95, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6522, 'price' => 99.4, 'quality' => 2, 'card_type' => 'chinatelecom']],
+            ['goods_id' => 6522, 'price' => 99.9, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
 
-        200 => [['goods_id' => 6523, 'price' => 199.7, 'quality' => 2, 'card_type' => 'chinamobile'],
+        200 => [
+            ['goods_id' => 6523, 'price' => 199.8, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6523, 'price' => 199.9, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6523, 'price' => 198.8, 'quality' => 2, 'card_type' => 'chinatelecom']],
+            ['goods_id' => 6523, 'price' => 199.8, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
 
-        300 => [['goods_id' => 6524, 'price' => 299.55, 'quality' => 2, 'card_type' => 'chinamobile'],
+        300 => [
+            ['goods_id' => 6524, 'price' => 299.7, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6524, 'price' => 299.85, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6524, 'price' => 298.2, 'quality' => 2, 'card_type' => 'chinatelecom']],
+            ['goods_id' => 6524, 'price' => 299.7, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
 
-        500 => [['goods_id' => 6525, 'price' => 499.25, 'quality' => 2, 'card_type' => 'chinamobile'],
+        500 => [
+            ['goods_id' => 6525, 'price' => 499.5, 'quality' => 2, 'card_type' => 'chinamobile'],
             ['goods_id' => 6525, 'price' => 499.75, 'quality' => 2, 'card_type' => 'chinaunicom'],
-            ['goods_id' => 6525, 'price' => 497, 'quality' => 2, 'card_type' => 'chinatelecom']]
+            ['goods_id' => 6525, 'price' => 499.5, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
@@ -741,20 +799,20 @@ $qianqian_phone = ['name' => 'qianqian', 'store_id' => 48, 'qualitys' => '1',
 //            ['goods_id' => 74, 'price' => 19.06, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom'],
 //        ],
         30 => [
-            ['goods_id' => 6529, 'price' => 28.59, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6529, 'price' => 28.53, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6529, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6529, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6530, 'price' => 47.65, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6530, 'price' => 47.55, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6530, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6530, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6531, 'price' => 95.3, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6531, 'price' => 95.1, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6531, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6531, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6532, 'price' => 190.6, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 6532, 'price' => 190.2, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
+            ['goods_id' => 6532, 'price' => 189.6, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6532, 'price' => 189.6, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ]
     ],
     'official_sn' => true, 'refill_type' => 'api'];
@@ -847,21 +905,21 @@ $weiyiwt_phone = ['name' => 'weiyiwt', 'store_id' => 58,'qualitys' => '1',
             ['goods_id' => 6596, 'price' => 18.9, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         30 => [
-            ['goods_id' => 6597, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6597, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6597, 'price' => 28.8, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6597, 'price' => 28.35, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         50 => [
-            ['goods_id' => 6598, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6598, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6598, 'price' => 48, 'quality' => 1, 'card_type' => 'chinaunicom'],
             ['goods_id' => 6598, 'price' => 47.25, 'quality' => 1, 'card_type' => 'chinatelecom']
         ],
         100 => [
-            ['goods_id' => 6599, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6599, 'price' => 95, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6599, 'price' => 94.5, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6600, 'price' => 189.6, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6600, 'price' => 190, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6600, 'price' => 189, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         300 => [
@@ -1315,19 +1373,19 @@ $cangbu_phone = ['name' => 'cangbu', 'store_id' => 78,'qualitys' => '1',
             ['goods_id' => 6745, 'price' => 18.96, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         30 => [
-            ['goods_id' => 6746, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6746, 'price' => 28.62, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6746, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
         ],
         50 => [
-            ['goods_id' => 6747, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6747, 'price' => 47.7, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6747, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom'],
         ],
         100 => [
-            ['goods_id' => 6748, 'price' => 95, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6748, 'price' => 95.4, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6748, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         200 => [
-            ['goods_id' => 6749, 'price' => 190, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6749, 'price' => 190.8, 'quality' => 1, 'card_type' => 'chinamobile'],
             ['goods_id' => 6749, 'price' => 189.6, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']
         ],
         300 => [
@@ -1556,6 +1614,63 @@ $yuecheng_phone = ['name' => 'yuecheng', 'store_id' => 93, 'qualitys' => '2',
     ],
     'official_sn' => true, 'refill_type' => 'api'];
 
+$cangbukami_phone = ['name' => 'cangbukami', 'store_id' => 83, 'qualitys' => '3',
+    'amount' => [
+        20 => [['goods_id' => 6770, 'price' => 19.08, 'quality' => 3, 'card_type' => 'chinaunicom']],
+        30 => [['goods_id' => 6771, 'price' => 28.62, 'quality' => 3, 'card_type' => 'chinaunicom']],
+        50 => [['goods_id' => 6772, 'price' => 47.7, 'quality' => 3, 'card_type' => 'chinaunicom']],
+        100 => [['goods_id' => 6773, 'price' => 95.4, 'quality' => 3, 'card_type' => 'chinaunicom']],
+        200 => [['goods_id' => 6774, 'price' => 190.8, 'quality' => 3, 'card_type' => 'chinaunicom']],
+        300 => [['goods_id' => 6775, 'price' => 286.2, 'quality' => 3, 'card_type' => 'chinaunicom']],
+        500 => [['goods_id' => 6776, 'price' => 477, 'quality' => 3, 'card_type' => 'chinaunicom']]
+    ],
+    'official_sn' => true, 'refill_type' => 'api'];
+
+$sialan_phone = ['name' => 'sialan', 'store_id' => 94, 'qualitys' => '2',
+    'amount' => [
+        10 => [
+            ['goods_id' => 6851, 'price' => 10.02, 'quality' => 2, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 6851, 'price' => 10.02, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6851, 'price' => 10, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        20 => [
+            ['goods_id' => 6852, 'price' => 20.04, 'quality' => 2, 'card_type' => 'chinamobile'],
+//            ['goods_id' => 6852, 'price' => 20.04, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6852, 'price' => 20, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        30 => [
+            ['goods_id' => 6853, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6853, 'price' => 30.06, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6853, 'price' => 30, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        50 => [
+            ['goods_id' => 6854, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6854, 'price' => 50.1, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6854, 'price' => 50, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        100 => [
+            ['goods_id' => 6855, 'price' => 100.1, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6855, 'price' => 100.2, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6855, 'price' => 100, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        200 => [
+            ['goods_id' => 6856, 'price' => 200.2, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6856, 'price' => 200.4, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6856, 'price' => 200, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        300 => [
+            ['goods_id' => 6857, 'price' => 300.3, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6857, 'price' => 300.6, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6857, 'price' => 300, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ],
+        500 => [
+            ['goods_id' => 6858, 'price' => 500.5, 'quality' => 2, 'card_type' => 'chinamobile'],
+            ['goods_id' => 6858, 'price' => 501, 'quality' => 2, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 6858, 'price' => 500, 'quality' => 2, 'card_type' => 'chinatelecom']
+        ]
+    ],
+    'official_sn' => true, 'refill_type' => 'api'];
+
 $phone_providers = [
 //    ['name' => 'beixt', 'cfg' => $beixt_phone],
 //    ['name' => 'bxtwt', 'cfg' => $bxtwt_phone],
@@ -1620,7 +1735,9 @@ $phone_providers = [
     ['name' => 'hongxudayz996', 'cfg' => $hongxudayz996_phone],
     ['name' => 'hongxudagy996', 'cfg' => $hongxudagy996_phone],
     ['name' => 'bingdht', 'cfg' => $bingdht_phone],
-    ['name' => 'yuecheng', 'cfg' => $yuecheng_phone]
+    ['name' => 'yuecheng', 'cfg' => $yuecheng_phone],
+    ['name' => 'cangbukami', 'cfg' => $cangbukami_phone],
+    ['name' => 'sialan', 'cfg' => $sialan_phone]
 ];
 $config['phone_providers'] = $phone_providers;
 

+ 1 - 0
docker/compose/xyz/conf/crontab/root

@@ -15,4 +15,5 @@
 *    *   *   *   *   echo "test" >> /var/test.log
 
 #0   1   *   *   *   php /var/www/html/crontab/index.php date _order_stats
+0   0   *   *   *   php /var/www/html/crontab/index.php date merchant_available
 

+ 1 - 0
helper/mtopcard/mtopcard.php

@@ -252,6 +252,7 @@ function valid_phone($card_no)
     $validate_checker = function ($status)
     {
         // "status": 1 //状态 0:空号;1:实号;2:停机;3:库无;4:沉默号;5:风险号
+        Log::record("status={$status}",Log::DEBUG);
         if (in_array($status, [0,5])) {
             return false;
         } else {

+ 8 - 10
helper/refill/RefillBase.php

@@ -288,15 +288,9 @@ class RefillBase
         $chfilters = new channel_filter($mchid,$mch_order,$quality,$card_type);
         $providers = $chfilters->getProviders($providers);
 
-        if (empty($providers))
-        {
-            Log::record("canot find any providers",Log::DEBUG);
-            if($overload) {
-                return [errcode::PROVIDER_OVERLOAD, "匹配不到合适的充值通道",$last_orderid,false,0];
-            }
-            else {
-                return [errcode::CANNOT_MATCH_PROVIDER, "匹配不到合适的充值通道",$last_orderid,false,0];
-            }
+        if (empty($providers)) {
+            Log::record("canot find any providers", Log::DEBUG);
+            return [errcode::CANNOT_MATCH_PROVIDER, "匹配不到合适的充值通道", $last_orderid, false, 0];
         }
 
         if (empty($notify_url)) {
@@ -514,7 +508,11 @@ class RefillBase
                 $logic_vr_order = Logic("vr_order");
                 $order_info = Model('vr_order')->getOrderInfo(['order_id' => $order_id]);
                 $logic_vr_order->changeOrderStateCancel($order_info, '', "调用{$channel_name}接口失败",true,true);
-                $mod_refill->edit($order_id, ['commit_time' => time()]);
+
+                if(!is_string($errmsg)) {
+                    $errmsg = "{$errmsg}";
+                }
+                $mod_refill->edit($order_id, ['commit_time' => time(),'err_msg' => $errmsg]);
             }
         }
 

BIN
helper/refill/api/xyz/cangbukami/APIdoc直冲.docx


+ 71 - 0
helper/refill/api/xyz/cangbukami/RefillCallBack.php

@@ -0,0 +1,71 @@
+<?php
+namespace refill\cangbukami;
+
+require_once(BASE_HELPER_RAPI_PATH . '/cangbukami/config.php');
+
+use refill;
+class RefillCallBack implements refill\IRefillCallBack
+{
+    public function verify($params): bool
+    {
+        $input = $params;
+        unset($input['sign']);
+        $sign = $this->sign($input);
+        if ($params['sign'] == $sign) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    private function sign($params)
+    {
+        $content = '';
+        ksort($params);
+        foreach ($params as $key => $val){
+            if(false === $this->check_empty($val)) {
+                $content .= "{$key}={$val}&";
+            }
+        }
+        $content .= "key=".config::KEY;
+
+        return md5($content);
+    }
+
+
+    protected function check_empty($value)
+    {
+        if (!isset($value))
+            return true;
+        if ($value === null)
+            return true;
+        if (trim($value) === "")
+            return true;
+
+        return false;
+    }
+
+    public function notify($params)
+    {
+        $status = intval($params['code']);
+        $order_sn = $params['tmporder'];
+        $order_info = Model('vr_order')->getOrderInfo(['order_sn' => $order_sn]);
+        if (empty($order_info)) {
+            return [false, false, false,false];
+        }
+        $order_id = $order_info['order_id'];
+
+        if ($status === 1) {
+            $data['official_sn'] = strtolower($params['voucher']) == 'null' ? '' : $params['voucher'];
+            $data['ch_trade_no'] = strtolower($params['orderno']) == 'null' ? '' : $params['orderno'];
+            Model('refill_order')->edit($order_id, $data);
+            return [$order_id, true, false,true];
+        }
+        elseif ($status === -1) {
+            return [$order_id, false, true,true];
+        }
+        else {
+            return [$order_id, false, false,false];
+        }
+    }
+}

+ 117 - 0
helper/refill/api/xyz/cangbukami/RefillPhone.php

@@ -0,0 +1,117 @@
+<?php
+
+namespace refill\cangbukami;
+
+require_once(BASE_HELPER_RAPI_PATH . '/cangbukami/config.php');
+
+use refill;
+use Log;
+
+class RefillPhone extends refill\IRefillPhone
+{
+    public function __construct($cfgs)
+    {
+        parent::__construct($cfgs);
+    }
+
+    private function req_params(int $phone, int $amount, string $order_sn)
+    {
+        $params['customerId'] = config::MCH_ID;
+        $params['timestamp'] = time();
+        $params['orderno'] = $order_sn;
+        $params['itemId'] = config::operator[$amount];
+        $params['checkItemFacePrice'] = $amount;
+        $params['number'] = $phone;
+        $params['amt'] = 1;
+        $params['notify_url'] = config::NOTIFY_URL;
+        $params['overtime'] = 1;
+
+        return $params;
+    }
+
+    public function add($card_no, $card_type, $amount, $params,&$net_errno = 0)
+    {
+        $order_sn = $params['order_sn'];
+        $params = $this->req_params($card_no, $amount, $order_sn);
+
+        $sign = $this->sign($params);
+        $params['sign'] = $sign;
+
+        $resp = http_request(config::ORDER_URL, $params, 'POST', false, config::ExtHeaders, $net_errno);
+
+        if (empty($resp)) {
+            return [false, '网络错误', true];
+        }
+        else
+        {
+            Log::record($resp, Log::DEBUG);
+            $resp = json_decode($resp, true);
+            if (empty($resp)) {
+                return [false, '网络错误', true];
+            } elseif ($resp['code'] == 1) {
+                return [true, '', false];
+            } else {
+                return [false, $resp['msg'], false];
+            }
+        }
+    }
+
+    public function query($refill_info)
+    {
+        $params['customerId'] = config::MCH_ID;
+        $params['timestamp'] = time();
+        $params['orderno'] = $refill_info['order_sn'];
+        $sign = $this->sign($params);
+        $params['sign'] = $sign;
+
+        $resp = http_request(config::QUERY_URL, $params, 'POST', false, config::ExtHeaders);
+
+        if (empty($resp)) {
+            return [false, '网络错误'];
+        }
+        else
+        {
+            Log::record($resp, Log::DEBUG);
+            $resp = json_decode($resp, true);
+            if (empty($resp)) {
+                return [false, '网络错误'];
+            }
+            if($resp['code'] == 1)
+            {
+                $status = $resp['data']['status'];
+                if ($status == 'success') {
+                    $order_state = ORDER_STATE_SUCCESS;
+                } elseif ($status == 'failed') {
+                    $order_state = ORDER_STATE_CANCEL;
+                } elseif ($status == 'wait') {
+                    $order_state = ORDER_STATE_SEND;
+                }else {
+                    return [false, $status];
+                }
+                return [true, $order_state];
+            }
+            elseif($resp['code'] == -1 && $resp['msg'] == '订单不存在')
+            {
+                return [true, ORDER_STATE_NOEXIST];
+            }
+            else
+            {
+                return [false, $resp['msg']];
+            }
+        }
+    }
+
+    private function sign($params)
+    {
+        $content = '';
+        ksort($params);
+        foreach ($params as $key => $val){
+            if(false === $this->check_empty($val)) {
+                $content .= "{$key}={$val}&";
+            }
+        }
+        $content .= "key=".config::KEY;
+
+        return md5($content);
+    }
+}

+ 6 - 0
helper/refill/api/xyz/cangbukami/account.txt

@@ -0,0 +1,6 @@
+地址https://huadan.irecycle.top/   
+账户18500608333  
+密码123456
+
+mchid 112
+key zs53xG61NinhlrXskhR0xnAaOyM7yG

+ 24 - 0
helper/refill/api/xyz/cangbukami/config.php

@@ -0,0 +1,24 @@
+<?php
+
+
+namespace refill\cangbukami;
+
+use mtopcard;
+class config
+{
+    //yd 950 dl949
+    const ORDER_URL = 'https://ori.irecycle.top/queryBuy';
+    const QUERY_URL= 'https://api.irecycle.top/queryBizOrder';
+
+    const MCH_ID= '112';
+    const KEY = 'zs53xG61NinhlrXskhR0xnAaOyM7yG';
+//    const NOTIFY_URL = BASE_SITE_URL . "/mobile/callback/refill_cangbukami.php";
+    const NOTIFY_URL = "https://www.xyzshops.cn/mobile/signature.php";
+    const operator = [
+        20  => 'xydclt20',
+        30  => 'xydclt30',
+        50  => 'xydclt50',
+        100 => 'xydclt100'
+    ];
+    const ExtHeaders = ['Content-Type: application/x-www-form-urlencoded' , 'Accept: application/json;charset=UTF-8'];
+}

+ 55 - 0
helper/refill/api/xyz/sialan/RefillCallBack.php

@@ -0,0 +1,55 @@
+<?php
+namespace refill\sialan;
+
+require_once(BASE_HELPER_RAPI_PATH . '/sialan/config.php');
+
+use refill;
+
+class RefillCallBack implements refill\IRefillCallBack
+{
+    public function verify($params): bool
+    {
+        $input = $params;
+        unset($input['sign']);
+        $sign = $this->sign($input);
+        if ($params['sign'] == $sign) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    private function sign($params)
+    {
+        ksort($params);
+        $body = "";
+        foreach ($params as $k => $v) {
+            $body .= "{$k}{$v}";
+        }
+        $body .= config::CPKEY;
+        return md5($body);
+    }
+
+    public function notify($params)
+    {
+        $status = $params['status'];
+        $order_sn = $params['ret_para'];
+        $order_info = Model('vr_order')->getOrderInfo(['order_sn' => $order_sn]);
+        if (empty($order_info)) {
+            return [false, false, false,false];
+        }
+        $order_id = $order_info['order_id'];
+
+        if ($status == 'success') {
+            $data['official_sn'] = strtolower($params['sz_order_no']) == 'null' ? '' : $params['sz_order_no'];
+            Model('refill_order')->edit($order_id, $data);
+            return [$order_id, true, false,true];
+        }
+        elseif ($status == 'failed') {
+            return [$order_id, false, true,true];
+        }
+        else {
+            return [$order_id, false, false,false];
+        }
+    }
+}

+ 127 - 0
helper/refill/api/xyz/sialan/RefillPhone.php

@@ -0,0 +1,127 @@
+<?php
+
+namespace refill\sialan;
+
+require_once(BASE_HELPER_RAPI_PATH . '/sialan/config.php');
+
+use refill;
+use Log;
+
+class RefillPhone extends refill\IRefillPhone
+{
+    public function __construct($cfgs)
+    {
+        parent::__construct($cfgs);
+    }
+
+    private function req_params(int $phone, int $amount, int $card_type,string $order_sn)
+    {
+        $params['cpid'] = config::CPID;
+        $params['create_time'] = date("YmdHis");
+        $params['mobile'] = $phone;
+        $params['type'] = 1;
+        $params['product_id'] = config::product_id[$card_type][$amount];
+        $params['amount'] = $amount;
+        $params['op'] = config::operator[$card_type];
+        $params['ret_para'] = $order_sn;
+
+        return $params;
+    }
+
+    public function add($card_no, $card_type, $amount, $params,&$net_errno = 0)
+    {
+        $order_sn = $params['order_sn'];
+        $params = $this->req_params($card_no, $amount, $card_type, $order_sn);
+
+        $sign = $this->sign($params);
+        $params['sign'] = $sign;
+
+        $resp = http_request(config::ORDER_URL, $params, 'GET', false, [], $net_errno);
+
+        if (empty($resp)) {
+            return [false, '网络错误', true];
+        }
+        else
+        {
+            Log::record($resp, Log::DEBUG);
+            $resp = json_decode($resp, true);
+            $status = $resp['status'];
+            if (empty($resp)) {
+                return [false, '网络错误', true];
+            } elseif ($status == 0) {
+                return [true, $resp['order_no'], false];
+            } elseif (in_array($status, config::ERR_NO)) {
+                return [false, $resp['msg'], false];
+            } elseif (in_array($status, [-10010, -10000, -999])) {
+                $net_errno = "HTTP-{$status}";
+                return [false, $resp['msg'], false];
+            } else {
+                $err = 998;
+                $net_errno = "HTTP-{$err}";
+                return [false, $resp['msg'], false];
+            }
+        }
+    }
+
+    public function query($refill_info)
+    {
+        $params['cpid'] = config::CPID;
+        $params['order_no'] = $refill_info['order_sn'];
+        $params['mobile'] = $refill_info['card_no'];
+        $params['create_time'] = date("YmdHis");
+        $params['sign'] = $this->sign($params);
+
+        $resp = http_request(config::QUERY_URL, $params, 'GET', false, []);
+
+        if (empty($resp)) {
+            return [false, '网络错误'];
+        }
+        else
+        {
+            Log::record($resp, Log::DEBUG);
+            $resp = json_decode($resp, true);
+            if (empty($resp))
+            {
+                return [false, '网络错误'];
+            }
+            else
+            {
+                $status = $resp['status'];
+                if ($status == 0)
+                {
+                    $order_status = $resp['data'];
+                    if ($order_status == 'success') {
+                        $updata['official_sn'] = $resp['operator_serial_number'];
+                        Model('refill_order')->edit($refill_info['order_id'], $updata);
+                        $order_state = ORDER_STATE_SUCCESS;
+                    } elseif ($order_status == 'failed') {
+                        $order_state = ORDER_STATE_CANCEL;
+                    } elseif ($order_status == 'untreated') {
+                        $order_state = ORDER_STATE_SEND;
+                    } else {
+                        return [false, $resp['msg']];
+                    }
+
+                    return [true, $order_state];
+                }
+                elseif ($status == -10013) {
+                    return [true, ORDER_STATE_NOEXIST];
+                }
+                else {
+                    return [false, $resp['msg']];
+                }
+            }
+        }
+    }
+
+    private function sign($params)
+    {
+        ksort($params);
+        $body = "";
+        foreach ($params as $k => $v) {
+            $body .= "{$k}{$v}";
+        }
+        $body .= config::CPKEY;
+        return md5($body);
+    }
+}

+ 11 - 0
helper/refill/api/xyz/sialan/account.txt

@@ -0,0 +1,11 @@
+下单接口:http://39.98.234.165/api/do
+查单接口:http://39.98.234.165/api/queryorder
+余额接口:http://39.98.234.165/api/querybalance
+
+登录地址:http://39.98.234.165
+帐号:GYYZ
+密码:123456
+CPID:39780
+CPKEY:966cbd556c90ae75d  
+
+https://docs.qq.com/doc/DQmdubmxCdXp6bkxu 对接文档

+ 56 - 0
helper/refill/api/xyz/sialan/config.php

@@ -0,0 +1,56 @@
+<?php
+
+
+namespace refill\sialan;
+
+use mtopcard;
+class config
+{
+    const ORDER_URL = 'http://39.98.234.165/api/do';
+    const QUERY_URL = 'http://39.98.234.165/api/queryorder';
+
+    const CPID = '39780';
+    const CPKEY = '966cbd556c90ae75d';
+    const NOTIFY_URL = BASE_SITE_URL . "/mobile/callback/refill_sialan.php";
+    const operator = [
+        mtopcard\ChinaMobileCard  => 1,
+        mtopcard\ChinaUnicomCard  => 2,
+        mtopcard\ChinaTelecomCard => 3
+    ];
+    const product_id = [
+        mtopcard\ChinaMobileCard  => [
+            10  => 20001,
+            20  => 20002,
+            30  => 20003,
+            50  => 20004,
+            100  => 20005,
+            200  => 20006,
+            300  => 20007,
+            500  => 20008,
+        ],
+        mtopcard\ChinaUnicomCard  => [
+            10  => 20009,
+            20  => 20010,
+            30  => 20011,
+            50  => 20012,
+            100  => 20013,
+            200  => 20014,
+            300  => 20015,
+            500  => 20016,
+        ],
+        mtopcard\ChinaTelecomCard => [
+            10  => 20017,
+            20  => 20018,
+            30  => 20019,
+            50  => 20020,
+            100  => 20021,
+            200  => 20022,
+            300  => 20023,
+            500  => 20024,
+        ]
+    ];
+
+    const ERR_NO = [
+        -10001,-10002,-10003,-10004,-10013,-10005,-10006,-10007,-10008,-10009,-10011,-10012,-10015,-10016
+    ];
+}

+ 51 - 51
helper/refill/api/xyz/tiancheng/RefillCallBack.php

@@ -1,52 +1,52 @@
-<?php
-
-
-namespace refill\tiancheng;
-
-require_once(BASE_HELPER_RAPI_PATH . '/tiancheng/config.php');
-
-use refill;
-
-class RefillCallBack implements refill\IRefillCallBack
-{
-    public function verify($params): bool
-    {
-        $sign = $this->sign($params);
-        if ($params['sign'] == $sign) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    private function sign($params)
-    {
-        $content = $params['result'] . $params['msg'] . $params['order'];
-        $content .= $params['phone_no'] . $params['amount'] . $params['op_no'] . $params['settle'] . config::KEY;
-        return strtoupper(md5($content));
-    }
-
-
-    public function notify($params)
-    {
-        $status = $params['result'];
-        $order_sn = $params['op_no'];
-        $order_info = Model('vr_order')->getOrderInfo(['order_sn' => $order_sn]);
-        if (empty($order_info)) {
-            return [false, false, false,false];
-        }
-        $order_id = $order_info['order_id'];
-
-        if ($status === 'success') {
-            $data['official_sn'] = strtolower($params['order']) == 'null' ? '' : $params['order'];
-            Model('refill_order')->edit($order_id, $data);
-            return [$order_id, true, false,true];
-        }
-        elseif ($status === 'fail') {
-            return [$order_id, false, false,true];
-        }
-        else {
-            return [$order_id, false, false,false];
-        }
-    }
+<?php
+
+
+namespace refill\tiancheng;
+
+require_once(BASE_HELPER_RAPI_PATH . '/tiancheng/config.php');
+
+use refill;
+
+class RefillCallBack implements refill\IRefillCallBack
+{
+    public function verify($params): bool
+    {
+        $sign = $this->sign($params);
+        if ($params['sign'] == $sign) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    private function sign($params)
+    {
+        $content = $params['result'] . $params['msg'] . $params['order'];
+        $content .= $params['phone_no'] . $params['amount'] . $params['op_no'] . $params['settle'] . config::KEY;
+        return strtoupper(md5($content));
+    }
+
+
+    public function notify($params)
+    {
+        $status = $params['result'];
+        $order_sn = $params['op_no'];
+        $order_info = Model('vr_order')->getOrderInfo(['order_sn' => $order_sn]);
+        if (empty($order_info)) {
+            return [false, false, false,false];
+        }
+        $order_id = $order_info['order_id'];
+
+        if ($status === 'success') {
+            $data['official_sn'] = strtolower($params['order']) == 'null' ? '' : $params['order'];
+            Model('refill_order')->edit($order_id, $data);
+            return [$order_id, true, false,true];
+        }
+        elseif ($status === 'fail') {
+            return [$order_id, false, true,true];
+        }
+        else {
+            return [$order_id, false, false,false];
+        }
+    }
 }

+ 15 - 1
helper/refill/policy/lingzh/policy.php

@@ -138,6 +138,15 @@ class policy extends ProviderManager implements IPolicy
             return [$org_quality,0];
         }
 
+        $namer = function ($providers)
+        {
+            $result = [];
+            foreach ($providers as $provider) {
+                $result[] = $provider->name();
+            }
+            return $result;
+        };
+
         foreach ($qualities as $quality)
         {
             $price = $this->mPrices->price($mchid,$card_type,$spec,$quality,$pcode);
@@ -147,7 +156,12 @@ class policy extends ProviderManager implements IPolicy
             }
 
             $providers = parent::get_providers($mchid, $spec, $card_type, $quality, $regin_no);
-            if (!empty($providers)) {
+            if(empty($providers)) continue;
+
+            $names = $namer($providers);
+            $names_overload = $this->mChannelControl->match($names, $spec, $card_type, $quality);
+
+            if (!empty($names_overload)) {
                 return [$org_quality, $quality];
             } else {
                 Log::record("Policy::find_quality:{$quality}-{$spec}-{$card_type} is fail", Log::DEBUG);

+ 15 - 1
helper/refill/policy/xyz/policy.php

@@ -174,6 +174,15 @@ class policy extends ProviderManager implements IPolicy
             return [$org_quality,0];
         }
 
+        $namer = function ($providers)
+        {
+            $result = [];
+            foreach ($providers as $provider) {
+                $result[] = $provider->name();
+            }
+            return $result;
+        };
+
         foreach ($qualities as $quality)
         {
             $price = $this->mPrices->price($mchid,$card_type,$spec,$quality,$pcode);
@@ -183,7 +192,12 @@ class policy extends ProviderManager implements IPolicy
             }
 
             $providers = parent::get_providers($mchid, $spec, $card_type, $quality, $regin_no);
-            if (!empty($providers)) {
+            if(empty($providers)) continue;
+
+            $names = $namer($providers);
+            $names_overload = $this->mChannelControl->match($names, $spec, $card_type, $quality);
+
+            if (!empty($names_overload)) {
                 return [$org_quality, $quality];
             } else {
                 Log::record("Policy::find_quality:{$quality}-{$spec}-{$card_type} is fail", Log::DEBUG);

+ 1 - 1
helper/refill/util.php

@@ -66,7 +66,7 @@ class util
             {
                 $latest = current($result);
                 $cur = time();
-                $lowest = 300;
+                $lowest = 30;
                 if ($cur > $latest && ($cur - $latest) >= $lowest) {
                     wcache("card_expired", [$card_no => time()], '');
                     return [true, 0];

+ 6 - 0
mobile/callback/refill_sialan.php

@@ -0,0 +1,6 @@
+<?php
+refill\util::push_notify('sialan',$_POST);
+
+$reponse = ["status" => "success"];
+$body = json_encode($reponse);
+echo($body);

+ 1 - 1
rdispatcher/proxy.php

@@ -82,7 +82,7 @@ class proxy
                 $fNotify = false;
                 QueueClient::async_push("QueryOrderNeterr",['order_id' => $order_id],5);
             }
-            elseif(($errcode === refill\errcode::MERCHANT_REFILL_ERROR && $neterr) || $errcode == refill\errcode::PROVIDER_OVERLOAD || $errcode == errcode::MERCHANT_PRICE_UNSETTING)
+            elseif(($errcode === refill\errcode::MERCHANT_REFILL_ERROR && $neterr) || $errcode == errcode::MERCHANT_PRICE_UNSETTING)
             {
                 [$org_quality,$quality] = refill\RefillFactory::instance()->find_quality($mchid,$amount,$card_type,$org_quality,$cur_quality,$commit_times,time() - $order_time,'',$regin_no);
                 if ($quality > 0)

+ 17 - 0
test/TestRefill.php

@@ -494,6 +494,13 @@ class TestRefill extends TestCase
         refill\RefillFactory::instance()->notify('cangbu',$params);
     }
 
+    public function testCangbukami()
+    {
+        $providers = new refill\cangbukami\RefillPhone([]);
+//        $resp = $providers->add(18500608333, 5, 20, ['order_sn' => $this->make_sn()]);
+        $resp = $providers->query(['order_sn' => '23231627380108954478']);
+    }
+
     public function testTongykamiPhone()
     {
         $providers = new refill\tongykami\RefillPhone([]);
@@ -516,6 +523,16 @@ class TestRefill extends TestCase
 //        refill\RefillFactory::instance()->notify('tonglu',$params);
     }
 
+    public function testSialan()
+    {
+        $providers = new refill\sialan\RefillPhone([]);
+//        $resp = $providers->add(13699279618, 4, 10, ['order_sn' => $this->make_sn()]);
+//        $resp = $providers->query(['order_sn' => '79651627436983840352', 'card_no' => 13699279618]);
+        $body = '{"cpid":"39780","order_no":"21072809494539780728903528","mobile":"13699279618","amount":"10","status":"success","sz_order_no":"2021072822001158391454773955","ret_para":"79651627436983840352","sign":"aa7e8a2e589660e98319c5546cb432fa"}';
+        $params = json_decode($body, true);
+        refill\RefillFactory::instance()->notify('sialan', $params);
+    }
+
     public function testAmingjd()
     {
 //        $providers = new refill\amingjd\RefillPhone([]);