From 36f754430186861da5456e4a475a46158d03dff6 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Thu, 9 May 2024 16:11:27 +0800
Subject: [PATCH] 再来一单不计算购物车中的数量

---
 packageG/pages/user/order_detail/order_detail.js | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------
 pages/user/order_list/order_list.js              | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
 2 files changed, 105 insertions(+), 71 deletions(-)

diff --git a/packageG/pages/user/order_detail/order_detail.js b/packageG/pages/user/order_detail/order_detail.js
index 08ba1af..0f2300f 100644
--- a/packageG/pages/user/order_detail/order_detail.js
+++ b/packageG/pages/user/order_detail/order_detail.js
@@ -505,7 +505,7 @@ Page({
             })
 
             var buyed_mum2 = goodsbuynum + good.goods_num;
-            if (buyed_mum2 > limit && limit > 0) {
+            if (buyed_mum2 > limit && limit > 0 && !good.is_gift) {
                 var content = gg.goods_name + '购买数量超出商品限购,请取消订单';
                 th.toast(content);
                 th.setData({ paying: 0 });
@@ -1151,6 +1151,8 @@ Page({
 
             //---如果是活动的时候---
             var prom = null, goodsinfo = good, th = this;
+
+            goodsinfo.prom_type=parseInt(goodsinfo.prom_type+'');
             if (goodsinfo.prom_type == 1) {
                 await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + goodsinfo.prom_id, {}).then(res => {
                     if (res.data.code == 0) {
@@ -1185,8 +1187,16 @@ Page({
                     }
                 })
             }
+
+            if(!prom && [1,2,4,6].includes(goodsinfo.prom_type)){
+                wx.showToast({ title: "未找到活动", icon: 'none', duration: 3000 });
+                th.setData({ paying: 0 });
+                return false;
+            }
+
             //----------如果有活动，并且在进行中，就不计算线下库存---------------
             if (prom) {
+
                 let c_type=parseInt(goodsinfo.prom_type+'');
                 var act_type='';
                 switch (c_type){
@@ -1207,13 +1217,20 @@ Page({
                 }
 
                 var now = ut.gettimestamp();
-                if (prom.is_end == 1 && prom.end_time < now) {
+                if (prom.is_end == 1 || prom.end_time < now) {
                     var content = goodsinfo.goods_name + '商品的活动已经结束,请取消订单'
                     th.toast(content);
                     th.setData({ paying: 0 });
                     return false;
                 }
 
+                if(prom.is_show==0){
+                    wx.showToast({ title: "活动未启用", icon: 'none', duration: 3000 });
+                    th.setData({ paying: 0 });
+                    return false;
+                }
+
+
                 buyed_mum2 = promgoodsbuynum + good.goods_num;
                 if (buyed_mum2 > prom.buy_limit && prom.buy_limit > 0) {
 
@@ -1904,23 +1921,23 @@ Page({
 				  
 				  //-- 看一下购物车上有多少商品 --
 				  var cart_num=0;				  
-				  await getApp().request.promiseGet("/api/weshop/cart/page", {				  	
-					 data: {
-						store_id: os.stoid,
-						user_id: getApp().globalData.user_id,
-						state:0, is_gift:0,
-						goods_id:good.goods_id,
-						pick_id: b_item.pickup_id
-					 }
-				  }).then(res=>{
-					  var num = 0;
-					  if(res.data.code==0 && res.data.data && res.data.data.pageData) {
-						  for (var i = 0; i < res.data.data.pageData.length; i++) {
-							  num += res.data.data.pageData[i].goods_num;
-						  }
-					  }
-					  cart_num=num;						 
-				  })
+				  // await getApp().request.promiseGet("/api/weshop/cart/page", {
+					//  data: {
+					// 	store_id: os.stoid,
+					// 	user_id: getApp().globalData.user_id,
+					// 	state:0, is_gift:0,
+					// 	goods_id:good.goods_id,
+					// 	pick_id: b_item.pickup_id
+					//  }
+				  // }).then(res=>{
+					//   var num = 0;
+					//   if(res.data.code==0 && res.data.data && res.data.data.pageData) {
+					// 	  for (var i = 0; i < res.data.data.pageData.length; i++) {
+					// 		  num += res.data.data.pageData[i].goods_num;
+					// 	  }
+					//   }
+					//   cart_num=num;
+				  // })
 				  		  
 				  var lock=0,plist=null;
 
@@ -2016,22 +2033,22 @@ Page({
 			  }else{
 				  //-- 看一下购物车上有多少商品 --
 				  var cart_num=0;				  
-				  await getApp().request.promiseGet("/api/weshop/cart/page", {				  	
-						 data: {
-							store_id: os.stoid,
-							user_id: getApp().globalData.user_id,
-							state:0, is_gift:0,
-							goods_id:good.goods_id			  					
-						 }
-				  }).then(res=>{
-						  var num = 0;
-						  if(res.data.code==0 && res.data.data && res.data.data.pageData) {
-							  for (var i = 0; i < res.data.data.pageData.length; i++) {
-								  num += res.data.data.pageData[i].goods_num;
-							  }
-						  }
-						  cart_num=num;						 
-				  })
+				  // await getApp().request.promiseGet("/api/weshop/cart/page", {
+					// 	 data: {
+					// 		store_id: os.stoid,
+					// 		user_id: getApp().globalData.user_id,
+					// 		state:0, is_gift:0,
+					// 		goods_id:good.goods_id
+					// 	 }
+				  // }).then(res=>{
+					// 	  var num = 0;
+					// 	  if(res.data.code==0 && res.data.data && res.data.data.pageData) {
+					// 		  for (var i = 0; i < res.data.data.pageData.length; i++) {
+					// 			  num += res.data.data.pageData[i].goods_num;
+					// 		  }
+					// 	  }
+					// 	  cart_num=num;
+				  // })
 
 				  if(good.store_count<=0){
 					  err_text+= good['goods_name']+"库存不足\n";
@@ -2087,7 +2104,7 @@ Page({
 				  									  
 				  //---- 要计算商品的限购 -----	  
 				  if(good['viplimited']>0){ 				  												  
-					  if(cart_num+buynum>good['viplimited']){
+					  if(cart_num+buynum>=good['viplimited']){
 						   err_text+= good['goods_name']+"超出限购\n";
 						   continue;
 					  }				  
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index f73b709..aecb20a 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -820,7 +820,7 @@ Page({
       })
 
       var buyed_mum2 = goodsbuynum + good.goods_num;
-      if (buyed_mum2 > limit && limit > 0) {
+      if (buyed_mum2 > limit && limit > 0  && !good.is_gift) {
         var content = gg.goods_name + '购买数量超出商品限购,请取消订单';
         th.toast(content);
         th.setData({ paying: 0 });
@@ -1480,6 +1480,8 @@ Page({
 
       //---如果是活动的时候---
       var prom = null, goodsinfo = good, th = this;
+
+      goodsinfo.prom_type=parseInt(goodsinfo.prom_type+'');
       if (goodsinfo.prom_type == 1) {
         await getApp().request.promiseGet("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + goodsinfo.prom_id, {}).then(res => {
           if (res.data.code == 0) {
@@ -1514,8 +1516,16 @@ Page({
           }
         })
       }
+
+      if(!prom && [1,2,4,6].includes(goodsinfo.prom_type)){
+        wx.showToast({ title: "未找到活动", icon: 'none', duration: 3000 });
+        th.setData({ paying: 0 });
+        return false;
+      }
+
       //----------如果有活动，并且在进行中，就不计算线下库存---------------
       if (prom) {
+
         let c_type=parseInt(goodsinfo.prom_type+'');
         var act_type='';
         switch (c_type){
@@ -1537,13 +1547,20 @@ Page({
         }
 
         var now = ut.gettimestamp();
-        if (prom.is_end == 1 && prom.end_time < now) {
+        if (prom.is_end == 1 || prom.end_time < now) {
           var content = goodsinfo.goods_name + '商品的活动已经结束,请取消订单'
           th.toast(content);
           th.setData({ paying: 0 });
           return false;
         }
 
+        if(prom.is_show==0){
+          wx.showToast({ title: "活动未启用", icon: 'none', duration: 3000 });
+          th.setData({ paying: 0 });
+          return false
+        }
+
+
         buyed_mum2 = promgoodsbuynum + good.goods_num;
         if (buyed_mum2 > prom.buy_limit && prom.buy_limit > 0) {
 
@@ -2231,23 +2248,23 @@ Page({
 
         //-- 看一下购物车上有多少商品 --
         var cart_num = 0;
-        await getApp().request.promiseGet("/api/weshop/cart/page", {
-          data: {
-            store_id: os.stoid,
-            user_id: getApp().globalData.user_id,
-            state: 0, is_gift: 0,
-            goods_id: good.goods_id,
-            pick_id: b_item.pickup_id
-          }
-        }).then(res => {
-          var num = 0;
-          if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
-            for (var i = 0; i < res.data.data.pageData.length; i++) {
-              num += res.data.data.pageData[i].goods_num;
-            }
-          }
-          cart_num = num;
-        })
+        // await getApp().request.promiseGet("/api/weshop/cart/page", {
+        //   data: {
+        //     store_id: os.stoid,
+        //     user_id: getApp().globalData.user_id,
+        //     state: 0, is_gift: 0,
+        //     goods_id: good.goods_id,
+        //     pick_id: b_item.pickup_id
+        //   }
+        // }).then(res => {
+        //   var num = 0;
+        //   if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
+        //     for (var i = 0; i < res.data.data.pageData.length; i++) {
+        //       num += res.data.data.pageData[i].goods_num;
+        //     }
+        //   }
+        //   cart_num = num;
+        // })
 
         var lock = 0, plist = null;
 
@@ -2340,22 +2357,22 @@ Page({
 
         //-- 看一下购物车上有多少商品 --
         var cart_num = 0;
-        await getApp().request.promiseGet("/api/weshop/cart/page", {
-          data: {
-            store_id: os.stoid,
-            user_id: getApp().globalData.user_id,
-            state: 0, is_gift: 0,
-            goods_id: good.goods_id
-          }
-        }).then(res => {
-          var num = 0;
-          if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
-            for (var i = 0; i < res.data.data.pageData.length; i++) {
-              num += res.data.data.pageData[i].goods_num;
-            }
-          }
-          cart_num = num;
-        })
+        // await getApp().request.promiseGet("/api/weshop/cart/page", {
+        //   data: {
+        //     store_id: os.stoid,
+        //     user_id: getApp().globalData.user_id,
+        //     state: 0, is_gift: 0,
+        //     goods_id: good.goods_id
+        //   }
+        // }).then(res => {
+        //   var num = 0;
+        //   if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
+        //     for (var i = 0; i < res.data.data.pageData.length; i++) {
+        //       num += res.data.data.pageData[i].goods_num;
+        //     }
+        //   }
+        //   cart_num = num;
+        // })
 
 
         if (good.store_count <= 0) {
--
libgit2 0.21.4