订单促销的优化

yvan.ni
1 parent 5eb61220
Showing 11 changed files with 462 additions and 41 deletions
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml
packageC/pages/presell/cart/cart.js
packageC/pages/presell/cart/cart2.js
packageC/pages/presell/cart/cart2.wxml
packageE/pages/cart/cart2/cart2.js
packageE/pages/cart/cart2_inte/cart2_inte.js
packageE/pages/cart/cart2_pt/cart2_pt.js
packageE/pages/cart/cart_wk/cart_wk.js
packageG/pages/user/order_detail/order_detail.js
pages/user/order_list/order_list.js
@@ -80,6 +80,13 @@ Page({
     bconfig: null,
     showFold:true,
     template_id:[],
+
+    //-- 订单促销判断积累 ---2024-2-20
+    order_prom_map_ck: {},
+    //能不能使用订单促销
+    can_use_ord_prom:{},
+    //存储订单促销的取价，按照门店进行索引
+    show_ord_prom:{},
   },
@@ -513,6 +520,7 @@ Page({
         }
+        t.data.data.shop_price_y =  t.data.data.shop_price;
         t.data.data.shop_price = gg.goods_price;
         //--如果是普通购买的时候--
         if (gg.is_normal == 1) {
@@ -569,7 +577,10 @@ Page({
           }
+          t.data.data.goods_price=th.data.param.goods_price;
+          //用深拷贝把商品缓存起来，方便后面使用
+          th.data.old_bn_goods=ut.deep_cp(t.data.data);
           th.setData({
             bn_goods: t.data.data,
@@ -642,6 +653,9 @@ Page({
               }
+              t.data.data.goods_price=th.data.param.goods_price;
+              //用深拷贝把商品缓存起来，方便后面使用
+              th.data.old_bn_goods=ut.deep_cp(t.data.data);
               th.setData({
                 bn_goods: t.data.data,
@@ -651,7 +665,6 @@ Page({
                 bn_exp_type: et
               });
-
               //计算价格
               th.calculatePrice2();
             }
@@ -842,7 +855,9 @@ Page({
     //-----------计算商品总价--------------
     //var allpice = th.data.param.goods_price;
     var allpice = (th.data.act.group_price/100).toFixed(2);
-
+    if(th.data.can_use_ord_prom[th.data.bn_pick]){
+       allpice=th.data.param.goods_price*th.data.bn_goods.buynum;
+    }
     allpice = parseFloat(allpice).toFixed(2);
     var txt = "formData.all_price";
@@ -868,14 +883,18 @@ Page({
     var ord_prom=null;
     var o_condition=allpice;
     if(th.data.act.is_order_yh){
+      // await getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", {
+      //   data: { store_id: os.stoid, orderAmount: o_condition, user_id: getApp().globalData.user_id }
+      // }).then(res => {
+      //   if (res.data.code == 0) {
+      //     ord_prom = res.data.data;
+      //   }
+      // })
+
+      th.set_by_now_ord_prom(th.data.bn_goods);
+      th.data.order_prom_map_ck[th.data.bn_pick].goods_price_all=o_condition;
+      ord_prom=await th.get_cur_ord_prom(th.data.bn_pick);
-      await getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", {
-        data: { store_id: os.stoid, orderAmount: o_condition, user_id: getApp().globalData.user_id }
-      }).then(res => {
-        if (res.data.code == 0) {
-          ord_prom = res.data.data;
-        }
-      })
     }
@@ -964,7 +983,7 @@ Page({
             title: "物流配置未启用物流公司", icon: 'none', duration: 2000
           })
           //th.setData({ show_submit:0, });
-          th.setData({show_submit:1, submit: 0,same_ok:0 })
+          th.setData({show_submit:1, submit: 0,same_ok:0,sub:0 })
           return false;
         }
@@ -996,7 +1015,7 @@ Page({
           wx.showToast({
             title: "计算物流错误", icon: 'none', duration: 2000
           })
-          th.setData({show_submit:1, submit: 0,same_ok:0 })
+          th.setData({show_submit:1, submit: 0,same_ok:0,sub:0 })
           return false;
         }
@@ -1289,7 +1308,7 @@ Page({
   // 提交订单前弹出确认对话框
   submitConfirm(e) {
     // is_show为0不显示温馨提示，为1显示温馨提示
-    if (this.data.param.is_show == 1) {
+    if (this.data.param.is_show == 1 && !this.data.can_use_ord_prom[this.data.bn_pick]) {
       wx.showModal({
         title: '温馨提示',
         content: this.data.param.alert,
@@ -1451,6 +1470,18 @@ Page({
       'prom_id': th.data.param.group_id, //促销活动id
     };
+
+    if(th.data.bn_goods.discount_field){
+      goods.discount_field=th.data.bn_goods.discount_field;
+    }
+
+    //如果有参与非实收的订单促销，那么就相当于是普通购买
+    if(th.data.can_use_ord_prom[th.data.bn_pick]){
+      goods.is_integral_normal=1;
+      goods.prom_type=0;
+      goods.prom_id=0;
+    }
+
     if (getApp().globalData.skinface_id) {
       goods.skinface_id = getApp().globalData.skinface_id;
     }
@@ -2085,9 +2116,146 @@ Page({
     th.calculatePrice2();
   },
+  //-- 获取订单促销的判断结构 --
+  set_by_now_ord_prom(item){
+    let pickid=this.data.bn_pick;
+    let order_prom_map_ck= this.data.order_prom_map_ck;
+    order_prom_map_ck[pickid]={
+      shop_price_all:0,   //手店价的累计
+      market_price_all:0, //市场价的累计
+      goods_price_all:0,  //实收价的累计
+      no_ord_price:0,    //要累计上不参与订单促销的金额
+      goodsList:[],
+    }
+
+    let pk_ord_map=order_prom_map_ck[pickid];
+    pk_ord_map.shop_price_all += item.shop_price_y * item.buynum;
+    pk_ord_map.market_price_all += item.goods_market_price * item.buynum;
+
+  },
+
+  //获取当前进行中订单促销，同时带入相应的金额判断订单促销是不是运行，同时订单促销的条件不是实收价判断的话，默认的时候，订单促销是不参与运算的
+  async get_cur_ord_prom(pickid) {
+    let ord_prom = null;
+    let order_prom_map_ck = this.data.order_prom_map_ck[pickid];
+    if(!order_prom_map_ck) return null;
+
+    //获取当前进行中的优惠促销
+    await getApp().request.promiseGet("/api/weshop/promorder/getPromOrder", {
+      data: {
+        store_id: os.stoid,
+        orderAmount: -1,  //-1为不判断金额条件
+        user_id: getApp().globalData.user_id
+      }
+    }).then(res => {
+      if (res.data.code == 0) {
+        ord_prom = res.data.data;
+      }
+    })
+
+    if (!ord_prom) return null;
+    //用于计算订单促销的金额
+    let calculate_price=0;
+
+    let txt1='show_ord_prom['+pickid+']';
+    //-- 此时判断活动的金额满足与否 --
+    switch (ord_prom.discount_field) {
+        //实收价的时候
+      case 0:
+        //要先还原
+        this.setData({
+          [txt1]: 0
+        });
+
+        if (ord_prom.money > order_prom_map_ck.goods_price_all){
+          return null;
+        }
+        break;
+        //手店价的时候
+      case 1:
+        if (ord_prom.money > order_prom_map_ck.shop_price_all){
+          //要先还原
+          this.setData({
+            [txt1]: 0
+          });
+          return null;
+        }
+        //要显示订单促销使用的按钮
+        this.setData({
+          [txt1]: 1
+        });
+        break;
+        //市场价的时候
+      case 2:
+        if (ord_prom.money > order_prom_map_ck.market_price_all){
+          //要先还原
+          this.setData({
+            [txt1]: 0
+          });
+          return null;
+        }
+        //要显示订单促销使用的按钮
+        this.setData({
+          [txt1]: 2
+        });
+        break;
+    }
+    //如果订单促销是不参与订单促销的，那么就直接返回null（订单促销不是实收价的时候）
+    if(ord_prom.discount_field>0 && !this.data.can_use_ord_prom[pickid]){
+      return null;
+    }
+    return ord_prom;
+  },
+
+  //立即购买的时候，点击订单促销的参与
+  set_can_use_ord_prom_now:function (e){
+
+    if(this.data.sub) return false;
+    this.setData({ sub: 1,same_ok:1 });
+    let pickid=this.data.bn_pick;
+    let txt = 'can_use_ord_prom[' + pickid + ']';
+    let can_use = this.data.can_use_ord_prom[pickid] ? this.data.can_use_ord_prom[pickid] : 0;
+    this.setData({
+      [txt]: !can_use
+    })
+    let th=this;
+    let good=th.data.bn_goods;
+    let param=th.data.param;
+    //如果有要参与订单促销的按钮点击后,要修改商品的价格
+    if(th.data.can_use_ord_prom[pickid]){
+      let discount_field=th.data.show_ord_prom[pickid];
+      switch (discount_field){
+        case 1:
+          good.shop_price=good.shop_price_y;
+          param.goods_price=good.shop_price_y;
+          break;
+        case 2:
+          good.shop_price=good.market_price;
+          param.goods_price=good.market_price;
+          break;
+      }
+      //-- 转成普通商品 ---
+      good.prom_type=0;
+      good.prom_id=0;
+      good.discount_field=discount_field;
+    }else{
+      good=ut.deep_cp(th.data.old_bn_goods);
+      param.goods_price=good.goods_price;
+    }
+
+    th.setData({
+      bn_goods:good,
+      param
+    })
+    wx.showLoading({
+      title: "处理中.",
+      mark:true
+    })
+    th.calculatePrice2()
+  }
 });
@@ -100,6 +100,14 @@
           <icon color="#f23030" size="16" type="info"></icon>{{order.store_prom}}
         </view>
+        <!-- 订单促销取价规则的优化 -->
+        <view class="set-mes" wx:if="{{show_ord_prom[bn_pick]}}">
+          <view class="use-item"  >
+            <icon bindtap='set_can_use_ord_prom_now' color="{{can_use_ord_prom[bn_pick]?'red':'gray'}}" size="16" type="success"></icon>
+            <view bindtap='set_can_use_ord_prom_now' class="yu_er">参与订单促销</view>
+          </view>
+        </view>
+
         <!--阶梯团是不显示的-->
         <block wx:if="{{bn_exp_type==0 && !is_default_logistics}}">
           <view class="use-item flex-space-between" wx:if="{{kt_type!=3 || is_normal==1}}">
@@ -2198,6 +2198,9 @@ Page({
                     }).then(res => {
                         if (res.data.code == 0) {
                             prom_ord = res.data.data;
+
+                            //如果订单促销的取价不是实收，清空订单促销
+                            if(prom_ord &&  prom_ord.discount_field>0) prom_ord=null;
                         }
                     })
@@ -134,7 +134,14 @@ Page({
         bconfig:null,
         showFold:true,
-        is_fwk:0  //-- 判断是不是服务卡项订单 --
+        is_fwk:0,  //-- 判断是不是服务卡项订单 --
+
+        //-- 订单促销判断积累 ---2024-2-20
+        order_prom_map_ck: {},
+        //能不能使用订单促销
+        can_use_ord_prom:{},
+        //存储订单促销的取价，按照门店进行索引
+        show_ord_prom:{},
       },
@@ -595,7 +602,7 @@ Page({
         });
     },
-    //-- 获取到服务卡项的详情 --
+    //-- 获取到商品的详情 --
     get_goods_detail(act, prelist,gg){
         var th = this;
         //--------如果goods_id一样，就是要立即购买-----
@@ -728,7 +735,10 @@ Page({
                 }
                 //这个位置要拿活动的预售价
+                t.data.data.shop_price_y = t.data.data.shop_price;
                 t.data.data.shop_price = prelist.presell_money;
+                th.data.old_bn_goods=ut.deep_cp(t.data.data);
+
                 th.setData({
                     bn_goods: t.data.data,
                     bn_pickname: gg.pick_name,
@@ -832,6 +842,7 @@ Page({
         // }
         th.setData({dis_btn:1})
+        this.data.submit=0;
         wx.showLoading({
             title: "处理中.",mask:true
@@ -901,14 +912,18 @@ Page({
                 //-- 判断订单优惠的叠加 --
                 var ord_prom=null;
                 var o_condition=allpice;
-                if (o_condition > 0 && th.data.act.is_useorderyh) {
-                    await getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", {
-                        data: { store_id: os.stoid, orderAmount: o_condition, user_id: getApp().globalData.user_id }
-                    }).then(res => {
-                        if (res.data.code == 0) {
-                            ord_prom = res.data.data;
-                        }
-                    })
+                if (th.data.act.is_useorderyh) {
+                    // await getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", {
+                    //     data: { store_id: os.stoid, orderAmount: o_condition, user_id: getApp().globalData.user_id }
+                    // }).then(res => {
+                    //     if (res.data.code == 0) {
+                    //         ord_prom = res.data.data;
+                    //     }
+                    // })
+
+                    th.set_by_now_ord_prom(th.data.bn_goods);
+                    th.data.order_prom_map_ck[bn_pick].goods_price_all=o_condition;
+                    ord_prom=await th.get_cur_ord_prom(bn_pick);
                 }
                 //-----------当地址不为空，且是物流时，计算物流费用,并同时商品不是优惠活动的包邮,同时商品购买时候，服务卡项购买不计算运费----------
@@ -1568,6 +1583,17 @@ Page({
                 'prom_id': th.data.bn_goods.prom_id,     //促销活动id
             };
+            if(th.data.bn_goods.discount_field){
+                goods.discount_field=th.data.bn_goods.discount_field;
+            }
+
+            //如果有参与非实收的订单促销，那么就相当于是普通购买
+            if(th.data.can_use_ord_prom[th.data.bn_pick]){
+                goods.is_integral_normal=1;
+            }
+
+
+
             if(getApp().globalData.skinface_id){
                 goods.skinface_id=getApp().globalData.skinface_id;
             }
@@ -3179,8 +3205,148 @@ Page({
             url= "/pages/goods/goodsInfo/goodsInfo?goods_id="+gid;
         }
         getApp().goto(url);
+    },
+
+
+    //-- 获取订单促销的判断结构 --
+    set_by_now_ord_prom(item){
+        let pickid=this.data.bn_pick;
+        let order_prom_map_ck= this.data.order_prom_map_ck;
+        order_prom_map_ck[pickid]={
+            shop_price_all:0,   //手店价的累计
+            market_price_all:0, //市场价的累计
+            goods_price_all:0,  //实收价的累计
+            no_ord_price:0,    //要累计上不参与订单促销的金额
+            goodsList:[],
+        }
+
+        let pk_ord_map=order_prom_map_ck[pickid];
+        pk_ord_map.shop_price_all += item.shop_price_y * item.buynum;
+        pk_ord_map.market_price_all += item.goods_market_price * item.buynum;
+
+    },
+
+    //获取当前进行中订单促销，同时带入相应的金额判断订单促销是不是运行，同时订单促销的条件不是实收价判断的话，默认的时候，订单促销是不参与运算的
+    async get_cur_ord_prom(pickid) {
+        let ord_prom = null;
+        let order_prom_map_ck = this.data.order_prom_map_ck[pickid];
+        if(!order_prom_map_ck) return null;
+
+        //获取当前进行中的优惠促销
+        await getApp().request.promiseGet("/api/weshop/promorder/getPromOrder", {
+            data: {
+                store_id: os.stoid,
+                orderAmount: -1,  //-1为不判断金额条件
+                user_id: getApp().globalData.user_id
+            }
+        }).then(res => {
+            if (res.data.code == 0) {
+                ord_prom = res.data.data;
+            }
+        })
+
+        if (!ord_prom) return null;
+        //用于计算订单促销的金额
+        let calculate_price=0;
+
+        let txt1='show_ord_prom['+pickid+']';
+        //-- 此时判断活动的金额满足与否 --
+        switch (ord_prom.discount_field) {
+            //实收价的时候
+            case 0:
+                //要先还原
+                this.setData({
+                    [txt1]: 0
+                });
+
+                if (ord_prom.money > order_prom_map_ck.goods_price_all){
+                    return null;
+                }
+                break;
+            //手店价的时候
+            case 1:
+                if (ord_prom.money > order_prom_map_ck.shop_price_all){
+                    //要先还原
+                    this.setData({
+                        [txt1]: 0
+                    });
+                    return null;
+                }
+                //要显示订单促销使用的按钮
+                this.setData({
+                    [txt1]: 1
+                });
+                break;
+            //市场价的时候
+            case 2:
+                if (ord_prom.money > order_prom_map_ck.market_price_all){
+                    //要先还原
+                    this.setData({
+                        [txt1]: 0
+                    });
+                    return null;
+                }
+                //要显示订单促销使用的按钮
+                this.setData({
+                    [txt1]: 2
+                });
+                break;
+        }
+        //如果订单促销是不参与订单促销的，那么就直接返回null（订单促销不是实收价的时候）
+        if(ord_prom.discount_field>0 && !this.data.can_use_ord_prom[pickid]){
+            return null;
+        }
+        return ord_prom;
+    },
+
+    //立即购买的时候，点击订单促销的参与
+    set_can_use_ord_prom_now:function (e){
+
+        if(this.data.submit || this.data.dis_btn) return false;
+        this.data.submit=1;
+
+        let pickid=this.data.bn_pick;
+        let txt = 'can_use_ord_prom[' + pickid + ']';
+        let can_use = this.data.can_use_ord_prom[pickid] ? this.data.can_use_ord_prom[pickid] : 0;
+        this.setData({
+            [txt]: !can_use
+        })
+
+        let th=this;
+        let good=th.data.bn_goods;
+
+        //如果有要参与订单促销的按钮点击后,要修改商品的价格
+        if(th.data.can_use_ord_prom[pickid]){
+            let discount_field=th.data.show_ord_prom[pickid];
+            switch (discount_field){
+                case 1:
+                    good.shop_price=good.shop_price_y;
+                    break;
+                case 2:
+                    good.shop_price=good.market_price;
+                    break;
+            }
+            //-- 转成普通商品 ---
+            good.prom_type=0;
+            good.prom_id=0;
+            good.integral=0;
+            good.discount_field=discount_field;
+
+        }else{
+            good=ut.deep_cp(th.data.old_bn_goods);
+        }
+
+        th.setData({
+            bn_goods:good
+        })
+        wx.showLoading({
+            title: "处理中.",
+            mark:true
+        })
+        th.calculatePrice2()
     }
+
 });
@@ -150,6 +150,15 @@
 					<icon color="#f23030" size="16" type="info"></icon>{{order.store_prom}}
 				</view>
+				<!-- 订单促销取价规则的优化 -->
+				<view class="set-mes" wx:if="{{show_ord_prom[bn_pick]}}">
+					<view class="use-item"  >
+						<icon bindtap='set_can_use_ord_prom_now' color="{{can_use_ord_prom[bn_pick]?'red':'gray'}}" size="16" type="success"></icon>
+						<view bindtap='set_can_use_ord_prom_now' class="yu_er">参与订单促销</view>
+					</view>
+				</view>
+
+
 				<view class="xc-coupon-frame flex-center" data-bn="1" bindtap="open_coupon_list" data-pickid="{{bn_pick}}" hidden="{{is_fwk}}"
 					  wx:if="{{(selected_quan_list && selected_quan_list.length>0) || get_by_quan_list!=null}}">
 					<view class="work-frame flex-space-between">
@@ -1085,16 +1085,16 @@ Page({
         if (gdlist && gdlist.length) {
           //查找商品item1有没有在gdlist中,就要把商品的prom_type清理0
           let f_idx = gdlist.findIndex(function (ele) {
-            return ele.id == item1.id
+            return ele.id == item.id
           });
           if (f_idx != -1) {
             //开始变换商品的价格显示
-            switch (th.data.show_ord_prom[item1.pick_id]) {
+            switch (th.data.show_ord_prom[item.pick_id]) {
               case 1:
-                carr[i].goods_price = item1.shop_price;
+                carr[i].goods_price = item.shop_price;
                 break;
               case 2:
-                carr[i].goods_price = item1.goods_market_price;
+                carr[i].goods_price = item.goods_market_price;
                 break;
             }
@@ -1108,7 +1108,7 @@ Page({
                 break;
             }
             carr[i].prom_type = 0;
-            carr[i].discount_field = th.data.show_ord_prom[item1.pick_id];
+            carr[i].discount_field = th.data.show_ord_prom[item.pick_id];
           }
         }
       }
@@ -757,7 +757,7 @@ Page({
     //---如果有选择优惠券的情况下---
     var quan_price = 0, bn_pick = th.data.bn_pick;
-    if (condition > 0 && th.data.bn_is_order_yh && !th.data.bn_goods.whsle_id) {
+    if (th.data.bn_is_order_yh && !th.data.bn_goods.whsle_id) {
       // await getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", {
       //   data: { store_id: os.stoid, orderAmount: condition, user_id: getApp().globalData.user_id }
       // }).then(res => {
@@ -855,7 +855,7 @@ Page({
             // })
             th.set_by_now_ord_prom(th.data.bn_goods);
-            th.data.order_prom_map_ck[bn_pick].goods_price_all=condition;
+            th.data.order_prom_map_ck[bn_pick].goods_price_all=o_condition;
             ord_prom=await th.get_cur_ord_prom(bn_pick);
         }
@@ -1484,6 +1484,15 @@ Page({
       'prom_id': th.data.bn_goods.prom_id,     //促销活动id
     };
+    if(th.data.bn_goods.discount_field){
+      goods.discount_field=th.data.bn_goods.discount_field;
+    }
+
+    //如果有参与非实收的订单促销，那么就相当于是普通购买
+    if(th.data.can_use_ord_prom[th.data.bn_pick]){
+      goods.is_integral_normal=1;
+    }
+
     if (getApp().globalData.skinface_id) {
       goods.skinface_id = getApp().globalData.skinface_id;
     }
@@ -539,6 +539,9 @@ Page({
       }).then(res => {
         if (res.data.code == 0) {
           ord_prom = res.data.data;
+
+          //如果订单促销的取价不是实收，清空订单促销
+          if(prom_ord && prom_ord.discount_field>0) prom_ord=null;
         }
       })
     }
@@ -1157,13 +1157,39 @@ Page({
                     //-- 优惠促销的时候控制取价规则 --
                     // gg.prom_type!=3 && gg.prom_type!=10 同时商品不是普通购买的时候，又参与优惠促销，阶梯促销
                     if((gg.prom_type!=3 && gg.prom_type!=10)  || gg.discount_field==undefined || gg.discount_field==0  ) {
-                        if (card_field && gg[card_field] > 0) {
-                            if (good.goods_price != gg[card_field] && good.offline_cut <= 0) isok = 0;
-                            if (good.goods_price > gg[card_field] && good.offline_cut > 0) isok = 0;  //如果线下价格比较贵，则不通过
-                        } else {
-                            if (good.goods_price != gg.shop_price && good.offline_cut <= 0) isok = 0;
-                            if (good.goods_price > gg.shop_price && good.offline_cut > 0) isok = 0; //如果线下价格比较贵，则不通过
+
+                        //判断一下活动是不是有参与订单促销,并且订单促销的活动是不是实收取价,2024-2-23
+                        let ordprom_price_type=0;
+                        if(order.order_prom_id && good.prom_type==0){
+                            let p_rs= await getApp().request.promiseGet("/api/weshop/promorder/get/"+os.stoid+"/"+order.order_prom_id, {});
+                            if(p_rs && p_rs.data.code==0 && p_rs.data.data){
+                                let ord_p=p_rs.data.data;
+                                if(ord_p && ord_p.discount_field>0){
+                                    ordprom_price_type=ord_p.discount_field
+                                }
+                            }
+                        }
+                        if(ordprom_price_type>0){
+                            //-- 看一下订单促销的取价规则 --
+                            switch (ordprom_price_type){
+                                case 1:
+                                    if (good.goods_price != gg.shop_price) isok = 0;
+                                    break;
+                                case 2:
+                                    if (good.goods_price != gg.market_price) isok = 0;
+                                    break;
+                            }
+
+                        }else {
+                            if (card_field && gg[card_field] > 0) {
+                                if (good.goods_price != gg[card_field] && good.offline_cut <= 0) isok = 0;
+                                if (good.goods_price > gg[card_field] && good.offline_cut > 0) isok = 0;  //如果线下价格比较贵，则不通过
+
+                            } else {
+                                if (good.goods_price != gg.shop_price && good.offline_cut <= 0) isok = 0;
+                                if (good.goods_price > gg.shop_price && good.offline_cut > 0) isok = 0; //如果线下价格比较贵，则不通过
+                            }
                         }
                     }else{
                         if(good.prom_type==3 && good.prom_type==10){
@@ -1446,14 +1446,43 @@ Page({
           //-- 优惠促销的时候控制取价规则 --
           // gg.prom_type!=3 && gg.prom_type!=10 同时商品不是普通购买的时候，又参与优惠促销，阶梯促销
           if((gg.prom_type!=3 && gg.prom_type!=10) || gg.discount_field==undefined || gg.discount_field==0  ){
-              if (card_field && gg[card_field] > 0) {
-                if (good.goods_price != gg[card_field] && good.offline_cut <= 0) isok = 0;
-                if (good.goods_price > gg[card_field] && good.offline_cut > 0) isok = 0;  //如果线下价格比较贵，则不通过
-              } else {
-                if (good.goods_price != gg.shop_price && good.offline_cut <= 0) isok = 0;
-                if (good.goods_price > gg.shop_price && good.offline_cut > 0) isok = 0; //如果线下价格比较贵，则不通过
+              //判断一下活动是不是有参与订单促销,并且订单促销的活动是不是实收取价,2024-2-23
+              let ordprom_price_type=0;
+              if(order.order_prom_id && good.prom_type==0){
+                  let p_rs= await getApp().request.promiseGet("/api/weshop/promorder/get/"+os.stoid+"/"+order.order_prom_id, {});
+                  if(p_rs && p_rs.data.code==0 && p_rs.data.data){
+                      let ord_p=p_rs.data.data;
+                      if(ord_p && ord_p.discount_field>0){
+                        ordprom_price_type=ord_p.discount_field
+                      }
+                  }
+              }
+              if(ordprom_price_type>0){
+                //-- 看一下订单促销的取价规则 --
+                switch (ordprom_price_type){
+                  case 1:
+                    if (good.goods_price != gg.shop_price) isok = 0;
+                    break;
+                  case 2:
+                    if (good.goods_price != gg.market_price) isok = 0;
+                    break;
+                }
+
+              }else{
+                if (card_field && gg[card_field] > 0) {
+                  if (good.goods_price != gg[card_field] && good.offline_cut <= 0) isok = 0;
+                  if (good.goods_price > gg[card_field] && good.offline_cut > 0) isok = 0;  //如果线下价格比较贵，则不通过
+
+                } else {
+                  if (good.goods_price != gg.shop_price && good.offline_cut <= 0) isok = 0;
+                  if (good.goods_price > gg.shop_price && good.offline_cut > 0) isok = 0; //如果线下价格比较贵，则不通过
+                }
               }
+
+
+
+
           }else{
             if(good.prom_type==3 || good.prom_type==10 ){