wxd / MShopWeApp

Commit 23f564f05531565d10025627eafed97c8e013ae5

Authored by 后端研发-苏明海
2 parents 74de3b79 87460360

Merge branch 'dev' into 'test' 

秒杀活动在未开始的时候，判断组合购

See merge request !1173
Inline Side-by-side
Showing 1 changed file with 110 additions and 62 deletions
pages/goods/goodsInfo/goodsInfo.js
  View file @23f564f
... ... @@ -7157,88 +7157,136 @@ Page({
7157 7157 },
7158 7158  
7159 7159 //---检查有没有优惠活动---
7160   - check_is_youhui: function (gid, is_nor) {
  7160 + check_is_youhui:async function (gid, is_nor) {
7161 7161 var th = this;
7162 7162 var user_id = getApp().globalData.user_id;
7163 7163 if (!user_id) user_id = 0;
7164 7164  
7165   - //调用接口判断订单优惠，
7166   - getApp().request.get("/api/weshop/goods/getGoodsPromListNew1/" + os.stoid + "/" + gid + "/0" + "/" + user_id, {
7167   - success: async function (res) {
7168   - if (res.data.code == 0 && res.data.data) {
7169   - var r_data = res.data.data;
7170   - var max = 0, min = 0;
  7165 + //普通购买的时候，重新算一下组合购有没有
  7166 + if(is_nor){
  7167 + var arr3=null;
  7168 + var url = '/api/weshop/activitylist/listGoodActInfo2New';
  7169 + var req_d = {
  7170 + "store_id": os.stoid,
  7171 + "goods_id": this.data.gid,
  7172 + "user_id": user_id,
  7173 + }
  7174 + await getApp().request.promiseGet(url, {
  7175 + data: req_d,
  7176 + }).then(e=>{
  7177 + if (e.data.code == 0 && e.data.data && e.data.data.length > 0) {
  7178 + var arr = e.data.data;
  7179 + if(arr.length){
  7180 + arr3 = arr.filter(function (e) {
  7181 + return e.s_time < ut.gettimestamp() && e.prom_type==7;
  7182 + })
  7183 + }
  7184 + }
  7185 + })
7171 7186  
  7187 + if(arr3 && arr3.length>0){
  7188 + //获取活动信息
  7189 + var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" +arr3[0].act_id + "/" + getApp().globalData.user_id;
  7190 + await getApp().request.promiseGet(url, {
7172 7191  
7173   - //暂时积分够 不和 优惠，阶梯重叠
7174   - if(th.data.zh_act){
7175   - r_data.collocationList=null;
7176   - r_data.ladderLists=null;
7177   - r_data.promGoodsLists=null;
  7192 + }).then(e=>{
  7193 + if (e.data.code == 0 && e.data.data) {
  7194 + if (ut.gettimestamp() < e.data.data.start_time) {
  7195 + return false;
  7196 + }
  7197 + if (e.data.data.is_end == 0 && ut.gettimestamp() < e.data.data.end_time) {
  7198 + //-- 获取商品列表 --
  7199 + th.data.zh_act=e.data.data;
  7200 + th.getUserBuyPromNum(e.data.data.id)
7178 7201 }
  7202 + }
  7203 + })
  7204 + }
  7205 + }
7179 7206  
7180   - if (r_data.collocationList) {
7181   - for (var i in r_data.collocationList) {
7182   - if (max == 0) max = r_data.collocationList[i].price;
7183   - if (min == 0) min = r_data.collocationList[i].price;
7184 7207  
7185   - if (max < parseFloat(r_data.collocationList[i].price)) max = r_data.collocationList[i].price;
7186   - if (min > parseFloat(r_data.collocationList[i].price)) min = r_data.collocationList[i].price;
7187   - }
7188   - r_data.collocationPromList.max = (max + th.data.data.shop_price).toFixed(2);
7189   - r_data.collocationPromList.min = (min + th.data.data.shop_price).toFixed(2);
  7208 + //调用接口判断订单优惠，
  7209 + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromListNew1/" + os.stoid + "/" + gid + "/0" + "/" + user_id, {
  7210 + }).then(async res=>{
  7211 + if (res.data.code == 0 && res.data.data) {
  7212 + var r_data = res.data.data;
  7213 + var max = 0, min = 0;
  7214 + //暂时积分够 不和 优惠，阶梯重叠
  7215 + if(th.data.zh_act){
  7216 + r_data.collocationList=null;
  7217 + r_data.ladderLists=null;
  7218 + r_data.promGoodsLists=null;
  7219 + }
7190 7220  
7191   - //如果有搭配促销先不和 阶梯促销和优惠测序重合,做到后台可以重合
7192   - r_data.ladderLists=null;
7193   - r_data.promGoodsLists=null;
7194   - }
  7221 + if (r_data.collocationList) {
  7222 + for (var i in r_data.collocationList) {
  7223 + if (max == 0) max = r_data.collocationList[i].price;
  7224 + if (min == 0) min = r_data.collocationList[i].price;
7195 7225  
  7226 + if (max < parseFloat(r_data.collocationList[i].price)) max = r_data.collocationList[i].price;
  7227 + if (min > parseFloat(r_data.collocationList[i].price)) min = r_data.collocationList[i].price;
  7228 + }
  7229 + r_data.collocationPromList.max = (max + th.data.data.shop_price).toFixed(2);
  7230 + r_data.collocationPromList.min = (min + th.data.data.shop_price).toFixed(2);
7196 7231  
7197   - if (r_data.ladderLists) {
7198   - var act_id = r_data.ladderLists[0].form_id;
7199   - //-- 判断会员能不能参与阶梯促销 --
7200   - await getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + user_id + "/" + act_id, {}).then(res => {
7201   - if (res.data.code == 0 && res.data.data) {
7202   - var prom_content = "";
  7232 + //如果有搭配促销先不和 阶梯促销和优惠测序重合,做到后台可以重合
  7233 + r_data.ladderLists=null;
  7234 + r_data.promGoodsLists=null;
  7235 + }
7203 7236  
7204   - //暂定优惠促销还不能重叠
7205   - if(res.data.data.good_object==0 && (r_data.promGoodsLists || th.data.zh_act)){
7206   - return false;
7207   - }
7208 7237  
7209   - if(res.data.data.good_object==1){
7210   - r_data.promGoodsLists=null;
7211   - }
  7238 + if (r_data.ladderLists) {
  7239 + var act_id = r_data.ladderLists[0].form_id;
  7240 + //-- 判断会员能不能参与阶梯促销 --
  7241 + await getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + user_id + "/" + act_id, {}).then(res => {
  7242 + if (res.data.code == 0 && res.data.data) {
  7243 + var prom_content = "";
7212 7244  
7213   - for (let jj in r_data.ladderLists) {
7214   - if (r_data.ladderLists[jj].discount == 10) {
7215   - prom_content += "第" + (parseInt(jj) + 1) + "件原价，";
7216   - } else {
7217   - prom_content += "第" + (parseInt(jj) + 1) + "件" + r_data.ladderLists[jj].discount + "折，";
7218   - }
7219   - }
7220   - prom_content = ut.sub_last(prom_content);
7221   - th.data.prom_type = 10;
7222   - th.data.prom_id = act_id;
7223   - th.setData({
7224   - jieti_prom: prom_content,
7225   - ladder_act_id: act_id
7226   - })
  7245 + //暂定优惠促销还不能重叠
  7246 + if(res.data.data.good_object==0 && (r_data.promGoodsLists || th.data.zh_act)){
  7247 + return false;
  7248 + }
  7249 +
  7250 + if(res.data.data.good_object==1){
  7251 + r_data.promGoodsLists=null;
  7252 + }
  7253 +
  7254 + for (let jj in r_data.ladderLists) {
  7255 + if (r_data.ladderLists[jj].discount == 10) {
  7256 + prom_content += "第" + (parseInt(jj) + 1) + "件原价，";
  7257 + } else {
  7258 + prom_content += "第" + (parseInt(jj) + 1) + "件" + r_data.ladderLists[jj].discount + "折，";
7227 7259 }
  7260 + }
  7261 + prom_content = ut.sub_last(prom_content);
  7262 + th.data.prom_type = 10;
  7263 + th.data.prom_id = act_id;
  7264 + th.setData({
  7265 + jieti_prom: prom_content,
  7266 + ladder_act_id: act_id
7228 7267 })
7229 7268 }
  7269 + })
  7270 + }
7230 7271  
7231 7272  
7232   -
7233   - th.setData({
7234   - order_prom: r_data.promOrder,
7235   - collocationGoods: r_data.collocationPromList,
7236   - prom_goods: r_data.promGoodsLists,
7237   - })
7238   - th.is_show_more_buy();
7239   - }
  7273 + //普通购买不在界面显示
  7274 + if(is_nor){
  7275 + th.data.collocationGoods=r_data.collocationPromList;
  7276 + th.data.prom_goods=r_data.prom_goods;
  7277 + }else{
  7278 + th.setData({
  7279 + order_prom: r_data.promOrder,
  7280 + collocationGoods: r_data.collocationPromList,
  7281 + prom_goods: r_data.promGoodsLists,
  7282 + })
7240 7283 }
7241   - })
  7284 + th.is_show_more_buy();
  7285 + }
  7286 + })
  7287 +
  7288 +
  7289 +
7242 7290  
7243 7291 },
7244 7292  
... ... @@ -7461,7 +7509,7 @@ Page({
7461 7509 }
7462 7510 })
7463 7511 }
7464   -
  7512 +
7465 7513 if(!is_ok) return false;
7466 7514 if(r_data.promGoodsLists){
7467 7515 obj = {
... ...