From 47b4b753eb82e93b52754a66d16d545cdae731c0 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 17 Jan 2023 14:19:05 +0800
Subject: [PATCH] 在加入购物车中的优化计算

---
 pages/cart/cart/cart.js            |  6 +++---
 pages/goods/goodsInfo/goodsInfo.js | 43 +++++++++++++++++++++++++++++++++++++------
 2 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index c33ea82..a082408 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -695,7 +695,7 @@ Page({
               })
 
               if (is_g_prom) {
-                await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + item.goods_id + "/1" + "/" + getApp().globalData.user_id, {}).then(res => {
+                await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromListNew/" + os.stoid + "/" + item.goods_id + "/1" + "/" + getApp().globalData.user_id, {}).then(res => {
                   if (res.data.code == 0) {
                     var r_data = res.data.data;
                     if (!r_data.promGoodsLists) {
@@ -1169,7 +1169,7 @@ Page({
     let updata1 = {
       id: item.id,
       prom_type: 0,
-      prom_id: item.prom_id,
+      prom_id: 0,
       store_id: os.stoid,
       user_id: getApp().globalData.userInfo.user_id
     };
@@ -4379,7 +4379,7 @@ Page({
               good_url = "/packageC/pages/presell/goodsInfo/goodsInfo?goods_id=" + gd + "&prom_id=" + item.act_id
               break;
             default:
-              good_url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + gd + "&prom_id=" + item.act_id + "&prom_type=1";
+              good_url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + gd + "&prom_id=" + item.act_id + "&prom_type="+item.prom_type;
               break
           }
         }
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 13be7a6..dc3db48 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -1992,11 +1992,16 @@ Page({
     //if (this.data.data.goods.is_virtual) return this.buyVirtualGoods(d);
     if ("add" == t.currentTarget.dataset.action) {
 
-      if (th.data.prom_goods && !th.data.sele_g.whsle_id) {
+      if (newd.prom_type==0 && th.data.prom_goods && !th.data.sele_g.whsle_id) {
         newd.prom_type = 3;
         newd.prom_id = th.data.prom_goods[0].prom_id;
       }
 
+      if( [3,5,10].indexOf(newd.prom_type)>-1){
+        newd.prom_type=0;
+        newd.prom_id=0;
+      }
+
       //----先看会员在购物车中是否加入了该商品-----
       i.get("/api/weshop/cart/page", {
         data: {
@@ -2004,14 +2009,25 @@ Page({
           user_id: oo.user_id,
           goods_id: a,
           pick_id: e.data.sto_sele_id,
-          state: 0
+          state: 0,
         },
         success: function (re) {
 
+          //-- 判断活动是不是一样 --
+          var item=null;
           //-------如果购物车中有相关的数据---------
           if (re.data.data.total > 0) {
 
-            var item = re.data.data.pageData[0];
+            for (var i=0; i<re.data.data.pageData.length; i++) {
+              if(th.check_is_like(re.data.data.pageData[i],newd)) continue;
+              item=re.data.data.pageData[i];
+              break;
+
+            }
+          }
+
+          if(item){
+            item = re.data.data.pageData[0];
 
             //判断数量，要看下购物车中有没有该商品
             if (CanOutQty) {
@@ -2066,9 +2082,7 @@ Page({
                 th.closeSpecModal();
               }
             });
-          } else {
-
-
+          }else {
             i.post("/api/weshop/cart/save", {
               data: newd,
               success: function (t) {
@@ -2193,6 +2207,18 @@ Page({
     }
   },
 
+  //因为在购物车  普通商品和 优惠促销，搭配购，组合购 阶梯购是一样的
+  check_is_like(e,newd){
+      if(e.prom_type ==newd.prom_type) return true;
+      if(e.prom_type==0){
+         if([3,5,7,10].indexOf(newd.prom_type)>-1) return true;
+      }
+      if(newd.prom_type==0){
+        if([3,5,7,10].indexOf(e.prom_type)>-1) return true;
+      }
+      return false;
+  },
+
 
   //----------购买虚拟商品------
   buyVirtualGoods: function (e) {
@@ -7511,6 +7537,11 @@ Page({
 
   //-- 检验商品的活动情况 --
   check_gd_prom_new: function (func) {
+
+    if([1,2,4,6,8,9].indexOf(parseInt(this.data.prom_type))>-1 ){
+      func(); return false;
+    }
+
     var th = this;
     var user_id = getApp().globalData.user_id;
     if (!user_id) user_id = 0;
--
libgit2 0.21.4