Mike пре 7 година
родитељ
комит
8aa9289af8

+ 3 - 3
server/app/Helper/PayHelper.php

xqd xqd xqd
@@ -72,7 +72,7 @@ trait PayHelper
         $data['code'] = 'ALIPAY_' . $data['transaction_id'];
         $data['price'] = 1;
         $data['amount'] = $data['number'] * $data['price']*100;
-        $data['pay_type'] = Order::PAY_TYPE_ALIPAY;
+        $data['pay_type'] = OrderInfoModel::PAY_TYPE_ALIPAY;
 
         $request = $gateway->purchase();
         $request->setBizContent([
@@ -135,7 +135,7 @@ trait PayHelper
         $gateway->setApiKey($config['options']['apikey']);
         $gateway->setNotifyUrl($config['options']['notify_url']);
 
-        $goodsTypes = Order::getAllGoodsTypes();
+        $goodsTypes = OrderInfoModel::getAllGoodsTypes();
         if (!isset($data['subject'])) {
             $data['subject'] = sprintf("甲象联合%s充值%d", $goodsTypes[$data['goods']], $data['number']);
         }
@@ -146,7 +146,7 @@ trait PayHelper
         $data['code'] = 'WECHATPAY_' . $data['transaction_id'];
         $data['price'] = 1;
         $data['amount'] = $data['number'] * $data['price'];
-        $data['pay_type'] = Order::PAY_TYPE_WECHATPAY;
+        $data['pay_type'] = OrderInfoModel::PAY_TYPE_WECHATPAY;
 
         $order = [
             'body'              => $data['subject'],

+ 1 - 1
server/app/Http/Controllers/Api/V1/PayController.php

xqd
@@ -318,7 +318,7 @@ class PayController extends Controller
 
         $data['user_type'] = OrderInfoModel::USER_TYPE_USER;
         $data['user_id'] = $user->id;
-        if ($data['type'] == Order::PAY_TYPE_ALIPAY) {
+        if ($data['type'] == OrderInfoModel::PAY_TYPE_ALIPAY) {
             $result = $this->createAlipayCharge($data);
         } else {
             $result = $this->createWechatpayCharge($data);