root 7 лет назад
Родитель
Сommit
73c482d32b

+ 3 - 1
app/Components/Trimepay.php

@@ -1,4 +1,6 @@
 <?php
+namespace App\Components;
+
 class Trimepay {
     private $appId;
     private $appSecret;
@@ -75,7 +77,7 @@ class Trimepay {
             'payType' => $type
         ];
         $signData = $this->prepareSign($payData);
-        $payData['sign'] = $trimepay->sign($signData);
+        $payData['sign'] = $this->sign($signData);
         $response = $this->post($payData);
         return $response;
     }

+ 4 - 4
app/Http/Controllers/Api/TrimepayController.php

@@ -42,14 +42,14 @@ class TrimepayController extends Controller
         \Log::info("【Trimepay】回调接口[POST]:" . var_export($request->all(), true));
 
         $json = file_get_contents('php://input');
-        $data = json_decode($json, true);
+        parse_str($json, $data);
         if (!$data) {
             Log::info('Trimepay-POST:回调数据无法解析,可能是非法请求[' . getClientIp() . ']');
             exit();
         }
 
         // 判断消息是否合法
-        $trimepay = new Trimepay($systemConfig['trimepay_appid'], $systemConfig['trimepay_appsecret']);
+        $trimepay = new Trimepay(self::$systemConfig['trimepay_appid'], self::$systemConfig['trimepay_appsecret']);
         $cbData	= [
             'payStatus' 				=> $data['payStatus'],
             'payFee'					=> $data['payFee'],
@@ -64,11 +64,11 @@ class TrimepayController extends Controller
             Log::info('Trimepay-POST:回调数据签名错误,可能是非法请求[' . getClientIp() . ']');
             exit();
         } else {
-            exit('SUCCESS');
+            var_dump('SUCCESS');
         }
         
         switch ($data['payStatus']) {
-            case '1':
+            case 'SUCCESS':
                 $this->tradePaid($data);
                 break;
             default:

+ 2 - 2
app/Http/Controllers/PaymentController.php

@@ -146,7 +146,7 @@ class PaymentController extends Controller
                 }
             }else if(self::$systemConfig['is_trimepay']){
                 $trimepay = new Trimepay(self::$systemConfig['trimepay_appid'], self::$systemConfig['trimepay_appsecret']);
-                $result = $trimepay->pay('WEPAY_QR', $orderSn, $amount);
+                $result = $trimepay->pay('WEPAY_QR', $orderSn, $amount, self::$systemConfig['website_url'].'/api/trimepay', self::$systemConfig['website_url']);
                 if ($result['code']!==0) {
                     Log::error('【Trimepay】创建二维码失败:' . $result['msg']);
 
@@ -169,7 +169,7 @@ class PaymentController extends Controller
             }else if(self::$systemConfig['is_trimepay']){
                 $payment->qr_url = $result['data'];
                 $payment->qr_code = 'https://www.zhihu.com/qrcode?url='.$result['data'];
-                $payment->qr_local_url = $this->base64ImageSaver($result['data']);
+                $payment->qr_local_url = 'https://www.zhihu.com/qrcode?url='.$result['data'];
             }
             $payment->status = 0;
             $payment->save();

+ 0 - 0
storage/ipip.ipdb