Merge branch 'master' of iqiyoo:zhuishuyun_wap

app/Http/Controllers/Wap/Order/OrdersController.php

@@ -904,9 +904,9 @@ class OrdersController extends BaseController
             'activity_id' => 0,
             'inner_send_order_id' => '',
             'status'=>'UNPAID',
-            'transaction_id'=>'',
-            'pay_end_at'=>date('Y-m-d H:i:s')
+            'transaction_id'=>''
         ];
+        $init_order['pay_end_at'] = '0000-00-00 00:00:00';
         $info = Order::create($init_order);
         return redirect()->to(generateMonthOrderUrl($info->id));
     }

app/Http/Controllers/Wap/Pay/MonthOrderController.php

@@ -74,6 +74,10 @@ class MonthOrderController extends Controller
         $sign = _sign(compact('app_id','plan_id','user_id','change_type'),$key.$key);
         $sign = strtoupper($sign);
         $user_info = UserService::getById($user_id);
+        if(!$user_info){
+            Log::error('signCallBack user is not exist,uid is :'.$user_id);
+            return response('fail');
+        }
         if($sign == $request->post('sign')){
             UserMonthService::createSign($user_id,$plan_id,$change_type,$user_info->openid);
         }
@@ -114,6 +118,7 @@ class MonthOrderController extends Controller
             UserMonthService::createLOrder($order_info->uid,$plan_id,$total_fee,$trade_no,$out_trade_no);
             $order_info->transaction_id = $trade_no;
             $order_info->status = 'PAID';
+            $order_info->pay_end_at = date('Y-m-d H:i:s');
             $order_info->save();
             self::addOrderAndVipV2($order_info->uid,$total_fee);
         }