czg_team/cashier_admin_app
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改订单退款金额，客座费金额

Browse Source
This commit is contained in:
YeMingfei666
2024-11-23 15:43:46 +08:00
parent 586f30c4c4
commit 35160c63b4
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pagesOrder/detail/components/extra.vue
View File

@@ -98,10 +98,10 @@
} }
console.log(item); console.log(item);
if (props.orderInfo.pointsDiscountAmount > 0 || props.orderInfo.fullCouponDiscountAmount > 0) { if (props.orderInfo.pointsDiscountAmount > 0 || props.orderInfo.fullCouponDiscountAmount > 0) {
const shengyuKeTui=(props.orderInfo.refundAmount||0)-canTuiKuanPrice.value const shengyuKeTui=canTuiKuanPrice.value
const bili = Math.floor((item.priceAmount / shengyuKeTui) * 100) / 100 const bili = Math.floor((item.priceAmount / shengyuKeTui) * 100) / 100
console.log(bili); console.log(bili);
return Math.floor(props.orderInfo.amount * bili * 100) / 100 return Math.floor((props.orderInfo.amount-props.orderInfo.refundAmount) * bili * 100) / 100
} else { } else {
return item.priceAmount return item.priceAmount
} }
@@ -141,7 +141,7 @@
} }
function tuikuan() { function tuikuan() {
emits('tuikuan', props.data) emits('tuikuan', {...props.data,priceAmount:seatFeePrice.value})
} }
function tuicai() { function tuicai() {

12
pagesOrder/detail/components/list.vue
View File

@@ -384,10 +384,10 @@
return returnTotalMoney(item) return returnTotalMoney(item)
} else { } else {
if(props.orderInfo.pointsDiscountAmount>0||props.orderInfo.fullCouponDiscountAmount>0){ if(props.orderInfo.pointsDiscountAmount>0||props.orderInfo.fullCouponDiscountAmount>0){
const shengyuKeTui=(props.orderInfo.refundAmount||0)-canTuiKuanPrice.value const shengyuKeTui=canTuiKuanPrice.value
const bili=Math.floor((item.priceAmount/shengyuKeTui )*100)/100 const bili=Math.floor((item.priceAmount/shengyuKeTui )*100)/100
console.log(bili); console.log(bili);
return Math.floor(props.orderInfo.amount*bili*100)/100 return Math.floor((props.orderInfo.amount-props.orderInfo.refundAmount)*bili*100)/100
// return (item.priceAmount / (canTuiKuanPrice.value + seatFeePrice.value * 1) * props.orderInfo.amount).toFixed( // return (item.priceAmount / (canTuiKuanPrice.value + seatFeePrice.value * 1) * props.orderInfo.amount).toFixed(
// 2) // 2)
}else{ }else{
@@ -523,10 +523,10 @@
const n = goodsOriginAllPrice.value - youhuiAllPrice.value const n = goodsOriginAllPrice.value - youhuiAllPrice.value
return (n < 0 ? 0 : n).toFixed(2) return (n < 0 ? 0 : n).toFixed(2)
} }
const seatFee=props.orderInfo.seatInfo?(props.orderInfo.seatInfo.priceAmount||props.orderInfo.seatInfo.returnAmount):0 let seatFee=props.orderInfo.seatInfo?(props.orderInfo.seatInfo.priceAmount):0
console.log('seatFee'); const bili = Math.floor((seatFee / canTuiKuanPrice.value) * 100) / 100
console.log(seatFee); seatFee= Math.floor((props.orderInfo.amount-props.orderInfo.refundAmount) * bili * 100) / 100
const total=props.orderInfo.amount-seatFee const total=props.orderInfo.amount-(props.orderInfo.seatInfo.returnAmount?props.orderInfo.seatInfo.returnAmount:seatFee)
return (total<=0?0:total).toFixed(2) return (total<=0?0:total).toFixed(2)
}) })