fix: 增加订单支付各种优惠时的其他优惠重置
This commit is contained in:
@@ -12,6 +12,10 @@ export function returnProductCouponPrice(coup, goodsArr, vipUser) {
|
||||
if (!item) {
|
||||
return 0;
|
||||
}
|
||||
const discountSaleAmount = item.discountSaleAmount * 1;
|
||||
if (discountSaleAmount > 0) {
|
||||
return discountSaleAmount * coup.num;
|
||||
}
|
||||
const memberPrice = item.memberPrice ? item.memberPrice : item.price;
|
||||
const price = item ? (isUseVipPrice(vipUser, item) ? memberPrice : item.price) : 0;
|
||||
return price * coup.num;
|
||||
@@ -55,8 +59,10 @@ export function returnProductCoupon(coup, goodsArr, vipUser, selCoupArr = []) {
|
||||
use: false,
|
||||
};
|
||||
}
|
||||
const discountSaleAmount = item.discountSaleAmount * 1;
|
||||
const memberPrice = item.memberPrice ? item.memberPrice : item.price;
|
||||
const price = item ? (isUseVipPrice(vipUser, item) ? memberPrice : item.price) : 0;
|
||||
let price = item ? (isUseVipPrice(vipUser, item) ? memberPrice : item.price) : 0;
|
||||
price = discountSaleAmount > 0 ? discountSaleAmount : price;
|
||||
const discountAmount = (price * coup.num).toFixed(2);
|
||||
// const canUse = !coup.use ? false : (discountAmount > 0 && returnCoupCanUse(goodsArr, coup, selCoupArr))
|
||||
// const canUse=discountAmount>0
|
||||
@@ -83,8 +89,12 @@ export function returnProductAllCoup(coupArr, goodsArr, vipUser) {
|
||||
}
|
||||
//返回商品实际支付价格
|
||||
export function returnProductPayPrice(goods, vipUser) {
|
||||
const discountSaleAmount = goods.discountSaleAmount * 1;
|
||||
const memberPrice = goods.memberPrice ? goods.memberPrice : goods.price;
|
||||
const price = isUseVipPrice(vipUser, goods) ? memberPrice : goods.price;
|
||||
if (discountSaleAmount) {
|
||||
return discountSaleAmount;
|
||||
}
|
||||
return price;
|
||||
}
|
||||
//返回商品券抵扣的商品价格
|
||||
@@ -93,7 +103,11 @@ export function returnProductCoupAllPrice(productPriceArr, startIndex, num = 1,
|
||||
return productPriceArr.slice(startIndex, startIndex + num).reduce((prve, cur) => {
|
||||
let curPrice = 0;
|
||||
if (typeof cur === "object") {
|
||||
curPrice = isVip ? cur.memberPrice * 1 : cur.price;
|
||||
if (cur.discountSaleAmount * 1 > 0) {
|
||||
curPrice = cur.discountSaleAmount * 1;
|
||||
} else {
|
||||
curPrice = isVip ? cur.memberPrice * 1 : cur.price;
|
||||
}
|
||||
} else {
|
||||
curPrice = cur * 1;
|
||||
}
|
||||
@@ -132,6 +146,7 @@ export function returnGoodsPayPriceMap(goodsArr) {
|
||||
return {
|
||||
memberPrice: v.memberPrice ? v.memberPrice : v.price,
|
||||
price: v.price,
|
||||
discountSaleAmount: v.discountSaleAmount * 1,
|
||||
};
|
||||
});
|
||||
prve[cur.productId].push(...arr);
|
||||
|
||||
Reference in New Issue
Block a user