Merge branch 'stabble' of iqiyoo:zhuishuyun_wap into stabble

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

@@ -147,7 +147,7 @@ class OrdersController extends Controller
             return redirect()->to($back_url);
         }
         if (empty($openid)) {
-            $trade_no = date("YmdHis") . hexdec(uniqid()).random_int(100,999);
+            $trade_no = date("YmdHis") . str_shuffle(hexdec(uniqid()));
             $params = compact('uid', 'product_id', 'distribution_channel_id', 'send_order_id', 'bid', 'trade_no', 'pay_redirect_url', 'fromtype', 'activity_id', 'n','suid');
 
             $redirect_url = env('CREATE_PAY_URL') . '?' . http_build_query($params);
@@ -375,7 +375,7 @@ class OrdersController extends Controller
         //根据分校id获取支付配置id
         Log::info($request->all());
 
-        $trade_no =$trade_no = date("YmdHis") . hexdec(uniqid()).random_int(100,999);
+        $trade_no =$trade_no = date("YmdHis") . str_shuffle(hexdec(uniqid()));
         $order_info = OrderService::getByTradeNo($trade_no);
         if ($order_info) return response()->error('WAP_SYS_ERROR');