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

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

@@ -72,7 +72,7 @@ class config
         "4-10-13" => 9.965, "4-20-13" => 19.93, "4-30-13" => 29.895, "4-50-13" => 49.825, "4-100-13" => 99.65, "4-200-13" => 199.3, "4-300-13" => 298.95, "4-500-13" => 498.25,//福建 13
         "4-10-5" => 10.26, "4-20-5" => 20.52, "4-30-5" => 30.78, "4-50-5" => 50.8, "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" => 10.37, "4-20-19" => 20.74, "4-30-19" => 31.11, "4-50-19" => 50.625, "4-100-19" => 101.25, "4-200-19" => 202.5, "4-300-19" => 303.75, "4-500-19" => 506.25,//广东 19
+        "4-10-19" => 10.37, "4-20-19" => 20.74, "4-30-19" => 31.11, "4-50-19" => 50.5, "4-100-19" => 101, "4-200-19" => 202, "4-300-19" => 303, "4-500-19" => 505,//广东 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.6, "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/canbin_fs/API.MD

@@ -77,4 +77,12 @@
 湖北电信50元    编码 3420050   折扣95
 湖北电信100元   编码 3420100   折扣95
 湖北电信200元   编码 3420200   折扣95
+
+广西电信200元    3450200
+广西电信100元    3450100
+广西电信50元    3450050
+
+云南电信200元    3530200
+云南电信100元    3530100
+云南电信50元    3530050
 ```

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

@@ -117,6 +117,18 @@ class config
                 100 => 3420100,
                 200 => 3420200,
             ],
+            //广西
+            20 => [
+                50  => 3450050,
+                100 => 3450100,
+                200 => 3450200,
+            ],
+            //云南
+            25 => [
+                50  => 3530050,
+                100 => 3530100,
+                200 => 3530200,
+            ],
         ]
     ];
 
@@ -139,5 +151,7 @@ class config
         "6-50-13" => 47.5, "6-100-13" => 95, "6-200-13" => 190, //福建
         "6-50-23" => 47.5, "6-100-23" => 95, "6-200-23" => 190, //四川
         "6-50-17" => 47.5, "6-100-17" => 95, "6-200-17" => 190, //湖北
+        "6-50-20" => 47.5, "6-100-20" => 95, "6-200-20" => 190, //广西
+        "6-50-25" => 47.5, "6-100-25" => 95, "6-200-25" => 190, //云南
     ];
 }

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

@@ -72,7 +72,7 @@ class config
         "4-10-13" => 9.965, "4-20-13" => 19.93, "4-30-13" => 29.895, "4-50-13" => 49.825, "4-100-13" => 99.65, "4-200-13" => 199.3, "4-300-13" => 298.95, "4-500-13" => 498.25,//福建 13
         "4-10-5" => 10.26, "4-20-5" => 20.52, "4-30-5" => 30.78, "4-50-5" => 50.8, "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" => 10.37, "4-20-19" => 20.74, "4-30-19" => 31.11, "4-50-19" => 50.625, "4-100-19" => 101.25, "4-200-19" => 202.5, "4-300-19" => 303.75, "4-500-19" => 506.25,//广东 19
+        "4-10-19" => 10.37, "4-20-19" => 20.74, "4-30-19" => 31.11, "4-50-19" => 50.5, "4-100-19" => 101, "4-200-19" => 202, "4-300-19" => 303, "4-500-19" => 505,//广东 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.6, "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/lihui_fs/API.MD

@@ -25,6 +25,11 @@
 编码：1610100 面值100 折扣95
 编码：1610200 面值200 折扣95
 
+江苏移动
+50  编码 1320050     折扣95
+100 编码 1320100     折扣95
+200 编码 1320200     折扣95
+
 广东电信
 编码：3440050 面值50 折扣95
 编码：3440100 面值100 折扣95
@@ -49,4 +54,17 @@
 50编码  3360050 折扣95
 100编码 3360100 折扣95
 200编码 3360200 折扣9
+
+四川电信200元		3510200
+四川电信100元		3510100
+四川电信50元  		3510050
+
+福建电信200元		3350200
+福建电信100元		3350100
+福建电信50元  		3350050
+
+江苏电信
+50  编码 3320050    折扣95
+100 编码 3320100    折扣95
+200 编码 3320200    折扣95
 ```

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

@@ -39,6 +39,12 @@ class config
                 100 => 1350100,
                 200 => 1350200,
             ],
+            //江苏
+            10 => [
+                50  => 1320050,
+                100 => 1320100,
+                200 => 1320200,
+            ],
         ],
         mtopcard\ChinaTelecomCard => [
             //广东
@@ -71,6 +77,24 @@ class config
                 100 => 3360100,
                 200 => 3360200,
             ],
+            //四川
+            23 => [
+                50  => 3510050,
+                100 => 3510100,
+                200 => 3510200,
+            ],
+            //福建
+            13 => [
+                50  => 3350050,
+                100 => 3350100,
+                200 => 3350200,
+            ],
+            //江苏
+            10 => [
+                50  => 3320050,
+                100 => 3320100,
+                200 => 3320200,
+            ],
         ],
     ];
 
@@ -79,6 +103,7 @@ class config
         //移动
         "4-50-27" => 47.5, "4-100-27" => 95, "4-200-27" => 190, //陕西
         "4-50-13" => 47.5, "4-100-13" => 95, "4-200-13" => 190, //福建
+        "4-50-10" => 47.5, "4-100-10" => 95, "4-200-10" => 190, //江苏
 
         //电信
         "6-50-19" => 47.5, "6-100-19" => 95, "6-200-19" => 190, //广东
@@ -86,6 +111,9 @@ class config
         "6-50-2" => 47.5, "6-100-2" => 95, "6-200-2" => 190, //天津
         "6-50-28" => 47.5, "6-100-28" => 95, "6-200-28" => 190, //甘肃
         "6-50-14" => 47.5, "6-100-14" => 95, "6-200-14" => 190, //江西
+        "6-50-23" => 47.5, "6-100-23" => 95, "6-200-23" => 190, //四川
+        "6-50-13" => 47.5, "6-100-13" => 95, "6-200-13" => 190, //福建
+        "6-50-10" => 47.5, "6-100-10" => 95, "6-200-10" => 190, //江苏
     ];
 
 }

mchsrv/control/merchant_order.php

@@ -200,6 +200,37 @@ class merchant_orderControl extends mbMerchantControl
         return self::outsuccess($result);
     }
 
+    public function interceptOp()
+    {
+        $mchid = $this->mchid();
+        $mch_order = $_GET['order_sn'];
+
+        if(empty($mch_order)) {
+            return self::outerr(205,"客户订单号为空.");
+        }
+
+        $mod_refill = Model('refill_order');
+        $order = $mod_refill->get_detail($mchid,$mch_order);
+
+        if(empty($order)) {
+            return self::outerr(205,"该订单号不存在.");
+        }
+
+        $order_state = $order['order_state'];
+        if($order_state === ORDER_STATE_HANDLED) {
+            return self::outerr(206,"该订单已经完成.");
+        }
+
+        $order_state = refill\util::query_queue_order($mchid,$mch_order);
+        if ($order_state == ORDER_STATE_TIMEOUT || $order_state == ORDER_STATE_HANDLED) {
+            Log::record("intercept timeout order mchid=$mchid mch_order=$mch_order order_state=$order_state" ,Log::DEBUG);
+            return self::outerr(206,"该订单已经完成.");
+        }
+
+        refill\util::set_cancel_order($mchid,$mch_order);
+        return self::outsuccess([]);
+    }
+
     private function merchant_order_format($orders)
     {
         $data = [];