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

app/service/credit/order.js

@@ -165,7 +165,7 @@ class OrderService extends Service {
             have: false,
             order: {}
         }
-        if ([1, 2].includes(type)) {
+        if (![1, 2].includes(type)) {
             return ret;
         }
         let orderFilter = {
@@ -174,7 +174,7 @@ class OrderService extends Service {
                 type: type,
                 state: '待支付',
                 valid: 1,
-                state_time: { $gte: moment().substract(1, 'days').format('YYYY-MM-DD HH:mm:ss') }
+                state_time: { $gte: moment().subtract(1, 'days').format('YYYY-MM-DD HH:mm:ss') }
             }
         }
         let list = await ctx.prometheusModel.CreditOrder.findAll(orderFilter);
@@ -198,8 +198,7 @@ class OrderService extends Service {
                 }
             }
         }
-
-
+        return ret;
     }
 
     async unifiedOrder(type, order_id) {
@@ -278,7 +277,7 @@ class OrderService extends Service {
     async getBePayOrder(type) {
         const { ctx } = this;
         let ret = [];
-        if ([1, 2].includes(type)) {
+        if (![1, 2].includes(type)) {
             return ret;
         }
         let filter = {
@@ -287,7 +286,7 @@ class OrderService extends Service {
                 type: type,
                 state: '待支付',
                 valid: 1,
-                state_time: { $gte: moment().substract(1, 'days').format('YYYY-MM-DD HH:mm:ss') }
+                state_time: { $gte: moment().subtract(1, 'days').format('YYYY-MM-DD HH:mm:ss') }
             },
             order: [['state_time', 'desc']]
         }
@@ -341,7 +340,7 @@ class OrderService extends Service {
                 type: type === 1 ? 2 : 1,
                 valid: 1,
                 state: '已支付',
-                state_time: { $gte: moment().substract(3, 'days').format('YYYY-MM-DD HH:mm:ss') }
+                state_time: { $gte: moment().subtract(3, 'days').format('YYYY-MM-DD HH:mm:ss') }
             },
             order: [['state_time', 'desc']]
         }