XIAOPAN

@@ -96,7 +96,6 @@ class AdminStatisticsController extends AdminBaseController{
         $this->assign('monthData',json_encode($Month_statistics));
         $this->assign('monthData',json_encode($Month_statistics));
         $this->assign('monthMoney',json_encode($Month_money));
         $this->assign('monthMoney',json_encode($Month_money));
 
 
-
         //时间段统计
         //时间段统计
         $interval=array();
         $interval=array();
         $sql="SELECT sleep_equipment.hospital,count(*) as num FROM  sleep_order INNER JOIN sleep_equipment ON sleep_order.eq_name=sleep_equipment.name where (".$where." (FROM_UNIXTIME(start_time,'%H:%i:%S')>'00:00:00' AND FROM_UNIXTIME(start_time,'%H:%i:%S')<'07:00:00') OR (FROM_UNIXTIME(start_time,'%H:%i:%S')>'21:00:00' AND FROM_UNIXTIME(start_time,'%H:%i:%S')<'24:00:00'))";
         $sql="SELECT sleep_equipment.hospital,count(*) as num FROM  sleep_order INNER JOIN sleep_equipment ON sleep_order.eq_name=sleep_equipment.name where (".$where." (FROM_UNIXTIME(start_time,'%H:%i:%S')>'00:00:00' AND FROM_UNIXTIME(start_time,'%H:%i:%S')<'07:00:00') OR (FROM_UNIXTIME(start_time,'%H:%i:%S')>'21:00:00' AND FROM_UNIXTIME(start_time,'%H:%i:%S')<'24:00:00'))";

@@ -612,7 +612,7 @@ class OrderController extends HomeBaseController{
                 Db::name('order')->where('id',$order['id'])->update(['group_money'=>($order['price']-$user['fee'])]);
                 Db::name('order')->where('id',$order['id'])->update(['group_money'=>($order['price']-$user['fee'])]);
                 $body = '支付';
                 $body = '支付';
                 $notify_url = url('order/group', '', '', true);//回调地址
                 $notify_url = url('order/group', '', '', true);//回调地址
-                $out_trade_no = $order['order_no'] . $this->create_noncestr(4);
+                $out_trade_no = $order['order_no'];
                 $wxPay = new WeixinPay($user['open_id'], $out_trade_no, $body, ($order['price']-$user['fee'])*100, $notify_url);
                 $wxPay = new WeixinPay($user['open_id'], $out_trade_no, $body, ($order['price']-$user['fee'])*100, $notify_url);
                 $pay = $wxPay->pay();
                 $pay = $wxPay->pay();
                 if (isset($pay['package'])) {
                 if (isset($pay['package'])) {