优惠券方法更新,计算更新
This commit is contained in:
@@ -7,6 +7,6 @@
|
|||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"pinia": "^2.3.1",
|
"pinia": "^2.3.1",
|
||||||
"pinia-plugin-unistorage": "^0.1.2",
|
"pinia-plugin-unistorage": "^0.1.2",
|
||||||
"ysk-utils": "^1.0.40"
|
"ysk-utils": "^1.0.45"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -181,17 +181,15 @@ export function returnCouponCanUse(args) {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 商品兑换券,第二件半价和买一送一判断是否有可用商品
|
// 商品兑换券,第二件半价和买一送一判断是否有可用商品
|
||||||
if ([2, 4, 5].includes(coupon.type)) {
|
if ([2, 4, 5].includes(coupon.type)) {
|
||||||
console.log("商品兑换券", fullAmount, coupon.fullAmount);
|
|
||||||
if (coupon.type == 2 && fullAmount < coupon.fullAmount) {
|
if (coupon.type == 2 && fullAmount < coupon.fullAmount) {
|
||||||
console.log("商品兑换券", coupon);
|
|
||||||
return {
|
return {
|
||||||
canUse: false,
|
canUse: false,
|
||||||
reason: `满${coupon.fullAmount}元可用,当前可参与金额${fullAmount}元`,
|
reason: `满${coupon.fullAmount}元可用,当前可参与金额${fullAmount}元`,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// 没有符合条件的商品
|
// 没有符合条件的商品
|
||||||
if (isDikouAll && canDikouGoodsArr.length === 0) {
|
if (isDikouAll && canDikouGoodsArr.length === 0) {
|
||||||
return {
|
return {
|
||||||
@@ -219,8 +217,8 @@ export function returnCouponCanUse(args) {
|
|||||||
let canUse = false;
|
let canUse = false;
|
||||||
if (isDikouAll) {
|
if (isDikouAll) {
|
||||||
canUse = canDikouGoodsArr.some((v) => v.num >= 2);
|
canUse = canDikouGoodsArr.some((v) => v.num >= 2);
|
||||||
} else if (canCalcGoodsArr.length > 0) {
|
} else if (canUseGoodsArr.length > 0) {
|
||||||
canUse = canCalcGoodsArr.some((v) => v.num >= 2);
|
canUse = canUseGoodsArr.some((v) => v.num >= 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!canUse) {
|
if (!canUse) {
|
||||||
@@ -236,10 +234,9 @@ export function returnCouponCanUse(args) {
|
|||||||
let canUse = false;
|
let canUse = false;
|
||||||
if (isDikouAll) {
|
if (isDikouAll) {
|
||||||
canUse = canDikouGoodsArr.some((v) => v.num >= 2);
|
canUse = canDikouGoodsArr.some((v) => v.num >= 2);
|
||||||
} else if (canCalcGoodsArr.length > 0) {
|
} else if (canUseGoodsArr.length > 0) {
|
||||||
canUse = canCalcGoodsArr.some((v) => v.num >= 2);
|
canUse = canUseGoodsArr.some((v) => v.num >= 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!canUse) {
|
if (!canUse) {
|
||||||
return {
|
return {
|
||||||
canUse: false,
|
canUse: false,
|
||||||
|
|||||||
Reference in New Issue
Block a user