Merge branch 'master' of t-git.51gjj.com:fangbin/51business

app/service/credit/order.js

@@ -210,7 +210,7 @@ class OrderService extends Service {
 
         const price = await this.updateOrderPrice(order);
         const type = order.type;
-        const countdown = moment(order.order_time).format('X') - moment(new Date()).format('X') + 86400;
+        const countdown = moment(order.order_time).format('X') - moment(new Date()).format('X') + 86402;
         const ret = {
             price,
             original_price: order.price,
@@ -298,7 +298,7 @@ class OrderService extends Service {
         }
         const expire_time = moment(order.order_time).valueOf() + 24 * 3600 * 1000;
         const now_time = moment().valueOf();
-        if (expire_time < now_time) {
+        if (expire_time <= now_time) {
             ctx.failed('order_failure');//订单失效，前端会取这个判断跳转
         }