确认订单更新

stores/carts.js

@@ -24,6 +24,7 @@ import {
 	productminiApphotsquery,
 	APIgroupquery,
 } from "@/common/api/product/product.js";
+
 export const useCartsStore = defineStore('cart',
 	() => {
 
@@ -42,11 +43,15 @@ export const useCartsStore = defineStore('cart',
 				} :
 				undefined;
 
-
-
+			const goods = getProductDetails({
+				...item,
+				product_id: item.product_id || item.productId,
+				sku_id:item.skuId||item.sku_id
+			})
 			return {
 				...item,
 				id: item.id,
+				sku_id:item.skuId||item.sku_id,
 				product_id: item.product_id || item.productId,
 				salePrice: item.salePrice || item.price,
 				number: item.number || item.num || 0,
@@ -56,7 +61,7 @@ export const useCartsStore = defineStore('cart',
 				returnNum: item.returnNum || 0,
 				memberPrice: item.memberPrice || 0,
 				discountSaleAmount: item.discount_sale_amount || item.discountSaleAmount || 0,
-				packFee: item.packFee || 0,
+				packFee: item.packFee || (goods?goods.packFee:0) || 0,
 				packNumber: item.pack_number || item.packNumber || 0,
 				activityInfo: item.activityInfo ? {
 					type: item.activityInfo.type,
@@ -68,7 +73,9 @@ export const useCartsStore = defineStore('cart',
 		};
 
 		// 合并所有商品列表
-		const allGoods = computed(() => {
+		const allGoods = ref([])
+
+		function getAllGoodsList() {
 			const currentGoods = (carts.value).map(convertToBaseCartItem);
 			const giftGoods = [].map(convertToBaseCartItem);
 			// 扁平化历史订单商品
@@ -76,7 +83,7 @@ export const useCartsStore = defineStore('cart',
 				.flat()
 				.map(convertToBaseCartItem);
 			return [...currentGoods, ...giftGoods, ...oldOrderGoods];
-		})
+		}
 
 
 		// 就餐类型 'dine-in' | 'take-out'
@@ -162,6 +169,8 @@ export const useCartsStore = defineStore('cart',
 		const cartOrder = ref({});
 		// 订单费用汇总
 		const orderCostSummary = computed(() => {
+			allGoods.value = getAllGoodsList()
+			console.log('orderCostSummary:allGoods.value',allGoods.value );
 			const costSummary = OrderPriceCalculator.calculateOrderCostSummary(
 				allGoods.value,
 				dinnerType.value,
@@ -193,6 +202,8 @@ export const useCartsStore = defineStore('cart',
 					setGoodsMap(product.id, product)
 				}
 			}
+			allGoods.value = getAllGoodsList()
+			console.log('allGoods.value ',allGoods.value );
 			goodsIsloading.value = false
 		}
 
@@ -214,9 +225,7 @@ export const useCartsStore = defineStore('cart',
 			}
 			let skuData = undefined;
 			skuData = goods?.skuList.find((sku) => sku.id == v.sku_id);
-
-			skuData = goods?.skuList.find((sku) => sku.id == v.sku_id);
-
+		
 			if (skuData) {
 				return {
 					...v,
@@ -576,7 +585,8 @@ export const useCartsStore = defineStore('cart',
 			seatFeeConfig,
 			shopInfo,
 			//新客立减金额
-			newUserDiscount
+			newUserDiscount,
+			getAllGoodsList
 		};
 	}
 );