dev

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

@@ -23,7 +23,7 @@ class RefillCallBack implements refill\IRefillCallBack
         $key = config::KEY;
         $content = "userid={$userid}&orderid={$params['orderid']}&sporderid={$params['sporderid']}&merchantsubmittime={$params['merchantsubmittime']}";
         $content .= "&resultno={$params['resultno']}&key={$key}";
-        return md5($content);
+        return strtoupper(md5($content));
     }
 
     public function notify($params): array
@@ -37,11 +37,13 @@ class RefillCallBack implements refill\IRefillCallBack
 
         $order_id = $order_info['order_id'];
         if ($status === 1) {
-            $official_sn = strtolower($params['remark1']) == 'null' ? '' : $params['remark1'];
-            $data['official_sn'] = $official_sn;
-            Model('refill_order')->edit($order_id, $data);
+            $official_sn = $params['remark1'] ?? '';
+            $ch_trade_no = $params['orderid'] ?? '';
+            Model('refill_order')->edit($order_id, ['official_sn' => $official_sn, 'ch_trade_no' => $ch_trade_no]);
             return [$order_id, true, false, true, $official_sn];
         } elseif ($status === 9) {
+            $ch_trade_no = $params['orderid'] ?? '';
+            Model('refill_order')->edit($order_id, ['ch_trade_no' => $ch_trade_no]);
             return [$order_id, false, true, true, ''];
         } else {
             return [$order_id, false, false, false, ''];

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

@@ -90,14 +90,15 @@ class RefillPhone extends refill\IRefillPhone
             }
             else
             {
-                $official_sn = !empty($resp['remark1']) ? $resp['remark1'] : '';
+                $official_sn = $resp['remark1'] ?? '';
+                $ch_trade_no = $resp['orderid'] ?? '';
 
                 $resultno = $resp['resultno'];
                 if ($resultno === '1') {
-                    $updata['official_sn'] = $official_sn;
-                    Model('refill_order')->edit($refill_info['order_id'], $updata);
+                    Model('refill_order')->edit($refill_info['order_id'], ['official_sn' => $official_sn,'ch_trade_no' => $ch_trade_no]);
                     $order_state = ORDER_STATE_SUCCESS;
                 } elseif ($resultno === '9') {
+                    Model('refill_order')->edit($refill_info['order_id'], ['ch_trade_no' => $ch_trade_no]);
                     $order_state = ORDER_STATE_CANCEL;
                 } elseif ($resultno === '5007' && (time() - $refill_info['commit_time'] > 600)) {
                     $order_state = ORDER_STATE_NOEXIST;

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

@@ -57,11 +57,11 @@ class RefillPhone extends refill\IRefillPhone
                 return [false, $resultno, false];
             } elseif ($resultno === '9999' || $resultno === '5006') {
                 $net_errno = "HTTP-{$resultno}";
-                return [false, $net_errno, true];
+                return [false, $resultno, true];
             } else {
                 $err = 998;
                 $net_errno = "HTTP-{$err}";
-                return [false, $net_errno, true];
+                return [false, $resultno, true];
             }
         }
     }

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

@@ -76,7 +76,7 @@ class RefillPhone extends refill\IRefillPhone
                 return [false, $resultno, false];
             } elseif ($resultno === '9999' || $resultno === '5006') {
                 $net_errno = "HTTP-{$resultno}";
-                return [false, $net_errno, true];
+                return [false, $resultno, true];
             } else {
                 $err = 998;
                 $net_errno = "HTTP-{$err}";