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

* 'raccount' of 39.97.239.116:gyfl/xyzshop:
  jike add offical_sn
  xyz yl guochuang 内蒙古移动调价函

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

@@ -70,7 +70,7 @@ class config
         "4-10-29" => 9.76, "4-20-29" => 19.52, "4-30-29" => 29.28, "4-50-29" => 48.8, "4-100-29" => 97.6, "4-200-29" => 195.2, "4-300-29" => 292.8, "4-500-29" => 488,//青海 29
         "4-10-28" => 9.985, "4-20-28" => 19.97, "4-30-28" => 29.955, "4-50-28" => 49.925, "4-100-28" => 99.85, "4-200-28" => 199.7, "4-300-28" => 299.55, "4-500-28" => 499.25,//甘肃 28
         "4-10-13" => 10.22, "4-20-13" => 19.94, "4-30-13" => 29.91, "4-50-13" => 49.85, "4-100-13" => 99.7, "4-200-13" => 199.4, "4-300-13" => 300.9, "4-500-13" => 501.5,//福建 13
-        "4-10-5" => 9.99, "4-20-5" => 19.98, "4-30-5" => 29.97, "4-50-5" => 49.95, "4-100-5" => 99.9, "4-200-5" => 200.4, "4-300-5" => 300.6, "4-500-5" => 501,//内蒙古 5
+        "4-10-5" => 10, "4-20-5" => 20, "4-30-5" => 30, "4-50-5" => 50, "4-100-5" => 100, "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.895, "4-50-19" => 49.825, "4-100-19" => 99.65, "4-200-19" => 199.3, "4-300-19" => 298.95, "4-500-19" => 498.25,//广东 19
         "4-10-7" => 9.82, "4-20-7" => 19.64, "4-30-7" => 29.46, "4-50-7" => 49.1, "4-100-7" => 98.2, "4-200-7" => 196.4, "4-300-7" => 294.6, "4-500-7" => 491,//吉林 7

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

@@ -62,8 +62,11 @@ class RefillCallBack implements refill\IRefillCallBack
 
         $order_id = $order_info['order_id'];
         $status = intval($params['status']);
-        Model('refill_order')->edit($order_id, ['ch_trade_no' => $params['orderNo']]);
+        $updata['ch_trade_no'] = $params['orderNo'];
+        Model('refill_order')->edit($order_id, $updata);
         if ($status === 1) {
+            $updata['official_sn'] = strtolower($params['officialNo']) == 'null' ? '' : $params['officialNo'];
+            Model('refill_order')->edit($order_id, $updata);
             return [$order_id, true, false, true];
         } elseif ($status === 2 || $status === 3) {
             return [$order_id, false, true, true];

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

@@ -77,6 +77,8 @@ class RefillPhone extends refill\IRefillPhone
                 $updata['ch_trade_no'] = $resp['orderNo'];
                 Model('refill_order')->edit($refill_info['order_id'], $updata);
                 if ($status === 1) {
+                    $updata['official_sn'] = $resp['officialNo'];
+                    Model('refill_order')->edit($refill_info['order_id'], $updata);
                     $order_state = ORDER_STATE_SUCCESS;
                 } elseif ($status === 2 || $status === 3) {
                     $order_state = ORDER_STATE_CANCEL;

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

@@ -70,7 +70,7 @@ class config
         "4-10-29" => 9.76, "4-20-29" => 19.52, "4-30-29" => 29.28, "4-50-29" => 48.8, "4-100-29" => 97.6, "4-200-29" => 195.2, "4-300-29" => 292.8, "4-500-29" => 488,//青海 29
         "4-10-28" => 9.985, "4-20-28" => 19.97, "4-30-28" => 29.955, "4-50-28" => 49.925, "4-100-28" => 99.85, "4-200-28" => 199.7, "4-300-28" => 299.55, "4-500-28" => 499.25,//甘肃 28
         "4-10-13" => 10.22, "4-20-13" => 19.94, "4-30-13" => 29.91, "4-50-13" => 49.85, "4-100-13" => 99.7, "4-200-13" => 199.4, "4-300-13" => 300.9, "4-500-13" => 501.5,//福建 13
-        "4-10-5" => 9.99, "4-20-5" => 19.98, "4-30-5" => 29.97, "4-50-5" => 49.95, "4-100-5" => 99.9, "4-200-5" => 200.4, "4-300-5" => 300.6, "4-500-5" => 501,//内蒙古 5
+        "4-10-5" => 10, "4-20-5" => 20, "4-30-5" => 30, "4-50-5" => 50, "4-100-5" => 100, "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.895, "4-50-19" => 49.825, "4-100-19" => 99.65, "4-200-19" => 199.3, "4-300-19" => 298.95, "4-500-19" => 498.25,//广东 19
         "4-10-7" => 9.82, "4-20-7" => 19.64, "4-30-7" => 29.46, "4-50-7" => 49.1, "4-100-7" => 98.2, "4-200-7" => 196.4, "4-300-7" => 294.6, "4-500-7" => 491,//吉林 7

helper/refill/api/yl/jike/RefillCallBack.php

@@ -62,8 +62,11 @@ class RefillCallBack implements refill\IRefillCallBack
 
         $order_id = $order_info['order_id'];
         $status = intval($params['status']);
-        Model('refill_order')->edit($order_id, ['ch_trade_no' => $params['orderNo']]);
+        $updata['ch_trade_no'] = $params['orderNo'];
+        Model('refill_order')->edit($order_id, $updata);
         if ($status === 1) {
+            $updata['official_sn'] = strtolower($params['officialNo']) == 'null' ? '' : $params['officialNo'];
+            Model('refill_order')->edit($order_id, $updata);
             return [$order_id, true, false, true];
         } elseif ($status === 2 || $status === 3) {
             return [$order_id, false, true, true];

helper/refill/api/yl/jike/RefillPhone.php

@@ -77,6 +77,8 @@ class RefillPhone extends refill\IRefillPhone
                 $updata['ch_trade_no'] = $resp['orderNo'];
                 Model('refill_order')->edit($refill_info['order_id'], $updata);
                 if ($status === 1) {
+                    $updata['official_sn'] = $resp['officialNo'];
+                    Model('refill_order')->edit($refill_info['order_id'], $updata);
                     $order_state = ORDER_STATE_SUCCESS;
                 } elseif ($status === 2 || $status === 3) {
                     $order_state = ORDER_STATE_CANCEL;