下单退款相关更新

pagesOrder/quan_util.js

@@ -18,6 +18,8 @@ export function returnProductCouponPrice(coup, goodsArr, vipUser) {
 	return price * coup.num
 
 }
+
+
 //返回新的商品列表，过滤掉退菜的，退单的商品
 export function returnNewGoodsList(arr) {
 	let goods_list = []
@@ -44,7 +46,6 @@ export function returnCoupCanUse(goodsArr = [], coup, selCoupArr = []) {
 	if (selCoupNumber >= findGoodsTotalNumber) {
 		return false
 	}
-	console.log(selCoupNumber,findGoodsTotalNumber);
 	return findGoodsTotalNumber < selCoupNumber ? false : true
 }
 //查找购物车商品根据购物车商品数据返回商品券信息（抵扣价格以及是否满足可用需求）
@@ -61,7 +62,6 @@ export function returnProductCoupon(coup, goodsArr, vipUser, selCoupArr = []) {
 	const memberPrice = item.memberPrice ? item.memberPrice : item.price;
 	const price = item ? (isUseVipPrice(vipUser,item) ? memberPrice : item.price) : 0;
 	const discountAmount = (price * coup.num).toFixed(2)
-	console.log(discountAmount);
 
 	// const canUse = !coup.use ? false : (discountAmount > 0 && returnCoupCanUse(goodsArr, coup, selCoupArr))
 	// const canUse=discountAmount>0
@@ -96,7 +96,6 @@ export function returnProductPayPrice(goods,vipUser){
 }
 //返回商品券抵扣的商品价格
 export function returnProductCoupAllPrice(productPriceArr,startIndex,num,isMember=true){
-	console.log(productPriceArr);
 	return productPriceArr.slice(startIndex,startIndex+num).reduce((prve,cur)=>{
 		let curPrice=0
 		if(typeof cur==='object'){
@@ -110,13 +109,10 @@ export function returnProductCoupAllPrice(productPriceArr,startIndex,num,isMembe
 
 //返回商品券可抵扣的商品数量
 export function returnProductCanUseNum(productPriceArr,startIndex,num){
-	console.log(productPriceArr);
-	console.log(num);
 	let n=0;
 	for(let i=0;i<num;i++){
 		if(productPriceArr[startIndex*1+i]){
 			n+=1
-			console.log(n);
 		}else{
 			break
 		}
@@ -136,12 +132,10 @@ export function returnGoodsPayPriceMap(goodsArr){
 	Object.values(goodsArr).forEach(item=>{
 		goods_arr = [...goods_arr,...Object.values(item)]
 	})
-	console.log(goods_arr)
 	return goods_arr.reduce((prve,cur)=>{
 		if(!prve.hasOwnProperty(cur.productId)){
 			prve[cur.productId]=[]
 		}
-		console.log(Math.ceil(cur.num))
 		let arr = new Array(Math.ceil(cur.num)).fill(cur).map(v=>{
 			return {
 				memberPrice:v.memberPrice?v.memberPrice:v.price,
@@ -149,7 +143,6 @@ export function returnGoodsPayPriceMap(goodsArr){
 			}
 		})
 		prve[cur.productId].push(...arr)
-		console.log(prve)
 		return prve
 	},{})
 	
@@ -167,7 +160,6 @@ export function returnProductCouponAllPrice(coupArr, goodsArr, vipUser) {
 	let coupMap={}
 	for(let i in coupArr){
 		const coup=coupArr[i]
-		console.log(coup)
 		if(coupMap.hasOwnProperty(coup.proId)){
 			coupMap[coup.proId].push(coup)
 		}else{
@@ -192,15 +184,12 @@ export function returnProductCouponAllPrice(coupArr, goodsArr, vipUser) {
 				})
 				goodsPayPriceMap[coup.proId]=goodsMap[coup.proId].reduce((prve,cur)=>{
 					const arr=new Array(cur.number).fill(cur.payPrice)
-					console.log(arr);
 					 prve.push(...arr)
 					 return prve
 				},[])
 			}
 			const proCoupStartIndex=returnProCoupStartIndex(arr,i)
-			console.log(coup);
 			const coupNum = Math.min(goodsPayPriceMap[coup.proId].length,coup.number)
-			console.log(coupNum);
 			total+=returnProductCoupAllPrice(goodsPayPriceMap[coup.proId],proCoupStartIndex,coupNum) 
 		}
 	}