no message

app/Console/Commands/CheckOrderExpire.php

@@ -41,7 +41,7 @@ class CheckOrderExpire extends Command
      */
     public function handle()
     {
-        $date = date('Y-m-d H:i:s', time() - 900);//15分钟
+        $date = date('Y-m-d H:i:s', time() - 1800);//30分钟
 
         Order::where('order_status', 1)
             ->where('created_at', '<=', $date)

app/Http/Controllers/Api/OrderController.php

@@ -164,11 +164,9 @@ class OrderController extends ApiController
         $commonServer = CommonServer::creatServer();
         $order_id = $commonServer->filtrationStr('order_id');//订单id
         $pay_type = $commonServer->filtrationStr('pay_type',1);//支付方式 1微信 2支付宝
-        $system_type = request()->input('system_type',2);//1微信h5 2微信小程序 3qq小程序
 
         if (empty($order_id)) return $this->apiResponseError('请选择订单');
         if (!in_array($pay_type, [1, 2, 3])) return $this->apiResponseError('支付方式错误');
-        if (!in_array($system_type, [1, 2, 3])) return $this->apiResponseError('来源平台错误');
         $order_info = Order::where('id', $order_id)
             ->where('m_id', $m_id)
             ->where('order_status', 1)
@@ -187,11 +185,11 @@ class OrderController extends ApiController
         if($pay_type == 1) {
             //微信支付
             $notify_url = route('notify.order_wx');
-            $wx_openid = MemberOpenId::where('m_id', $m_id)->where('type', $system_type)->value('openid');
+            $wx_openid = MemberOpenId::where('m_id', $m_id)->where('type', 4)->value('openid');
             if (empty($wx_openid)) {
                 return $this->apiResponseError('用户信息错误');
             }
-            $wx_pay = WeixinServer::creatServer()->wxJsPay($order_info->{'order_sn'}, $order_info->{'pay_money'}, $notify_url, '外卖订单', $wx_openid);
+            $wx_pay = WeixinServer::creatServer()->wxJsPay($order_info->{'order_sn'}, $order_info->{'pay_money'}, $notify_url, '订单', $wx_openid);
             $data['wx_pay'] = $wx_pay;
         }elseif ($pay_type == 2) {
             $data['zfb_pay'] = [];
@@ -221,7 +219,7 @@ class OrderController extends ApiController
                     $q->where('order_status',$status);
                 }
             })
-            ->select(['id','order_sn','order_status','pay_money','goods_number','created_at','shop_id','note','shopping_cart'])
+            ->select(['id','order_sn','order_type','order_status','pay_money','goods_number','created_at','shop_id','note','shopping_cart'])
             ->orderBy('id','desc')
             ->paginate(10);
         foreach ($list as $value){
@@ -290,7 +288,7 @@ class OrderController extends ApiController
         $where = [['m_id',$m_id], ['is_del',0], ['id',$order_id]];
 
         $order = Order::where($where)
-            ->select(['id','order_sn','pay_type','m_id','note','order_status','pay_money','goods_number','shop_id','created_at','pack_price','table_number','diner_number','number','note','shopping_cart'])
+            ->select(['id','order_sn','order_type','pay_type','m_id','note','order_status','pay_money','goods_number','shop_id','created_at','pack_price','table_number','diner_number','number','note','shopping_cart'])
             ->first();
         if (empty($order)) return $this->apiResponseError('订单不存在');
         if ($order->{'order_type'} == 1) {//堂食打包费为0

app/Servers/WeixinServer.php

@@ -361,7 +361,7 @@ class WeixinServer
 //        var_dump($conf);
         $order = new Unifiedorder($conf);
         $request = $order->getOrder($this->private_key);
-//        var_dump($request);
+        var_dump($request);
         if ($request['code'] == 1) {
             $datas["appId"] = $request['data']['appid'];
             $datas["nonceStr"] = $order->getNonceStr();

app/Servers/weixin/Unifiedorder.php

@@ -225,6 +225,7 @@ class Unifiedorder
         $request=curl_exec($ch);
         curl_close($ch);
         $request=json_decode(json_encode(simplexml_load_string($request, 'SimpleXMLElement', LIBXML_NOCDATA)),true);
+        var_dump($request);
         if($request['return_code']=='SUCCESS'&&$request['result_code']=='SUCCESS')
         {
 

config/app.php

@@ -67,7 +67,7 @@ return [
     |
     */
 
-    'timezone' => 'UTC',
+    'timezone' => 'Asia/shanghai',
 
     /*
     |--------------------------------------------------------------------------