dongyefs official_sn add trim_prefix

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

@@ -36,7 +36,8 @@ class RefillCallBack implements refill\IRefillCallBack
 
         $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'];
+            $data['official_sn'] = config::trim_prefix($official_sn);
             Model('refill_order')->edit($order_id, $data);
             return [$order_id, true, false, true];
         } elseif ($status === 9) {

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

@@ -112,7 +112,7 @@ class RefillPhone extends refill\IRefillPhone
             {
                 $resultno = $resp['resultno'];
                 if ($resultno === '1') {
-                    $updata['official_sn'] = $resp['remark1'];
+                    $updata['official_sn'] = config::trim_prefix($resp['remark1']);
                     Model('refill_order')->edit($refill_info['order_id'], $updata);
                     $order_state = ORDER_STATE_SUCCESS;
                 } elseif ($resultno === '9') {

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

@@ -20,6 +20,17 @@ class config
         '5001','5002','5003','5004','5005','5008','5009','5010','5011','5012'
     ];
     const ExtHeaders = ['Content-Type:application/x-www-form-urlencoded;'];
+
+    public static function trim_prefix($official_sn){
+        $prefix = 'ydkc';
+        $length = strlen($prefix);
+
+        if ((substr($official_sn, 0, $length) === $prefix)) {
+            $official_sn = substr($official_sn, $length);
+        }
+        return $official_sn;
+    }
+
     const product_id = [
         mtopcard\ChinaMobileCard => [
             6 => [

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

@@ -29,14 +29,15 @@ class RefillCallBack implements refill\IRefillCallBack
     {
         $status = intval($params['resultno']);
         $order_sn = $params['sporderid'];
-        $order_info = Model('vr_order')->getOrderInfo(['order_sn' => $order_sn]);
+        $order_info = Model('vr_order')->getOrderInfoForNotify(['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['remark1']) == 'null' ? '' : $params['remark1'];
+            $official_sn = strtolower($params['remark1']) == 'null' ? '' : $params['remark1'];
+            $data['official_sn'] = config::trim_prefix($official_sn);
             Model('refill_order')->edit($order_id, $data);
             return [$order_id, true, false, true];
         } elseif ($status === 9) {

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

@@ -112,7 +112,7 @@ class RefillPhone extends refill\IRefillPhone
             {
                 $resultno = $resp['resultno'];
                 if ($resultno === '1') {
-                    $updata['official_sn'] = $resp['remark1'];
+                    $updata['official_sn'] = config::trim_prefix($resp['remark1']);
                     Model('refill_order')->edit($refill_info['order_id'], $updata);
                     $order_state = ORDER_STATE_SUCCESS;
                 } elseif ($resultno === '9') {

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

@@ -20,6 +20,17 @@ class config
         '5001','5002','5003','5004','5005','5008','5009','5010','5011','5012'
     ];
     const ExtHeaders = ['Content-Type:application/x-www-form-urlencoded;'];
+
+    public static function trim_prefix($official_sn){
+        $prefix = 'ydkc';
+        $length = strlen($prefix);
+
+        if ((substr($official_sn, 0, $length) === $prefix)) {
+            $official_sn = substr($official_sn, $length);
+        }
+        return $official_sn;
+    }
+
     const product_id = [
         mtopcard\ChinaMobileCard => [
             6 => [