fly 5 роки тому
батько
коміт
c818f6c9e7

+ 1 - 1
app/Http/Controllers/Wap/Pay/OrdersController.php

@@ -617,7 +617,7 @@ class OrdersController extends Controller
         if ($pay_merchant->config_info) {
             $config = json_decode($pay_merchant->config_info, true);
         }
-        $wechatPay = WechatPay::Union($config);
+        $wechatPay = WechatPay::Union($pay_merchant->source,$config);
         if (!$wechatPay) return response()->error('WAP_PARAM_ERROR');
         $trade_no = $wechatPay->generateTradeNo();
 

+ 5 - 3
app/Libs/Pay/WechatPay.php

@@ -14,8 +14,8 @@ use App\Libs\Pay\Merchants\SmkPay;
 use App\Libs\Pay\Merchants\UnionPay;
 
 /**
- * @method \App\Libs\Pay\Merchants\UnionPay Union(array $config)
- * @method \App\Libs\Pay\Merchants\Official Official(array $config)
+ * @method \App\Libs\Pay\Merchants\UnionPay Union(array $data)
+ * @method \App\Libs\Pay\Merchants\Official Official(array $data)
  */
 class WechatPay
 {
@@ -68,6 +68,8 @@ class WechatPay
 	 */
 	public static function __callStatic($name, $arguments)
 	{
-		return self::instance($name, ...$arguments);
+		$merchant = $arguments[0];
+		$config = $arguments[1];
+		return self::instance($merchant, $config);
 	}
 }