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

app/service/house/order.js

@@ -34,11 +34,18 @@ class OrderService extends Service {
                 operator: "equal"
             },
             ],
-            orderConditions: [],
+            orderConditions: [{
+                key: 'createdAt',
+                orderSequence: 'desc',
+            }],
         }
         let orderHistory = await service.houseCommon.order.all(filter);
         if (orderHistory.rowCount > 0) {
-            ctx.failed('已经预约过');
+            let ret = {
+                id: orderHistory.results[0].id,
+                msg: '已经预约过',
+            };
+            return ret;
         }
         let data = {
             userId: ctx.userId,
@@ -52,7 +59,7 @@ class OrderService extends Service {
             remark: inputParams.remark || ''
         };
         let ret = await service.houseCommon.order.add(data);
-        return { id: ret.id };
+        return { id: ret.id, msg: '预约成功' };
     }
 
     /**