onlinetest il y a 5 ans
Parent
commit
560600c9a2

+ 0 - 1
app/Http/Controllers/QuickApp/BaseController.php

@@ -24,7 +24,6 @@ class BaseController extends Controller
     {
 
         if (!isset($this->field[$name])) {
-            // QappUserService::setGolableUserStatic(env('QUICKAPP_TEST_UID',162261523));
             $qapp_user = QappUserService::getGolableUserStatic();
             if ($name == 'user_info') {
                 $this->field[$name] = $qapp_user->user;

+ 0 - 1
app/Libs/AliApp/aop/AopClient.php

@@ -2,7 +2,6 @@
 
 require_once 'AopEncrypt.php';
 require_once 'SignData.php';
-use AopEncrypt;
 
 class AopClient {
 	//应用ID

+ 1 - 1
app/Modules/Trade/Pay/AliOrderArousePay.php

@@ -25,7 +25,7 @@ class AliOrderArousePay extends OrderArousePayAbstract
             $result = $pay->send($ali_param);
             return $result;
         } catch (Exception $e) {
-            Log::error("创建支付宝订单失败," . $e->getMessage());
+            Log::error("创建支付宝订单失败: " . $e->getTraceAsString());
         }
     }
 }

+ 1 - 1
app/Modules/Trade/Pay/OrderArousePayAbstract.php

@@ -32,7 +32,7 @@ abstract class OrderArousePayAbstract
             'product_id' => $data['product_id'],
             'distribution_channel_id' => $data['distribution_channel_id'],
             'trade_no' => $data['trade_no'],
-            'pay_merchant_id' =>  $data['pay_merchant_id'],
+            'pay_merchant_id' => isset($data['pay_merchant_id']) ?  $data['pay_merchant_id'] : 0,
             'order_type' => $data['order_type'],
             'create_ip' => $data['create_ip'],
             'send_order_id' => $data['send_order_id'],

+ 2 - 2
app/Modules/Trade/Pay/WxOrderArousePay.php

@@ -27,11 +27,11 @@ class WxOrderArousePay extends OrderArousePayAbstract
             if ($result) {
                 return $result;
             } else {
-                Log::error("创建微信订单失败" . json_encode($result));
+                Log::error("创建微信订单失败: " . json_encode($result));
                 return false;
             }
         } catch (Exception $e) {
-            Log::error("创建微信订单失败" . $e->getMessage());
+            Log::error("创建微信订单失败: " . $e->getMessage());
             return false;
         }
     }