分销问题修复，订单问题修复

utils/order-utils.js

@@ -8,26 +8,32 @@ export function canUseLimitTimeDiscount(
   shopUserInfo,
   idKey = "id"
 ) {
-  shopInfo=shopInfo||{}
-  shopUserInfo=shopUserInfo||{}
+  shopInfo = shopInfo || {};
+  shopUserInfo = shopUserInfo || {};
   if (!limitTimeDiscountRes || !limitTimeDiscountRes.id) {
     return false;
   }
+
   const canUseFoods = (limitTimeDiscountRes.foods || "").split(",");
+  const goodsCanUse =
+    limitTimeDiscountRes.foodType == 1 ||
+    canUseFoods.includes("" + goods[idKey]);
+  if (!goodsCanUse) {
+    return false;
+  }
   if (limitTimeDiscountRes.discountPriority == "limit-time") {
-    if (
-      limitTimeDiscountRes.foodType == 1 ||
-      canUseFoods.includes("" + goods[idKey])
-    ) {
+    return true;
+  }
+  if (limitTimeDiscountRes.discountPriority == "vip-price") {
+    if (shopUserInfo.isVip != 1 || shopUserInfo.isMemberPrice != 1) {
       return true;
     }
-  }
-  if (
-    limitTimeDiscountRes.discountPriority == "vip-price" 
-    
-  ) {
-    
-    if(shopUserInfo.isVip != 1 || shopInfo.isMemberPrice != 1){
+
+    if (
+      shopUserInfo.isVip == 1 &&
+      shopUserInfo.isMemberPrice == 1 &&
+      goods.memberPrice * 1 <= 0
+    ) {
       return true;
     }
   }
@@ -53,9 +59,10 @@ export function returnPrice(args) {
     idKey = "product_id",
   } = args;
   const canUseFoods = (limitTimeDiscountRes.foods || "").split(",");
-  shopInfo=shopInfo||{}
-  shopUserInfo=shopUserInfo||{}
-  if (shopInfo.isMemberPrice == 1 && shopUserInfo.isVip == 1) {
+  shopInfo = shopInfo || {};
+  shopUserInfo = shopUserInfo || {};
+
+  if (shopUserInfo.isMemberPrice == 1 && shopUserInfo.isVip == 1) {
     const memberPrice = goods.memberPrice || goods.salePrice;
 
     //是会员而且启用会员价
@@ -76,8 +83,18 @@ export function returnPrice(args) {
         }
       }
       if (limitTimeDiscountRes.discountPriority == "vip-price") {
-        //会员优先
-        return memberPrice;
+        if (goods.memberPrice * 1 > 0) {
+          //会员优先
+          return memberPrice;
+        } else {
+          const price = returnLimitPrice({
+            price: goods.salePrice,
+            limitTimeDiscountRes,
+            goods: goods,
+          });
+
+          return price;
+        }
       }
     } else {
       //是会员没有限时折扣
@@ -135,7 +152,7 @@ export function returnLimitPrice(args) {
  */
 export function canReturnMemberPrice(args) {
   const { shopInfo, shopUserInfo } = args;
-  if (shopInfo.isMemberPrice == 1 && shopUserInfo.isVip == 1) {
+  if (shopUserInfo.isMemberPrice == 1 && shopUserInfo.isVip == 1) {
     return true;
   } else {
     return false;