Commit 9488eb50 authored by youjie's avatar youjie

优惠券满足条件

parent 45f64077
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
console.log(!x.err || x.err=='订单金额不满足') console.log(!x.err || x.err=='订单金额不满足')
if(!x.err || x.err=='订单金额不满足'){ if(!x.err || x.err=='订单金额不满足'){
x.err = x.useCondition>this.price?'订单金额不满足':null x.err = x.useCondition>this.price?'订单金额不满足':null
}else if(!x.err || x.err==`订单人数不满足,至少${x.orderGuestNum}人`){ }else if(x.orderGuestNum&&(!x.err || x.err==`订单人数不满足,至少${x.orderGuestNum}人`)){
x.err = x.orderGuestNum>this.numberPeople?`订单人数不满足,至少${x.orderGuestNum}人`:null x.err = x.orderGuestNum>this.numberPeople?`订单人数不满足,至少${x.orderGuestNum}人`:null
} }
}) })
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
this.ts.forEach((x)=>{ this.ts.forEach((x)=>{
if(!x.err && x.useCondition>this.price){ if(!x.err && x.useCondition>this.price){
x.err = '订单金额不满足' x.err = '订单金额不满足'
}else if(!x.err && x.orderGuestNum>this.numberPeople){ }else if(x.orderGuestNum&&!x.err && x.orderGuestNum>this.numberPeople){
x.err = `订单人数不满足,至少${x.orderGuestNum}人` x.err = `订单人数不满足,至少${x.orderGuestNum}人`
} }
}) })
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
if(x.overlapUse){ if(x.overlapUse){
if(!x.check&&x.denomination>this.money){ if(!x.check&&x.denomination>this.money){
x.err = '订单金额不满足' x.err = '订单金额不满足'
}else if(!x.check&&x.orderGuestNum>this.numberPeople){ }else if(x.orderGuestNum&&!x.check&&x.orderGuestNum>this.numberPeople){
x.err = `订单人数不满足,至少${x.orderGuestNum}人` x.err = `订单人数不满足,至少${x.orderGuestNum}人`
} else { } else {
x.err = null x.err = null
......
...@@ -639,13 +639,13 @@ ...@@ -639,13 +639,13 @@
let discount = 0 let discount = 0
const money = this.price const money = this.price
this.couponList.forEach(x=>{ this.couponList.forEach(x=>{
if(x.couponsType==1 && x.denomination>discount&&this.guest.length>=x.orderGuestNum) { if(x.couponsType==1 && x.denomination>discount&&(this.guest.length>=x.orderGuestNum||!x.orderGuestNum)) {
discount=x.denomination discount=x.denomination
maxCouponId = x.id maxCouponId = x.id
} }
if(x.couponsType==2){ if(x.couponsType==2){
let disMoney = money*(1-x.denomination) let disMoney = money*(1-x.denomination)
if(discount<disMoney&&this.guest.length>=x.orderGuestNum){ if(discount<disMoney&&(this.guest.length>=x.orderGuestNum||!x.orderGuestNum)){
discount=disMoney discount=disMoney
maxCouponId = x.id maxCouponId = x.id
} }
......
...@@ -827,24 +827,21 @@ ...@@ -827,24 +827,21 @@
if(this.couponList && this.couponList.length>0){ if(this.couponList && this.couponList.length>0){
let maxCouponId = 0 let maxCouponId = 0
let discount = 0 let discount = 0
let current = null
const money = this.price const money = this.price
this.couponList.forEach(x=>{ this.couponList.forEach(x=>{
if(x.couponsType==1 && x.denomination>discount) { if(x.couponsType==1 && x.denomination>discount&&(this.total>=x.orderGuestNum||!x.orderGuestNum)) {
discount=x.denomination discount=x.denomination
maxCouponId = x.id maxCouponId = x.id
current = x
} }
if(x.couponsType==2){ if(x.couponsType==2){
let disMoney = money*(1-x.denomination) let disMoney = money*(1-x.denomination)
if(discount<disMoney){ if(discount<disMoney&&(this.total>=x.orderGuestNum||!x.orderGuestNum)){
discount=disMoney discount=disMoney
maxCouponId = x.id maxCouponId = x.id
current = x
} }
} }
}) })
if(maxCouponId>0&&this.total>=current.orderGuestNum) this.closeCouponHandler([maxCouponId]) if(maxCouponId>0) this.closeCouponHandler([maxCouponId])
} }
}, },
calcVipDisscountHandle(){ calcVipDisscountHandle(){
......
...@@ -1117,13 +1117,13 @@ ...@@ -1117,13 +1117,13 @@
let discount = 0 let discount = 0
const money = this.price const money = this.price
this.couponList.forEach(x=>{ this.couponList.forEach(x=>{
if(x.couponsType==1 && x.denomination>discount&&this.orderMsg.AdultPeopleNum>=x.orderGuestNum) { if(x.couponsType==1 && x.denomination>discount&&(this.orderMsg.AdultPeopleNum>=x.orderGuestNum||!x.orderGuestNum)) {
discount=x.denomination discount=x.denomination
maxCouponId = x.id maxCouponId = x.id
} }
if(x.couponsType==2){ if(x.couponsType==2){
let disMoney = money*(1-x.denomination) let disMoney = money*(1-x.denomination)
if(discount<disMoney&&this.orderMsg.AdultPeopleNum>=x.orderGuestNum){ if(discount<disMoney&&(this.orderMsg.AdultPeopleNum>=x.orderGuestNum||!x.orderGuestNum)){
discount=disMoney discount=disMoney
maxCouponId = x.id maxCouponId = x.id
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment