fly 5 năm trước cách đây
mục cha
commit
0fe8251380

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

@@ -2519,25 +2519,4 @@ class OrdersController extends Controller
             } catch (\Exception $e) { }
         }
     }
-
-    public function query()
-    {
-        $pay_merchant = PayMerchant::find(48);
-        $instance = WechatPay::Union($pay_merchant->source, json_decode($pay_merchant->config_info, true));
-        if ($instance->query('319420190918172727164500482012')) {
-            \Log::info('success');
-        }
-    }
-    public function refund()
-    {
-        $pay_merchant = PayMerchant::find(48);
-        $instance = WechatPay::Union($pay_merchant->source, json_decode($pay_merchant->config_info, true));
-        $data = [
-            'trade_no' => '319420190919162150164509128944',
-            'price' => 1
-        ];
-        if ($instance->refund($data)) {
-            \Log::info('success');
-        }
-    }
 }

+ 0 - 2
app/Http/Routes/Wap/WapRoutes.php

@@ -19,8 +19,6 @@ Route::group(['domain'=>env('PAY_WAP_DOMAIN'),'namespace'=>'App\Http\Controllers
     Route::any('pay/wcback_smkpay','Pay\OrdersController@wcback_smkpay');
     Route::any('pay/wcback_union','Pay\OrdersController@wcback_union');
     Route::post('pay/reportError','Pay\OrdersController@reportError');
-    Route::any('pay/query','Pay\OrdersController@query');
-    Route::any('pay/refund','Pay\OrdersController@refund');
     //包月
     Route::get('monthpay/getRedirectUrl','Pay\getH5RedirectUrl@getRedirectUrl');
     Route::get('monthpay/getH5RedirectUrl','Pay\MonthOrderController@getH5RedirectUrl');

+ 10 - 3
app/Libs/Pay/Merchants/UnionPay.php

@@ -67,7 +67,10 @@ class UnionPay implements PayMerchantInterface
             'merOrderId' => $trade_no,
         ];
         $result = $this->request($query_params);
-        if ($result->errCode === 'SUCCESS' && $result->status === 'TRADE_SUCCESS') {
+        if (
+            isset($result->errCode) && $result->errCode === 'SUCCESS' &&
+            isset($result->status) && $result->status === 'TRADE_SUCCESS'
+        ) {
             return true;
         } else {
             \Log::info('union_pay.query: ');
@@ -78,7 +81,7 @@ class UnionPay implements PayMerchantInterface
 
     public function notify(array $data)
     {
-        if ($data['status'] === 'TRADE_SUCCESS') {
+        if (isset($data['status']) && $data['status'] === 'TRADE_SUCCESS') {
             $sign = $this->makeSign($data);
             if ($sign === $data['sign']) {
                 return true;
@@ -102,7 +105,11 @@ class UnionPay implements PayMerchantInterface
             'refundAmount' => $data['price'],
         ];
         $result = $this->request($refund_params);
-        if ($result->errCode === 'SUCCESS' && $result->refundStatus === 'SUCCESS' && $result->status === 'TRADE_SUCCESS') {
+        if (
+            isset($result->errCode) && $result->errCode === 'SUCCESS' &&
+            isset($result->refundStatus) && $result->refundStatus === 'SUCCESS' &&
+            isset($result->status) && $result->status === 'TRADE_SUCCESS'
+        ) {
             return true;
         } else {
             \Log::info('union_pay.refund: ');