代客下单修改，问题修复

lib/goods.ts

@@ -117,6 +117,7 @@ export function returnCanUseLimitTimeDiscount(
   useVipPrice: boolean,
   idKey = "product_id"
 ) {
+  goods={...goods,product_id:goods.product_id||goods.productId|| goods.id|| ''}
   if (!limitTimeDiscount || !limitTimeDiscount.id) {
     return false;
   }
@@ -135,8 +136,12 @@ export function returnCanUseLimitTimeDiscount(
       return true;
     }
     if (useVipPrice && goods.hasOwnProperty("memberPrice")) {
-      if (goods.memberPrice && goods.memberPrice * 1 <= 0) {
+
+      if ( goods.memberPrice * 1 <= 0) {
+
         return true;
+      }else{
+        return false;
       }
     }
   }
@@ -166,12 +171,18 @@ function returnLimitPrice(
   const discountRate = new BigNumber(limitTimeDiscount.discountRate).dividedBy(
     100
   );
+  let canuseLimit=false;
+  if(goods.hasOwnProperty('isTimeDiscount')||goods.hasOwnProperty('is_time_discount')){
+    canuseLimit=goods.isTimeDiscount?true:goods.is_time_discount?true:false;
+  }else{
+    canuseLimit = returnCanUseLimitTimeDiscount(
+      goods,
+      limitTimeDiscount,
+      useVipPrice
+    );
+  }
+
 
-  const canuseLimit = returnCanUseLimitTimeDiscount(
-    goods,
-    limitTimeDiscount,
-    useVipPrice
-  );
   if (canuseLimit) {
     //可以使用限时折扣
     if (limitTimeDiscount.discountPriority == "limit-time") {
@@ -183,6 +194,7 @@ function returnLimitPrice(
       return result;
     }
     if (limitTimeDiscount.discountPriority == "vip-price") {
+
       //会员价优先
       if (useVipPrice && goods.memberPrice && goods.memberPrice * 1 > 0) {
         //使用会员价
@@ -228,7 +240,8 @@ export function returnCalcPrice(
       fullReductionActivitie.discountShare == 1 &&
       fullReductionActivitie.vipPriceShare == 1
     ) {
-      //与限时折扣同享，与会员价不同享
+      console.log("与限时折扣同享，与会员价同享", goods);
+      //与限时折扣同享，与会员价同享
       return returnLimitPrice(goods, limitTimeDiscount, useVipPrice);
     }
     if (
@@ -316,7 +329,7 @@ export function filterOptimalFullReductionActivity(
   // 第一步：基础筛选（未删除+当前店铺+活动进行中+就餐类型匹配）
   const baseEligible = activities.filter((activity) => {
     return (
-      activity.isDel !== true && // 未删除
+      // activity.isDel !== true && // 未删除
       // activity.shopId === currentShopId && // 当前店铺
       // activity.status === 2 && // 状态=2（进行中）
       isDinnerTypeMatch(activity, currentDinnerType) && // 就餐类型匹配
@@ -1090,7 +1103,7 @@ export function calculateOrderCostSummary(
       seatFee,
       packFee
     );
-
+    console.log("计算当前满减活动的门槛金额", usedFullReductionActivityFullAmount);
     usedFullReductionThreshold = selectOptimalThreshold(
       usedFullReductionActivity.thresholds,
       usedFullReductionActivityFullAmount,
@@ -1098,7 +1111,6 @@ export function calculateOrderCostSummary(
       goodsRealAmount,
       usedFullReductionActivity.discountShare || 0 // 与限时折扣同享规则
     );
-
     // 2.4 计算满减实际减免金额
     fullReductionAmount = calcFullReductionAmount(
       baseAfterNewUserDiscount,