Merge branch 'dev/ver/1.0.0' of http://git.ichunt.net/semour/semour_web into dev/ver/1.0.0

app/Http/Services/OrderService.php

@@ -321,7 +321,8 @@ class OrderService
                 "merchandise_total"=>$merchandise_total, //商品总额
                 "merchandise_total"=>$merchandise_total, //商品总额
                 "sub_total"=>OrderPriceModel::getOrderSubTotal($order_id), //小计
                 "sub_total"=>OrderPriceModel::getOrderSubTotal($order_id), //小计
                 "create_time"=>date('Y-m-d H:i:s', $v['create_time']), //下单时间
                 "create_time"=>date('Y-m-d H:i:s', $v['create_time']), //下单时间
-                "over_time"=> $v["status"] == OrderModel::status_waiting_pay ? date('Y-m-d H:i:s', $v['create_time']+48*3600):"", //截止时间
+              #  "over_time"=> $v["status"] == OrderModel::status_waiting_pay ? date('Y-m-d H:i:s', $v['create_time']+48*3600):"", //截止时间
+                "over_time"=> date('Y-m-d H:i:s', $v['create_time']+48*3600), //截止时间
             ];
             ];
         }
         }