|
@@ -160,14 +160,15 @@ Page({
|
|
// start1 = start2 end1 = end2
|
|
// start1 = start2 end1 = end2
|
|
const startTime = new Date(this.data.startTime);
|
|
const startTime = new Date(this.data.startTime);
|
|
const endTime = new Date(this.data.endTime);
|
|
const endTime = new Date(this.data.endTime);
|
|
- let now = dateServ.changeDateTime(new Date(), '14:00:00')
|
|
|
|
|
|
+ const startTime2 = dateServ.changeDateTime(startTime, '14:00:00')
|
|
|
|
+ const endTime2 = dateServ.changeDateTime(endTime, '12:00:00')
|
|
let Order = new Parse.Query("RoomOrder")
|
|
let Order = new Parse.Query("RoomOrder")
|
|
Order.equalTo("room", this.data.roomId)
|
|
Order.equalTo("room", this.data.roomId)
|
|
Order.equalTo("company", company)
|
|
Order.equalTo("company", company)
|
|
Order.exists("status")
|
|
Order.exists("status")
|
|
- Order.notContainedIn('status', [100, 400, 601, 700])
|
|
|
|
- Order.greaterThanOrEqualTo("startTime", endTime) //20 23 21 22
|
|
|
|
- Order.lessThanOrEqualTo("endTime", startTime)
|
|
|
|
|
|
+ Order.notContainedIn('status', [400, 601, 700,800])
|
|
|
|
+ Order.lessThan("startTime", endTime2);
|
|
|
|
+ Order.greaterThan("endTime", startTime2);
|
|
Order.select("startTime", "endTime")
|
|
Order.select("startTime", "endTime")
|
|
let count = await Order.count()
|
|
let count = await Order.count()
|
|
console.log('count', count);
|
|
console.log('count', count);
|
|
@@ -190,6 +191,8 @@ Page({
|
|
async setOrder(tradeNo) {
|
|
async setOrder(tradeNo) {
|
|
const startTime = new Date(this.data.startTime);
|
|
const startTime = new Date(this.data.startTime);
|
|
const endTime = new Date(this.data.endTime);
|
|
const endTime = new Date(this.data.endTime);
|
|
|
|
+ const startTime2 = dateServ.changeDateTime(startTime, '14:00:00')
|
|
|
|
+ const endTime2 = dateServ.changeDateTime(endTime, '12:00:00')
|
|
let currentUser = Parse.User.current()
|
|
let currentUser = Parse.User.current()
|
|
let Order = Parse.Object.extend("RoomOrder");
|
|
let Order = Parse.Object.extend("RoomOrder");
|
|
let order = new Order()
|
|
let order = new Order()
|
|
@@ -207,8 +210,8 @@ Page({
|
|
objectId: this.data.roomId
|
|
objectId: this.data.roomId
|
|
});
|
|
});
|
|
console.log(this.data.startTime, endTime);
|
|
console.log(this.data.startTime, endTime);
|
|
- order.set("startTime", startTime);
|
|
|
|
- order.set("endTime", endTime);
|
|
|
|
|
|
+ order.set("startTime", startTime2);
|
|
|
|
+ order.set("endTime", endTime2);
|
|
order.set("merber", 1);
|
|
order.set("merber", 1);
|
|
order.set("price", this.data.count * this.data.room.price);
|
|
order.set("price", this.data.count * this.data.room.price);
|
|
order.set("shopStore", {
|
|
order.set("shopStore", {
|