ruixunda_fs add 广东移动

admin/templates/default/provider.amount.php

@@ -122,7 +122,7 @@
                         <td class="align-center">
                             <a href="index.php?act=provider&op=provider_amount_edit&amount_id=<?php echo $v['id'] ?>">编辑</a>
                             |
-                            <a href="#" class="copy" data-name="<?php echo $v['name']; ?> (<?php echo $v['store_name'];?>)" data-amount="<?php echo $v['amount']; ?>">拷贝</a>
+                            <a href="Javascript:void(0);" class="copy" data-name="<?php echo $v['name']; ?> (<?php echo $v['store_name'];?>)" data-amount="<?php echo $v['amount']; ?>">拷贝</a>
                             <?php if(!empty($v['voucher_name'])) {?>
                                 |
                                 <a target="_blank"

data/config/xyz/refill.ini.php

@@ -6604,19 +6604,23 @@ $weixue_phone = ['name' => 'weixue', 'store_id' => 243, 'qualitys' => '1',
         ],
         30 => [
             ['goods_id' => 8009, 'price' => 28.95, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 8009, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinaunicom']
+            ['goods_id' => 8009, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 8009, 'price' => 29.1, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
         50 => [
             ['goods_id' => 8010, 'price' => 48.25, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 8010, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinaunicom']
+            ['goods_id' => 8010, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 8010, 'price' => 48.5, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
         100 => [
             ['goods_id' => 8011, 'price' => 96.5, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 8011, 'price' => 95, 'quality' => 1, 'card_type' => 'chinaunicom']
+            ['goods_id' => 8011, 'price' => 95, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 8011, 'price' => 97, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
         200 => [
             ['goods_id' => 8012, 'price' => 193, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 8012, 'price' => 190, 'quality' => 1, 'card_type' => 'chinaunicom']
+            ['goods_id' => 8012, 'price' => 190, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 8012, 'price' => 194, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
         300 => [
 //            ['goods_id' => 8013, 'price' => 290.1, 'quality' => 1, 'card_type' => 'chinamobile'],
@@ -7240,23 +7244,27 @@ $meixu_kami_phone = ['name' => 'meixu_kami', 'store_id' => 266, 'qualitys' => '2
 
 $bier_phone = ['name' => 'bier', 'store_id' => 267, 'qualitys' => '1',
     'amount' => [
-        10 => [['goods_id' => 8223, 'price' => 9.95, 'quality' => 1, 'card_type' => 'chinamobile']],
-        20 => [['goods_id' => 8224, 'price' => 19.9, 'quality' => 1, 'card_type' => 'chinamobile']],
+        10 => [['goods_id' => 8223, 'price' => 9.85, 'quality' => 1, 'card_type' => 'chinamobile']],
+        20 => [['goods_id' => 8224, 'price' => 19.7, 'quality' => 1, 'card_type' => 'chinamobile']],
         30 => [
-            ['goods_id' => 8225, 'price' => 29.4, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 8225, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinaunicom']
+            ['goods_id' => 8225, 'price' => 28.95, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 8225, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 8225, 'price' => 28.95, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
         50 => [
-            ['goods_id' => 8226, 'price' => 49, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 8226, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinaunicom']
+            ['goods_id' => 8226, 'price' => 48.25, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 8226, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 8226, 'price' => 48.25, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
         100 => [
-            ['goods_id' => 8227, 'price' => 98, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 8227, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinaunicom']
+            ['goods_id' => 8227, 'price' => 96.5, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 8227, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 8227, 'price' => 96.5, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
         200 => [
-            ['goods_id' => 8228, 'price' => 196, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 8228, 'price' => 189.6, 'quality' => 1, 'card_type' => 'chinaunicom']
+            ['goods_id' => 8228, 'price' => 193, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 8228, 'price' => 189.6, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 8228, 'price' => 193, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
 //        300 => [['goods_id' => 8229, 'price' => 288, 'quality' => 1, 'card_type' => 'chinamobile']],
 //        500 => [['goods_id' => 8230, 'price' => 480, 'quality' => 1, 'card_type' => 'chinamobile']]

data/config/yl/refill.ini.php

@@ -6409,19 +6409,23 @@ $weixue_phone = ['name' => 'weixue', 'store_id' => 235, 'qualitys' => '1',
         ],
         30 => [
             ['goods_id' => 7965, 'price' => 28.95, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7965, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinaunicom']
+            ['goods_id' => 7965, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7965, 'price' => 29.1, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
         50 => [
             ['goods_id' => 7966, 'price' => 48.25, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7966, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinaunicom']
+            ['goods_id' => 7966, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7966, 'price' => 48.5, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
         100 => [
             ['goods_id' => 7967, 'price' => 96.5, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7967, 'price' => 95, 'quality' => 1, 'card_type' => 'chinaunicom']
+            ['goods_id' => 7967, 'price' => 95, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7967, 'price' => 97, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
         200 => [
             ['goods_id' => 7968, 'price' => 193, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 7968, 'price' => 190, 'quality' => 1, 'card_type' => 'chinaunicom']
+            ['goods_id' => 7968, 'price' => 190, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 7968, 'price' => 194, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
         300 => [
 //            ['goods_id' => 7969, 'price' => 290.1, 'quality' => 1, 'card_type' => 'chinamobile'],
@@ -6781,23 +6785,27 @@ $qianqian_fs_gd_phone = ['name' => 'qianqian_fs_gd', 'store_id' => 250, 'quality
 
 $bier_phone = ['name' => 'bier', 'store_id' => 251, 'qualitys' => '1',
     'amount' => [
-        10 => [['goods_id' => 8091, 'price' => 9.95, 'quality' => 1, 'card_type' => 'chinamobile']],
-        20 => [['goods_id' => 8092, 'price' => 19.9, 'quality' => 1, 'card_type' => 'chinamobile']],
+        10 => [['goods_id' => 8091, 'price' => 9.85, 'quality' => 1, 'card_type' => 'chinamobile']],
+        20 => [['goods_id' => 8092, 'price' => 19.7, 'quality' => 1, 'card_type' => 'chinamobile']],
         30 => [
-            ['goods_id' => 8093, 'price' => 29.4, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 8093, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinaunicom']
+            ['goods_id' => 8093, 'price' => 28.95, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 8093, 'price' => 28.44, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 8093, 'price' => 28.95, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
         50 => [
-            ['goods_id' => 8094, 'price' => 49, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 8094, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinaunicom']
+            ['goods_id' => 8094, 'price' => 48.25, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 8094, 'price' => 47.4, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 8094, 'price' => 48.25, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
         100 => [
-            ['goods_id' => 8095, 'price' => 98, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 8095, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinaunicom']
+            ['goods_id' => 8095, 'price' => 96.5, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 8095, 'price' => 94.8, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 8095, 'price' => 96.5, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
         200 => [
-            ['goods_id' => 8096, 'price' => 196, 'quality' => 1, 'card_type' => 'chinamobile'],
-            ['goods_id' => 8096, 'price' => 189.6, 'quality' => 1, 'card_type' => 'chinaunicom']
+            ['goods_id' => 8096, 'price' => 193, 'quality' => 1, 'card_type' => 'chinamobile'],
+            ['goods_id' => 8096, 'price' => 189.6, 'quality' => 1, 'card_type' => 'chinaunicom'],
+            ['goods_id' => 8096, 'price' => 193, 'quality' => 1, 'card_type' => 'chinatelecom'],
         ],
 //        300 => [['goods_id' => 8097, 'price' => 288, 'quality' => 1, 'card_type' => 'chinamobile']],
 //        500 => [['goods_id' => 8098, 'price' => 480, 'quality' => 1, 'card_type' => 'chinamobile']]

helper/refill/RefillBase.php

@@ -59,13 +59,20 @@ class RefillBase
         }
         elseif ($caller->verify($input))
         {
-            [$order_id, $success, $can_try, $need_handle] = $caller->notify($input);
+            $values = $caller->notify($input);
+            if(count($values) == 4) { //老的接口返回四个参数
+                [$order_id, $success, $can_try, $need_handle] = $values;
+                $official_sn = false;
+            } else {
+                [$order_id, $success, $can_try, $need_handle, $official_sn] = $values;
+            }
+
             if (!$need_handle) {
                 return true;
             }
 
             if ($order_id !== false) {
-                return $this->proc_notify($order_id, $success, $can_try, $chname,$input);
+                return $this->proc_notify($order_id, $success, $can_try, $chname, $input, $official_sn);
             } else {
                 Log::record("{$chname} callback 系统无此订单ID：{$order_id}", Log::ERR);
             }
@@ -78,7 +85,7 @@ class RefillBase
         return true;
     }
 
-    private function risksn_check($refill_info)
+    private function risksn_check($refill_info,$org_official_sn)
     {
         $card_type = intval($refill_info['card_type']);
         $chk_types = [mtopcard\ChinaMobileCard , mtopcard\ChinaUnicomCard , mtopcard\ChinaTelecomCard];
@@ -87,6 +94,10 @@ class RefillBase
             return false;
         }
 
+        if ($org_official_sn !== false and count($org_official_sn) > 48) {
+            return true;
+        }
+
         $quality = intval($refill_info['quality']);
         $official_sn = $refill_info['official_sn'];
 
@@ -116,7 +127,7 @@ class RefillBase
         return $spcheker();
     }
 
-    private function proc_notify($order_id, $success, $can_try, $chname, $input = [])
+    private function proc_notify($order_id, $success, $can_try, $chname, $input = [], $official_sn = false)
     {
         $mod_order = Model('vr_order');
         $order_info = $mod_order->partition(util::part_notify())->getOrderInfo(['order_id' => $order_id]);
@@ -163,7 +174,7 @@ class RefillBase
             $mch_order = $refill_info['mch_order'];
             $order_time = intval($refill_info['order_time']);
 
-            if($success && $this->risksn_check($refill_info)) {
+            if ($success && $this->risksn_check($refill_info, $official_sn)) {
                 $tran->commit();
                 $params = ['store_id' => $order_info['store_id'],
                     'channel_name' => $refill_info['channel_name'],
@@ -719,18 +730,22 @@ class RefillBase
             $provider = $this->mPolicy->provider($chname);
             if(empty($provider)) return false;
 
-            [$state, $order_state] = $provider->query($refill_info);
-            if(!$state) {
-                return false;
-            }
-            elseif($order_state == ORDER_STATE_SUCCESS) {
-                $this->proc_notify($order_id,true,false,$chname);
-            }
-            elseif($order_state == ORDER_STATE_CANCEL) {
-                $this->proc_notify($order_id,false,true,$chname);
+            $values = $provider->query($refill_info);
+            if (count($values) == 2) {
+                [$state, $order_state] = $values;
+                $official_sn = false;
+            } else {
+                [$state, $order_state, $official_sn] = $values;
             }
-            else {
-                Log::record("RefillBase::query order_state={$order_state}",Log::DEBUG);
+
+            if (!$state) {
+                return false;
+            } elseif ($order_state == ORDER_STATE_SUCCESS) {
+                $this->proc_notify($order_id, true, false, $chname, $official_sn);
+            } elseif ($order_state == ORDER_STATE_CANCEL) {
+                $this->proc_notify($order_id, false, true, $chname, $official_sn);
+            } else {
+                Log::record("RefillBase::query order_state={$order_state}", Log::DEBUG);
             }
         }
 
@@ -795,7 +810,13 @@ class RefillBase
         $provider = $this->mPolicy->provider($chname);
         if(empty($provider)) return false;
 
-        [$state, $order_state] = $provider->query($refill_info);
+        $values = $provider->query($refill_info);
+        if (count($values) == 2) {
+            [$state, $order_state] = $values;
+            $official_sn = false;
+        } else {
+            [$state, $order_state, $official_sn] = $values;
+        }
 
         try {
             $can_try = false;
@@ -816,7 +837,7 @@ class RefillBase
         if($can_try)
         {
             if($trans_succ) {
-                $this->proc_notify($order_id, false, true, $chname);
+                $this->proc_notify($order_id, false, true, $chname, $official_sn);
             } else {
                 QueueClient::async_push("QueryOrderNeterr",['order_id' => $order_id],30);
             }

helper/refill/api/xyz/bier/config.php

@@ -34,7 +34,10 @@ class config
             200 => 'CUCCALLr200r',
         ],
         mtopcard\ChinaTelecomCard => [
-
+            30 => 'CTCCALLr30r',
+            50 => 'CTCCALLr50r',
+            100 => 'CTCCALLr100r',
+            200 => 'CTCCALLr200r',
         ],
     ];
 

helper/refill/api/xyz/bier/椰子.txt

@@ -32,4 +32,12 @@ CUCCALLr200r				200
 2022.11.23
 全国移动 10-20 面值 0.995
 CMCCALLr10r
-CMCCALLr20r
+CMCCALLr20r
+
+2022.11.29
+折扣96.5
+全国电信
+CTCCALLr30r
+CTCCALLr50r
+CTCCALLr100r
+CTCCALLr200r

helper/refill/api/xyz/dazhanggui_fs/api.txt

@@ -92,4 +92,20 @@
 3530050
 3530100
 3530200
-折扣94
+折扣94
+
+2022.11.30
+浙江移动30-200编码
+1330030
+1330050
+1330100
+1330200
+
+2022.12.1
+江苏电信30-200 折扣95
+
+商品编码
+3320030
+3320050
+3320100
+3320200

helper/refill/api/xyz/dazhanggui_fs/config.php

@@ -74,6 +74,13 @@ class config
                 100 => 1410100,
                 200 => 1410200,
             ],
+            //浙江
+            11 => [
+                30  => 1330030,
+                50  => 1330050,
+                100 => 1330100,
+                200 => 1330200,
+            ],
         ],
         mtopcard\ChinaTelecomCard => [
             //湖南
@@ -125,6 +132,13 @@ class config
                 100 => 3530100,
                 200 => 3530200,
             ],
+            //江苏
+            10 => [
+                30  => 3320030,
+                50  => 3320050,
+                100 => 3320100,
+                200 => 3320200,
+            ],
         ],
     ];
 
@@ -138,6 +152,7 @@ class config
         "4-30-13" => 28.08, "4-50-13" => 46.8, "4-100-13" => 93.6, "4-200-13" => 187.2,//福建 13
         "4-30-25" => 28.08, "4-50-25" => 46.8, "4-100-25" => 93.6, "4-200-25" => 187.2,//云南 25
         "4-30-16" => 28.08, "4-50-16" => 46.8, "4-100-16" => 93.6, "4-200-16" => 187.2,//河南 16
+        "4-30-11" => 28.35, "4-50-11" => 47.25, "4-100-11" => 94.5, "4-200-11" => 189,//浙江 11
 
         //电信
         "6-30-18" => 28.35, "6-50-18" => 47.25, "6-100-18" => 94.5, "6-200-18" => 189,//湖南 18
@@ -147,6 +162,7 @@ class config
         "6-30-2" => 28.2, "6-50-2" => 47, "6-100-2" => 94, "6-200-2" => 188,//天津 2
         "6-30-15" => 28.2, "6-50-15" => 47, "6-100-15" => 94, "6-200-15" => 188,//山东 15
         "6-30-25" => 28.2, "6-50-25" => 47, "6-100-25" => 94, "6-200-25" => 188,//云南 25
+        "6-30-10" => 28.5, "6-50-10" => 47.5, "6-100-10" => 95, "6-200-10" => 190,//江苏 10
     ];
 
 }

helper/refill/api/xyz/guochuang/config.php

@@ -64,7 +64,7 @@ class config
     const Price = [
         //移动
         "4-10-2" => 10.03, "4-20-2" => 20.06, "4-30-2" => 30.09, "4-50-2" => 50.15, "4-100-2" => 100.3, "4-200-2" => 200.6, "4-300-2" => 300.9, "4-500-2" => 501.5,//天津 2
-        "4-10-6" => 9.82, "4-20-6" => 19.64, "4-30-6" => 29.46, "4-50-6" => 49.1, "4-100-6" => 98.2, "4-200-6" => 196.4, "4-300-6" => 294.6, "4-500-6" => 491,//辽宁 6
+        "4-10-6" => 9.8, "4-20-6" => 19.6, "4-30-6" => 29.4, "4-50-6" => 49, "4-100-6" => 98, "4-200-6" => 196, "4-300-6" => 294, "4-500-6" => 490,//辽宁 6
         "4-10-9" => 9.94, "4-20-9" => 19.88, "4-30-9" => 29.82, "4-50-9" => 49.7, "4-100-9" => 99.4,//上海 9
         "4-10-8" => 10.02, "4-20-8" => 20.04, "4-30-8" => 30.06, "4-50-8" => 50.1, "4-100-8" => 100.2, "4-200-8" => 200.4, "4-300-8" => 300.15, "4-500-8" => 500.25,//黑龙江 8
         "4-10-29" => 9.86, "4-20-29" => 19.72, "4-30-29" => 29.58, "4-50-29" => 49.3, "4-100-29" => 98.6, "4-200-29" => 197.2, "4-300-29" => 295.8, "4-500-29" => 493,//青海 29
@@ -72,7 +72,7 @@ class config
         "4-10-13" => 10.01, "4-20-13" => 20.02, "4-30-13" => 30.03, "4-50-13" => 49.8, "4-100-13" => 99.6, "4-200-13" => 199.2, "4-300-13" => 298.8, "4-500-13" => 498,//福建 13
         "4-10-5" => 10.035, "4-20-5" => 20.07, "4-30-5" => 30.09, "4-50-5" => 50.15, "4-100-5" => 100.3, "4-200-5" => 200.4, "4-300-5" => 300.6, "4-500-5" => 501,//内蒙古 5
         "4-30-18" => 29.835, "4-50-18" => 49.725, "4-100-18" => 99.45, "4-200-18" => 198.3,//湖南 18
-        "4-10-19" => 9.97, "4-20-19" => 19.94, "4-30-19" => 29.97, "4-50-19" => 49.95, "4-100-19" => 99.9, "4-200-19" => 199.8, "4-300-19" => 299.7, "4-500-19" => 499.5,//广东 19
+        "4-10-19" => 9.97, "4-20-19" => 19.94, "4-30-19" => 30.03, "4-50-19" => 50.05, "4-100-19" => 100.1, "4-200-19" => 200.2, "4-300-19" => 300.3, "4-500-19" => 500.5,//广东 19
         "4-10-7" => 9.93, "4-20-7" => 19.86, "4-30-7" => 29.52, "4-50-7" => 49.2, "4-100-7" => 98.4, "4-200-7" => 196.8, "4-300-7" => 295.2, "4-500-7" => 492,//吉林 7
         "4-10-1" => 10.31, "4-20-1" => 20.32, "4-30-1" => 30.33, "4-50-1" => 50.35, "4-100-1" => 100.4, "4-200-1" => 200.3, "4-300-1" => 300.45, "4-500-1" => 500.75,//北京 1
         "4-10-22" => 10.015, "4-20-22" => 20.03, "4-30-22" => 30.045, "4-50-22" => 50.075, "4-100-22" => 100.15, "4-200-22" => 200.3, "4-300-22" => 300.45, "4-500-22" => 500.75,//重庆 22

helper/refill/api/xyz/meixu/RefillCallBack.php

@@ -29,20 +29,22 @@ class RefillCallBack implements refill\IRefillCallBack
     {
         $status = intval($params['resultno']);
         $order_sn = $params['sporderid'];
+
         $order_info = Model('vr_order')->getOrderInfoForNotify(['order_sn' => $order_sn]);
         if (empty($order_info)) {
-            return [false, false, false, false];
+            return [false, false, false, false, ''];
         }
 
         $order_id = $order_info['order_id'];
         if ($status === 1) {
             $data['official_sn'] = strtolower($params['remark1']) == 'null' ? '' : $params['remark1'];
+            $official_sn = strtolower($params['remark1']) == 'null' ? '' : $params['remark1'];
             Model('refill_order')->edit($order_id, $data);
-            return [$order_id, true, false, true];
+            return [$order_id, true, false, true, $official_sn];
         } elseif ($status === 9) {
-            return [$order_id, false, true, true];
+            return [$order_id, false, true, true, ''];
         } else {
-            return [$order_id, false, false, false];
+            return [$order_id, false, false, false, ''];
         }
     }
 }

helper/refill/api/xyz/meixu/RefillPhone.php

@@ -75,7 +75,7 @@ class RefillPhone extends refill\IRefillPhone
         $resp = http_request(config::QUERY_URL, $params, 'POST');
 
         if (empty($resp)) {
-            return [false, '网络错误'];
+            return [false, '网络错误',''];
         }
         else
         {
@@ -83,13 +83,15 @@ class RefillPhone extends refill\IRefillPhone
             $resp = $this->xmlToArray($resp);
             if (empty($resp))
             {
-                return [false, '网络错误'];
+                return [false, '网络错误',''];
             }
             else
             {
+                $offical_sn = '';
                 $resultno = $resp['resultno'];
                 if ($resultno === '1') {
-                    $updata['official_sn'] = $resp['remark1'];
+                    $offical_sn = $resp['remark1'];
+                    $updata['official_sn'] = $offical_sn;
                     Model('refill_order')->edit($refill_info['order_id'], $updata);
                     $order_state = ORDER_STATE_SUCCESS;
                 } elseif ($resultno === '9') {
@@ -99,10 +101,10 @@ class RefillPhone extends refill\IRefillPhone
                 } elseif ($resultno === '5007' && (time() - $refill_info['commit_time'] > 600)) {
                     $order_state = ORDER_STATE_NOEXIST;
                 } else {
-                    return [false, $resultno];
+                    return [false, $resultno, $offical_sn];
                 }
 
-                return [true, $order_state];
+                return [true, $order_state, $offical_sn];
             }
         }
     }

helper/refill/api/xyz/ruixunda_fs/config.php

@@ -68,6 +68,13 @@ class config
                 100 => 3936,
                 200 => 39595,
             ],
+            //浙江
+            11 => [
+                30  => 3414,
+                50  => 3415,
+                100 => 3416,
+                200 => 34575,
+            ],
             //广东
             19 => [
                 50  => 3311,
@@ -118,11 +125,12 @@ class config
     const Price = [
         //移动
         "4-30-24" => 27.6, "4-50-24" => 46, "4-100-24" => 92, "4-200-24" => 184,//贵州 24
-        "4-30-10" => 27.9, "4-50-10" => 46.5, "4-100-10" => 93, "4-200-10" => 186,//江苏 10
+        "4-30-10" => 27.9, "4-50-10" => 46.75, "4-100-10" => 93.5, "4-200-10" => 187,//江苏 10
         "4-30-15" => 28.5, "4-50-15" => 47.5, "4-100-15" => 95, "4-200-15" => 190,//山东 15
         "4-30-13" => 27.78, "4-50-13" => 46.3, "4-100-13" => 92.6, "4-200-13" => 185.2,//福建 13
         "4-30-25" => 27.96, "4-50-25" => 46.6, "4-100-25" => 93.2, "4-200-25" => 186.4,//云南 25
         "4-30-16" => 28.05, "4-50-16" => 46.75, "4-100-16" => 93.5, "4-200-16" => 187,//河南 16
+        "4-30-11" => 28.38, "4-50-11" => 47.3, "4-100-11" => 94.6, "4-200-11" => 189.2,//浙江 11
         "4-50-19" => 47.35, "4-100-19" => 94.7, "4-200-19" => 189.4,//广东 19
 
         //电信

helper/refill/api/xyz/ruixunda_fs/对接文档-yezi.txt

@@ -82,6 +82,14 @@ http://47.96.69.138:9086/searchbalance.do
 3936 河南移动100元直充
 39595 河南移动200元直充
 
+2022.11.30
+浙江移动30-200
+产品编码：
+3414 浙江移动30元直充
+3415 浙江移动50元直充
+3416 浙江移动100元直充
+34575 浙江移动200元直充
+
 2022.12.1
 3311 广东移动50元直充
 3312 广东移动100元直充

helper/refill/api/xyz/weixue/config.php

@@ -46,5 +46,12 @@ class config
                 300 => '101709',
                 500 => '101710'
             ],
+        mtopcard\ChinaTelecomCard =>
+            [
+                30  => '101723',
+                50  => '101724',
+                100 => '101725',
+                200 => '101726',
+            ],
     ];
 }

helper/refill/api/xyz/weixue/对接文档-yezi.txt

@@ -39,4 +39,11 @@ ID：10002703
 2022.11.26
 移动
 10面值编码 101685
-20面值编码 101686
+20面值编码 101686
+
+2022.12.1
+电信 97
+30	101723
+50	101724
+100	101725
+200	101726

helper/refill/api/xyz/yuewen_fs/config.php

@@ -41,9 +41,9 @@ class config
             ],
             //福建
             13 => [
-                50  => '38585',
-                100 => '3831',
-                200 => '3832',
+                50  => '3831',
+                100 => '3832',
+                200 => '38585',
             ],
             //河南
             16 => [
@@ -78,10 +78,10 @@ class config
     //key格式 卡类型-面值-regin_no
     const Price = [
         //移动
-        "4-50-24" => 46.6, "4-100-24" => 93.2, "4-200-24" => 186.4,//贵州 24
-        "4-50-10" => 46.6, "4-100-10" => 93.2, "4-200-10" => 186.4,//江苏 10
-        "4-50-13" => 46.6, "4-100-13" => 93.2, "4-200-13" => 186.4,//福建 13
-        "4-50-16" => 46.6, "4-100-16" => 93.2, "4-200-16" => 186.4,//河南 16
+        "4-50-24" => 47, "4-100-24" => 94, "4-200-24" => 188,//贵州 24
+        "4-50-10" => 47, "4-100-10" => 94, "4-200-10" => 188,//江苏 10
+        "4-50-13" => 47, "4-100-13" => 94, "4-200-13" => 188,//福建 13
+        "4-50-16" => 47, "4-100-16" => 94, "4-200-16" => 188,//河南 16
 
         //电信
         "6-30-2" => 27.9, "6-50-2" => 46.5, "6-100-2" => 93, "6-200-2" => 186,//天津 2

helper/refill/api/xyz/yuewen_fs/对接文档-yezi.txt

@@ -25,9 +25,9 @@ http://123.60.5.158:9086/searchbalance.do
 331118	江苏移动100元直充
 30000000790	江苏移动200元直充
 
-38585	福建移动200元直充
 3831	福建移动50元直充
 3832	福建移动100元直充
+38585	福建移动200元直充
 
 282369	天津电信30元直充
 282370	天津电信50元直充
@@ -42,4 +42,4 @@ http://123.60.5.158:9086/searchbalance.do
 2022.11.26
 3935 河南移动50元直充
 3936 河南移动100元直充
-39595 河南移动200元直充
+39595 河南移动200元直充

helper/refill/api/yl/bier/config.php

@@ -34,7 +34,10 @@ class config
             200 => 'CUCCALLr200r',
         ],
         mtopcard\ChinaTelecomCard => [
-
+            30 => 'CTCCALLr30r',
+            50 => 'CTCCALLr50r',
+            100 => 'CTCCALLr100r',
+            200 => 'CTCCALLr200r',
         ],
     ];
 

helper/refill/api/yl/dazhanggui_fs/config.php

@@ -74,6 +74,13 @@ class config
                 100 => 1410100,
                 200 => 1410200,
             ],
+            //浙江
+            11 => [
+                30  => 1330030,
+                50  => 1330050,
+                100 => 1330100,
+                200 => 1330200,
+            ],
         ],
         mtopcard\ChinaTelecomCard => [
             //湖南
@@ -125,6 +132,13 @@ class config
                 100 => 3530100,
                 200 => 3530200,
             ],
+            //江苏
+            10 => [
+                30  => 3320030,
+                50  => 3320050,
+                100 => 3320100,
+                200 => 3320200,
+            ],
         ],
     ];
 
@@ -138,6 +152,7 @@ class config
         "4-30-13" => 28.08, "4-50-13" => 46.8, "4-100-13" => 93.6, "4-200-13" => 187.2,//福建 13
         "4-30-25" => 28.08, "4-50-25" => 46.8, "4-100-25" => 93.6, "4-200-25" => 187.2,//云南 25
         "4-30-16" => 28.08, "4-50-16" => 46.8, "4-100-16" => 93.6, "4-200-16" => 187.2,//河南 16
+        "4-30-11" => 28.35, "4-50-11" => 47.25, "4-100-11" => 94.5, "4-200-11" => 189,//浙江 11
 
         //电信
         "6-30-18" => 28.35, "6-50-18" => 47.25, "6-100-18" => 94.5, "6-200-18" => 189,//湖南 18
@@ -147,6 +162,7 @@ class config
         "6-30-2" => 28.2, "6-50-2" => 47, "6-100-2" => 94, "6-200-2" => 188,//天津 2
         "6-30-15" => 28.2, "6-50-15" => 47, "6-100-15" => 94, "6-200-15" => 188,//山东 15
         "6-30-25" => 28.2, "6-50-25" => 47, "6-100-25" => 94, "6-200-25" => 188,//云南 25
+        "6-30-10" => 28.5, "6-50-10" => 47.5, "6-100-10" => 95, "6-200-10" => 190,//江苏 10
     ];
 
 }

helper/refill/api/yl/guochuang/config.php

@@ -64,7 +64,7 @@ class config
     const Price = [
         //移动
         "4-10-2" => 10.03, "4-20-2" => 20.06, "4-30-2" => 30.09, "4-50-2" => 50.15, "4-100-2" => 100.3, "4-200-2" => 200.6, "4-300-2" => 300.9, "4-500-2" => 501.5,//天津 2
-        "4-10-6" => 9.82, "4-20-6" => 19.64, "4-30-6" => 29.46, "4-50-6" => 49.1, "4-100-6" => 98.2, "4-200-6" => 196.4, "4-300-6" => 294.6, "4-500-6" => 491,//辽宁 6
+        "4-10-6" => 9.8, "4-20-6" => 19.6, "4-30-6" => 29.4, "4-50-6" => 49, "4-100-6" => 98, "4-200-6" => 196, "4-300-6" => 294, "4-500-6" => 490,//辽宁 6
         "4-10-9" => 9.94, "4-20-9" => 19.88, "4-30-9" => 29.82, "4-50-9" => 49.7, "4-100-9" => 99.4,//上海 9
         "4-10-8" => 10.02, "4-20-8" => 20.04, "4-30-8" => 30.06, "4-50-8" => 50.1, "4-100-8" => 100.2, "4-200-8" => 200.4, "4-300-8" => 300.15, "4-500-8" => 500.25,//黑龙江 8
         "4-10-29" => 9.86, "4-20-29" => 19.72, "4-30-29" => 29.58, "4-50-29" => 49.3, "4-100-29" => 98.6, "4-200-29" => 197.2, "4-300-29" => 295.8, "4-500-29" => 493,//青海 29
@@ -72,7 +72,7 @@ class config
         "4-10-13" => 10.01, "4-20-13" => 20.02, "4-30-13" => 30.03, "4-50-13" => 49.8, "4-100-13" => 99.6, "4-200-13" => 199.2, "4-300-13" => 298.8, "4-500-13" => 498,//福建 13
         "4-10-5" => 10.035, "4-20-5" => 20.07, "4-30-5" => 30.09, "4-50-5" => 50.15, "4-100-5" => 100.3, "4-200-5" => 200.4, "4-300-5" => 300.6, "4-500-5" => 501,//内蒙古 5
         "4-30-18" => 29.835, "4-50-18" => 49.725, "4-100-18" => 99.45, "4-200-18" => 198.3,//湖南 18
-        "4-10-19" => 9.97, "4-20-19" => 19.94, "4-30-19" => 29.97, "4-50-19" => 49.95, "4-100-19" => 99.9, "4-200-19" => 199.8, "4-300-19" => 299.7, "4-500-19" => 499.5,//广东 19
+        "4-10-19" => 9.97, "4-20-19" => 19.94, "4-30-19" => 30.03, "4-50-19" => 50.05, "4-100-19" => 100.1, "4-200-19" => 200.2, "4-300-19" => 300.3, "4-500-19" => 500.5,//广东 19
         "4-10-7" => 9.93, "4-20-7" => 19.86, "4-30-7" => 29.52, "4-50-7" => 49.2, "4-100-7" => 98.4, "4-200-7" => 196.8, "4-300-7" => 295.2, "4-500-7" => 492,//吉林 7
         "4-10-1" => 10.31, "4-20-1" => 20.32, "4-30-1" => 30.33, "4-50-1" => 50.35, "4-100-1" => 100.4, "4-200-1" => 200.3, "4-300-1" => 300.45, "4-500-1" => 500.75,//北京 1
         "4-10-22" => 10.015, "4-20-22" => 20.03, "4-30-22" => 30.045, "4-50-22" => 50.075, "4-100-22" => 100.15, "4-200-22" => 200.3, "4-300-22" => 300.45, "4-500-22" => 500.75,//重庆 22

helper/refill/api/yl/ruixunda_fs/config.php

@@ -68,6 +68,13 @@ class config
                 100 => 3936,
                 200 => 39595,
             ],
+            //浙江
+            11 => [
+                30  => 3414,
+                50  => 3415,
+                100 => 3416,
+                200 => 34575,
+            ],
             //广东
             19 => [
                 50  => 3311,
@@ -118,11 +125,12 @@ class config
     const Price = [
         //移动
         "4-30-24" => 27.6, "4-50-24" => 46, "4-100-24" => 92, "4-200-24" => 184,//贵州 24
-        "4-30-10" => 27.9, "4-50-10" => 46.5, "4-100-10" => 93, "4-200-10" => 186,//江苏 10
+        "4-30-10" => 27.9, "4-50-10" => 46.75, "4-100-10" => 93.5, "4-200-10" => 187,//江苏 10
         "4-30-15" => 28.5, "4-50-15" => 47.5, "4-100-15" => 95, "4-200-15" => 190,//山东 15
         "4-30-13" => 27.78, "4-50-13" => 46.3, "4-100-13" => 92.6, "4-200-13" => 185.2,//福建 13
         "4-30-25" => 27.96, "4-50-25" => 46.6, "4-100-25" => 93.2, "4-200-25" => 186.4,//云南 25
         "4-30-16" => 28.05, "4-50-16" => 46.75, "4-100-16" => 93.5, "4-200-16" => 187,//河南 16
+        "4-30-11" => 28.38, "4-50-11" => 47.3, "4-100-11" => 94.6, "4-200-11" => 189.2,//浙江 11
         "4-50-19" => 47.35, "4-100-19" => 94.7, "4-200-19" => 189.4,//广东 19
 
         //电信

helper/refill/api/yl/weixue/config.php

@@ -44,5 +44,12 @@ class config
                 300 => '101709',
                 500 => '101710'
             ],
+        mtopcard\ChinaTelecomCard =>
+            [
+                30  => '101723',
+                50  => '101724',
+                100 => '101725',
+                200 => '101726',
+            ],
     ];
 }