购物车优惠促销的优化

yvan.ni
1 parent bc8b6f63
Showing 2 changed files with 25 additions and 15 deletions
packageE/pages/cart/cart2/cart2.js
pages/cart/cart/cart.js
@@ -134,7 +134,6 @@ Page({
     in_zhact_gdmap: {}, //不同门店参与同一活动的限购，这些都是map表，很
     in_zhact:{},        //组合购活动在列表中的显示
     in_yhact:{},        //优惠活动在列表中的显示
-
     in_zh_gd_buy_map:{},  //就是商品在组合购中的
     in_zhact_gdmap_new: {}, //不同门店参与同一活动的限购，这些都是map表，是多促销互动专用，不能和in_zhact_gdmap重叠
@@ -7744,6 +7743,7 @@ Page({
       month_lb:{}
     })
+    th.data.prom_goods_map={};
     var fir_sele=0;
     for(var dx=0;dx<cx_prom_group.length;dx++){
@@ -3613,6 +3613,10 @@ Page({
             for (var ind in ddata) {
               var val = ddata[ind];
               var num = map.get(val.goods_id + "");
+
+              var ky=val.goods_id + "-"+val.prom_type + "-"+val.prom_id;
+              var buyed = map_limit.get(ky);
+
               if (num <= 0) {
                 isok = 0;
                 gname = val.goods_name;
@@ -3621,12 +3625,29 @@ Page({
               }
               if (val.prom_type == 1 || val.prom_type == 2) {
-                  if (num > val.store_count) {
+
+                 var s_num=num;
+                 if(th.data.sales_rules> 1) s_num=buyed;
+                  if (s_num > val.store_count) {
                     isok = 0;
                     gname = val.goods_name;
                     throw "超出库存";
                     return false;
                   }
+
+                  if (buyed > val.redisnum && val.redisnum) {
+                    isok = 0;
+                    gname = val.goods_name;
+                    err="超出活动库存";
+                    break;
+                  }
+                  if (buyed > val.goods_num - val.buy_num && val.goods_num) {
+                    isok = 0;
+                    gname = val.goods_name;
+                    err="超出活动库存";
+                    break;
+                  }
+
               }
               if (th.data.sales_rules == 1) {
@@ -3637,20 +3658,9 @@ Page({
                   break;
                 }
               }
-              if (num > val.redisnum && val.redisnum) {
-                isok = 0;
-                gname = val.goods_name;
-                err="超出活动库存";
-                break;
-              }
-              if (num > val.goods_num - val.buy_num && val.goods_num) {
-                isok = 0;
-                gname = val.goods_name;
-                err="超出活动库存";
-                break;
-              }
-              var buyed = map_limit.get(ky);
+
+
               if (num + buyed.goodsbuynum > val.viplimited && val.viplimited > 0) {
                 isok = 0;
                 gname = val.goods_name;