Browse Source

修正 部分语法,放宽对易支付支付框架的局限性

兔姬桑 4 năm trước cách đây
mục cha
commit
3f42ecfcae

+ 1 - 1
app/Http/Controllers/Gateway/CodePay.php

@@ -40,7 +40,7 @@ class CodePay extends AbstractPayment
                 exit('success');
             }
         } else {
-            Log::info('码支付:交易失败');
+            Log::error('码支付:交易失败');
         }
         exit('fail');
     }

+ 2 - 2
app/Http/Controllers/Gateway/EPay.php

@@ -36,12 +36,12 @@ class EPay extends AbstractPayment
     public function notify(Request $request): void
     {
         if ($request->input('trade_status') === 'TRADE_SUCCESS' && $request->has('out_trade_no')
-            && $this->verify($request->except('method'), sysConfig('epay_key'), $request->input('sign'))) {
+            && $this->verify($request->all(), sysConfig('epay_key'), $request->input('sign'))) {
             if ($this->paymentReceived($request->input('out_trade_no'))) {
                 exit('SUCCESS');
             }
         } else {
-            Log::info('易支付:交易失败');
+            Log::error('易支付:交易失败');
         }
         exit('FAIL');
     }

+ 13 - 15
app/Http/Controllers/PaymentController.php

@@ -27,14 +27,12 @@ class PaymentController extends Controller
 {
     private static $method;
 
-    public static function notify(Request $request): int
+    public static function notify(Request $request): void
     {
-        self::$method = $request->input('method');
+        self::$method = $request->query('method');
 
         Log::info(self::$method.'回调接口[POST]:'.self::$method.var_export($request->all(), true));
         self::getClient()->notify($request);
-
-        return 0;
     }
 
     public static function getClient()
@@ -163,14 +161,14 @@ class PaymentController extends Controller
         // 生成订单
         try {
             $newOrder = Order::create([
-                'sn' => date('ymdHis').random_int(100000, 999999),
-                'user_id' => auth()->id(),
-                'goods_id' => $credit ? null : $goods_id,
-                'coupon_id' => $coupon->id ?? null,
+                'sn'            => date('ymdHis').random_int(100000, 999999),
+                'user_id'       => auth()->id(),
+                'goods_id'      => $credit ? null : $goods_id,
+                'coupon_id'     => $coupon->id ?? null,
                 'origin_amount' => $credit ?: $goods->price ?? 0,
-                'amount'=>$amount,
-                'pay_type'=>$pay_type,
-                'pay_way'=>self::$method,
+                'amount'        => $amount,
+                'pay_type'      => $pay_type,
+                'pay_way'       => self::$method,
             ]);
 
             // 使用优惠券,减少可使用次数
@@ -209,10 +207,10 @@ class PaymentController extends Controller
         $goods = $payment->order->goods;
 
         return view('user.payment', [
-            'payment' => $payment,
-            'name' => $goods->name ?? trans('user.recharge_credit'),
-            'days' => $goods->days ?? 0,
-            'pay_type' => $payment->order->pay_type_label ?: 0,
+            'payment'       => $payment,
+            'name'          => $goods->name ?? trans('user.recharge_credit'),
+            'days'          => $goods->days ?? 0,
+            'pay_type'      => $payment->order->pay_type_label ?: 0,
             'pay_type_icon' => $payment->order->pay_type_icon,
         ]);
     }

+ 3 - 3
resources/views/admin/config/system.blade.php

@@ -1632,7 +1632,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="tab-pane" id="paybeaver" role="tabpanel">
+                                <div class="tab-pane" id="PayBeaver" role="tabpanel">
                                     <div class="row">
                                         <div class="form-group col-lg-6 d-flex">
                                             <label class="col-md-3 col-form-label">海狸支付 PayBeaver</label>
@@ -1695,7 +1695,7 @@
                                     <a class="nav-link" data-toggle="tab" href="#Stripe" aria-controls="Stripe" role="tab">Stripe</a>
                                 </li>
                                 <li class="nav-item">
-                                    <a class="nav-link" data-toggle="tab" href="#paybeaver" aria-controls="PayBeaver" role="tab">PayBeaver</a>
+                                    <a class="nav-link" data-toggle="tab" href="#PayBeaver" aria-controls="PayBeaver" role="tab">PayBeaver</a>
                                 </li>
                                 <li class="nav-item dropdown" style="display: none;">
                                     <a class="dropdown-toggle nav-link" data-toggle="dropdown" href="#" aria-expanded="false" aria-haspopup="true">菜单</a>
@@ -1708,7 +1708,7 @@
                                         <a class="dropdown-item" data-toggle="tab" href="#MugglePay" aria-controls="MugglePay" role="tab">MugglePay</a>
                                         <a class="dropdown-item" data-toggle="tab" href="#PayPal" aria-controls="PayPal" role="tab">PayPal</a>
                                         <a class="dropdown-item" data-toggle="tab" href="#Stripe" aria-controls="Stripe" role="tab">Stripe</a>
-                                        <a class="dropdown-item" data-toggle="tab" href="#paybeaver" aria-controls="PayBeaver" role="tab">PayBeaver</a>
+                                        <a class="dropdown-item" data-toggle="tab" href="#PayBeaver" aria-controls="PayBeaver" role="tab">PayBeaver</a>
                                     </div>
                                 </li>
                             </ul>