From 51b150cb54cfb848ae31e048504dfcfe6cffc3aa Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Fri, 23 Feb 2024 11:07:36 +0800
Subject: [PATCH] 判断门店不可售的优化，在切换到参与非实收订单促销的时候，判断门店是不是可售

---
 packageE/pages/cart/cart2/cart2.js | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 51 insertions(+), 4 deletions(-)

diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index ca8223a..1cd835f 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -4825,6 +4825,9 @@ Page({
         if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) {
           getApp().my_warnning("读取物流失败", 0, th);
           th.data.is_summit_ing = 0;
+          th.setData({
+            submit: 0
+          })
           return false;
         }
       
@@ -4962,9 +4965,26 @@ Page({
       };
 
       //如果有参与非实收的订单促销，那么就相当于是普通购买
-      if(th.data.can_use_ord_prom[th.data.bn_pick]){
-        goods.is_pd_normal=1;
-        goods.discount_field= th.data.show_ord_prom[th.data.bn_pick];
+      if (th.data.can_use_ord_prom[th.data.bn_pick]) {
+        goods.is_pd_normal = 1;
+        goods.discount_field = th.data.show_ord_prom[th.data.bn_pick];
+
+        //如果是指定门店，就要判断
+        if (th.data.bn_goods.pick_group_ids) {
+          var idx0 = th.data.bn_goods.pick_up_lists.findIndex(function (e) {
+            return e.pickup_id == th.data.bn_pick;
+          })
+          if (idx0 < 0) {
+            getApp().my_warnning(th.data.bn_goods.goods_name + "的门店不可售", 0, th);
+            th.data.is_summit_ing = 0;
+            th.setData({
+              submit: 0
+            })
+            return false;
+          }
+        }
+
+
       }
 
       if (th.data.bn_goods.whsle_id) {
@@ -5017,11 +5037,17 @@ Page({
         if(mo_num>goods.goods_num){
           getApp().confirmBox(goods.goods_name + "的未达到起订数量");
           th.data.is_summit_ing = 0;
+          th.setData({
+            submit: 0
+          })
           return false;
         }
         if(steep>1 && (goods.goods_num-mo_num)%steep!=0 ){
           getApp().confirmBox(goods.goods_name + "的购买的数量不是起订量的倍数");
           th.data.is_summit_ing = 0;
+          th.setData({
+            submit: 0
+          })
           return false;
         }
       }
@@ -5036,6 +5062,9 @@ Page({
         if (!isok) {
           getApp().confirmBox("商品的门店库存不足");
           th.data.is_summit_ing = 0;
+          th.setData({
+            submit: 0
+          })
           return false;
         }
       }
@@ -5154,6 +5183,9 @@ Page({
           if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) {
             th.data.is_summit_ing = 0;
             getApp().confirmBox("读取物流失败");
+            th.setData({
+              submit: 0
+            })
             return false;
           }
         }
@@ -5362,7 +5394,22 @@ Page({
 
           //订单促销取价规则使用
           if (g_item.discount_field) {
-            goods.discount_field =g_item.discount_field;
+             goods.discount_field =g_item.discount_field;
+             //此时要判断商品的门店是不是匹配
+             if(g_item.prom_type==0 && g_item.pick_group_ids){
+               var idx0 = g_item.pick_up_lists.findIndex(function (e) {
+                 return e.pickup_id == item.pickup_id;
+               })
+               if (idx0 < 0) {
+                 getApp().my_warnning(g_item.goods_name + "的门店不可售", 0, th);
+                 th.data.is_summit_ing = 0;
+                 th.setData({
+                   submit: 0
+                 })
+                 return false;
+               }
+             }
+
           }
 
           if (g_item.is_pd_normal) {
--
libgit2 0.21.4