fly 5 년 전
부모
커밋
e8be997fdd
2개의 변경된 파일1개의 추가작업 그리고 4개의 파일을 삭제
  1. 0 3
      app/Http/Controllers/Wap/Pay/OrdersController.php
  2. 1 1
      app/Libs/Pay/Merchants/UnionPay.php

+ 0 - 3
app/Http/Controllers/Wap/Pay/OrdersController.php

@@ -748,9 +748,6 @@ class OrdersController extends Controller
             );
         }
         $de_pay_redirect_url = urldecode($pay_redirect_url);
-        /*if ($request->has('cid')) {
-            $de_pay_redirect_url = $de_pay_redirect_url . '&cid=' . $request->get('cid');
-        }*/
 
         $pay_url_info = parse_url($de_pay_redirect_url);
         $data['pay_wait_url'] = $pay_url_info['scheme'] . '://' . $pay_url_info['host'] . '/pay/waitv2?order=' . $data['trade_no'] . '&redirect=' . urlencode($de_pay_redirect_url);

+ 1 - 1
app/Libs/Pay/Merchants/UnionPay.php

@@ -59,7 +59,7 @@ class UnionPay implements PayMerchantInterface
             'notifyUrl' => env('UNIONPAY_NOFITY_URL'),
             'returnUrl' => urlencode($data['pay_wait_url']),
             'totalAmount' => $data['price'],
-            'merOrderId' => $this->msgSrcId . $data['trade_no'],
+            'merOrderId' => $data['trade_no'],
         ];
         $result['sign'] = $this->makeSign($result);
         $query_params = http_build_query($result);