From 509f53cb7a12fb9e61ba5d1eecdfd31ec572e010 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Wed, 9 Aug 2023 15:40:45 +0800
Subject: [PATCH] 门店不可售

---
 pages/cart/cart/cart.js             | 14 +++++++++++---
 pages/user/order_list/order_list.js | 18 +++++++++++++++++-
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 4fb0ce1..1514781 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -735,6 +735,8 @@ Page({
                 //商品已经下架
                 continue;
               }
+              //把活动写入
+              item.prom=prom;
 
               //判断秒杀的限购
               if (item.goods_num + promgoodsbuynum > prom.buy_limit && prom.buy_limit > 0) {
@@ -756,7 +758,6 @@ Page({
                   data: updata1,
                 })
                 item.goods_num = cbuy;
-                item.prom=prom; //把活动写入cart_list
               }
 
               //价格不对，就要更新一下
@@ -3340,8 +3341,15 @@ Page({
             })
 
             //判断秒杀的指定门店
-            if(py_type==1){
-               var prom=i_arr[j].prom;
+            if(py_type==1 && i_arr[j].prom && i_arr[j].prom.pick_up_lists){
+              var idx0=i_arr[j].prom.pick_up_lists.findIndex(function (e){
+                return e.pickup_id==i_arr[j].pick_id;
+              })
+              if(idx0<0){
+                getApp().confirmBox(i_arr[j].goods_name + "秒杀活动的门店不可售");
+                wx.hideLoading();
+                return false;
+              }
             }
 
             if ([0, 3, 5, 7, 10].indexOf(py_type) > -1) {
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index e7792f4..950b5fd 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -769,7 +769,7 @@ Page({
             return e.pickup_id==order.pickup_id;
           })
           if(idx0<0){
-            getApp().confirmBox(gg.goods_name + "的指定门店不匹配");
+            getApp().confirmBox(gg.goods_name + "的门店不可售");
             th.setData({ paying: 0 });
             return false;
           }
@@ -1292,6 +1292,22 @@ Page({
       }
       //----------如果有活动，并且在进行中，就不计算线下库存---------------
       if (prom) {
+
+        //指定门店的控制
+        if (goodsinfo.prom_type == 1 && prom.pick_up_lists) {
+
+          var idx0=prom.pick_up_lists.findIndex(function (e){
+            return e.pickup_id==order.pick_id;
+          })
+          if(idx0<0){
+            getApp().confirmBox(goodsinfo.goods_name + "秒杀活动的门店不可售");
+            wx.hideLoading();
+            return false;
+          }
+
+        }
+
+
         var now = ut.gettimestamp();
         if (prom.is_end == 1 && prom.end_time < now) {
           var content = goodsinfo.goods_name + '商品的活动已经结束,请取消订单'
--
libgit2 0.21.4