使用优惠券的优化

yvan.ni
1 parent d2644598
Showing 5 changed files with 26 additions and 13 deletions
packageC/pages/presell/cart/cart.js
packageC/pages/presell/cart/cart2.js
packageE/pages/cart/cart2/cart2.js
packageE/pages/cart/cart2_pt/cart2_pt.js
packageE/pages/cart/cart_wk/cart_wk.js
@@ -2234,6 +2234,7 @@ Page({
  
         if(th.data.ckeck_quan_price>=th.data.check_quan_price_scj){
           quan_rq.BuyPosSum=th.data.ckeck_quan_price;
+          quan_rq.PosWareIds=encodeURIComponent(th.data.check_quan_ware_list);
         }
  
         app.request.time_limit_get(6, url, {
@@ -3314,6 +3314,7 @@ Page({
  
         if(th.data.ckeck_quan_price>=th.data.check_quan_price_scj){
           quan_req.BuyPosSum=th.data.ckeck_quan_price
+          quan_req.PosWareIds=encodeURIComponent(th.data.check_quan_ware_list)
         }
  
         app.request.time_limit_get(6, url, {
@@ -5549,15 +5549,14 @@ Page({
  
         //房间号的ids
         var room_ids = "";
-
-        //-- 把券的钱，写入从表 ---
-        if (t_item.quan_youhui_list && t_item.coupon_price) {
-          for (var kk in t_item.quan_youhui_list) {
-            var you_item = t_item.quan_youhui_list[kk];
-            //-- 对券的价格进行平摊 --
-            await th.split_set_goods_quanprice(you_item, t_item);
-          }
-        }
+        //-- 把券的钱，写入从表,前面已经摊了一次了，不要再摊第二次 ---
+        // if (t_item.quan_youhui_list && t_item.coupon_price) {
+        //   for (var kk in t_item.quan_youhui_list) {
+        //     var you_item = t_item.quan_youhui_list[kk];
+        //     //-- 对券的价格进行平摊 --
+        //     await th.split_set_goods_quanprice(you_item, t_item);
+        //   }
+        // }
  
         //看一下有没有活动不参与的，要记录到order_more表中
         let can_cx = t_item.show_can_cx;
@@ -7291,7 +7290,7 @@ Page({
  
         //如果实收价等于市场价的死后
         if(real_price>=gd.goods_market_price){
-             ck_price_scj+= gd.goods_market_price * gd.goods_num;  //市场价的优化
+             ck_price_scj+= real_price * gd.goods_num;  //市场价的优化
              if(!arr[ind].scj_arr) arr[ind].scj_arr=[];  //组装市场价的数组，如果优惠券使用了零售价的券，就要带入使用券的接口
              arr[ind].scj_arr.push({
                 sum_price:real_price * gd.goods_num,
@@ -7375,8 +7374,15 @@ Page({
         pageSize: 100
       }
  
-      if(arr[ind].scj_arr){
+      if(arr[ind].scj_arr && arr[ind].scj_arr.length ){
         quan_req.BuyPosSum=ck_price_scj  //优化获取市场价的优惠券
+        
+        let PosWareIds=[];
+        for (let is = 0; is < arr[ind].scj_arr.length; is++) {
+          PosWareIds.push(arr[ind].scj_arr[is].erpwareid)
+        }
+
+        quan_req.PosWareIds=PosWareIds.join()  //优化获取市场价的优惠券
       }
  
       //-- 是否关闭使用优惠券,循环有找到商品 --
@@ -7466,6 +7472,7 @@ Page({
         var gg = to.get_b_now();
         if(th.data.ckeck_quan_price>= good.market_price* gg.goods_num){
           get_q_req.BuyPosSum=th.data.ckeck_quan_price  //优化获取市场价的优惠券
+          get_q_req.PosWareIds=encodeURIComponent(th.data.check_quan_ware_list)  //优化获取市场价的优惠券
         }
  
         app.request.time_limit_get(6, url, {
@@ -8283,14 +8290,16 @@ Page({
     var coupon_price = you_item.WareCashSum;
     var goods = t_item.goods;
     var arr = [];
+
+    if(!t_item.quan_no) t_item.quan_no=you_item.CashRepNo;
+
     //判断是不是有goods_id重复
     for (var i = 0; i < goods.length; i++) {
  
       if(is_quan_scj){
          let fd=t_item.scj_arr.find(function (e){
-              return e.index==i;
+              return e.index==i && e.erpwareid==you_item.WareId;
          })
-
          //不是零售价的商品，就进入下一轮
          if(!fd) continue;
       }
@@ -2016,6 +2016,7 @@ Page({
  
         if(th.data.ckeck_quan_price>=th.data.check_quan_price_scj){
           quan_rq.BuyPosSum=th.data.ckeck_quan_price;
+          quan_rq.PosWareIds=encodeURIComponent(th.data.check_quan_ware_list)
         }
  
         app.request.time_limit_get(6, url, {
@@ -1559,6 +1559,7 @@ Page({
  
       if(th.data.ckeck_quan_price>=th.data.check_quan_price_scj){
         quan_rq.BuyPosSum=th.data.ckeck_quan_price;
+        quan_rq.PosWareIds=encodeURIComponent(th.data.check_quan_ware_list)
       }
  
       app.request.promiseGet(url0, { 1: 1 }).then(res => {