问题修复，下单优化，订单结算问题修复

utils/order-utils.js

@@ -15,9 +15,10 @@ export function canUseLimitTimeDiscount(
   }
 
   const canUseFoods = (limitTimeDiscountRes.foods || "").split(",");
+
   const goodsCanUse =
     limitTimeDiscountRes.foodType == 1 ||
-    canUseFoods.includes("" + goods[idKey]);
+    canUseFoods.includes(`${goods[idKey]}`);
   if (!goodsCanUse) {
     return false;
   }
@@ -59,10 +60,12 @@ export function returnPrice(args) {
     idKey = "product_id",
   } = args;
   const canUseFoods = (limitTimeDiscountRes.foods || "").split(",");
+  const includesGoods =
+    limitTimeDiscountRes.foodType == 1 ||
+    canUseFoods.includes("" + goods[idKey]);
   shopInfo = shopInfo || {};
   shopUserInfo = shopUserInfo || {};
-
-  if (shopUserInfo.isMemberPrice == 1 && shopUserInfo.isVip == 1) {
+  if (shopUserInfo.isMemberPrice == 1 && shopUserInfo.isVip == 1 && shopInfo.isMemberPrice==1) {
     const memberPrice = goods.memberPrice || goods.salePrice;
 
     //是会员而且启用会员价
@@ -70,10 +73,7 @@ export function returnPrice(args) {
       //使用限时折扣
       //限时折扣优先
       if (limitTimeDiscountRes.discountPriority == "limit-time") {
-        if (
-          limitTimeDiscountRes.foodType == 1 ||
-          canUseFoods.includes("" + goods[idKey])
-        ) {
+        if (includesGoods) {
           return returnLimitPrice({
             price: goods.salePrice,
             limitTimeDiscountRes,
@@ -82,7 +82,10 @@ export function returnPrice(args) {
           return memberPrice;
         }
       }
-      if (limitTimeDiscountRes.discountPriority == "vip-price") {
+      if (
+        limitTimeDiscountRes.discountPriority == "vip-price" &&
+        includesGoods
+      ) {
         if (goods.memberPrice * 1 > 0) {
           //会员优先
           return memberPrice;
@@ -95,6 +98,8 @@ export function returnPrice(args) {
 
           return price;
         }
+      } else {
+        return memberPrice;
       }
     } else {
       //是会员没有限时折扣
@@ -103,12 +108,7 @@ export function returnPrice(args) {
   } else {
     // console.log('不是会员或者没有启用会员价',goods,limitTimeDiscountRes);
     //不是会员或者没有启用会员价
-    if (
-      limitTimeDiscountRes &&
-      limitTimeDiscountRes.id &&
-      (limitTimeDiscountRes.foodType == 1 ||
-        canUseFoods.includes("" + goods[idKey]))
-    ) {
+    if (limitTimeDiscountRes && limitTimeDiscountRes.id && includesGoods) {
       const price = returnLimitPrice({
         price: goods.salePrice,
         limitTimeDiscountRes,