预存使用的优化

yvan.ni
1 parent 8da54d01
Showing 5 changed files with 98 additions and 72 deletions
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
packageC/pages/presell/cart/cart2_pre.js
packageE/pages/cart/cart2/cart2.js
packageE/pages/cart/cart2_inte/cart2_inte.js
packageE/pages/cart/cart2_pt/cart2_pt.js
@@ -320,7 +320,8 @@ Page({
       let obj = {
         wareno: ite.goods_sn,
         price: ite.goods_price,
-        qty: ite.goods_num
+        qty: ite.goods_num,
+        sumprice:ite.sumprice
       }
       listform.push(obj)
     })
@@ -1148,6 +1149,7 @@ Page({
             goods_sn: th.data.bn_goods.goods_sn,
             goods_price: th.data.param.goods_price || th.data.bn_goods.shop_price || th.data.bn_goods.goods_price,
             goods_num: th.data.bn_goods.buynum || th.data.bn_goods.goods_num,
+            sumprice:parseFloat(allpice).toFixed(2) //幸运购没有优惠券
           }],
           sto: {
             keyid: th.data.bn_goods.keyid
@@ -548,7 +548,8 @@ Page({
       let obj = {
         wareno: ite.goods_sn,
         price: ite.goods_price,
-        qty: ite.goods_num
+        qty: ite.goods_num,
+        sumprice: ite.sumprice
       }
       listform.push(obj)
     })
@@ -777,6 +778,7 @@ Page({
               goods_sn: th.data.bn_goods.goods_sn,
               goods_price: th.data.bn_goods.shop_price || th.data.bn_goods.goods_price,
               goods_num: th.data.bn_goods.buynum || th.data.bn_goods.goods_num,
+              sumprice:parseFloat(allpice).toFixed(2)
             }],
             sto: {
               keyid: th.data.bn_goods.keyid
@@ -527,6 +527,8 @@ Page({
           let obj = {
             goods_sn:ite.goods_sn,
             goods_id: ite.goods_id,
+            prom_type: ite.prom_type,
+            prom_id: ite.id,
             goods_price: ite.goods_price,   //account是平摊后的实收价格
             goods_num: ite.goods_num,
             sumgoods_price: ite.account_fir * ite.goods_num - ite.account_yu_fir-(ite.quan_num?ite.quan_num:0)  //-- 优惠后的实收 --
@@ -553,8 +555,8 @@ Page({
       })
       if (pt_res) {
         for (let io = 0; io <new_arr.length ; io++) {
-          new_arr[io].account_yc = this.arr_get_goods(new_arr[io].goods_id, pt_res).fisrt_account;
-          new_arr[io].account_yc_yu = this.arr_get_goods(new_arr[io].goods_id, pt_res).fisrt_account_yu;
+          new_arr[io].account_yc = this.arr_get_goods_n(new_arr[io], pt_res).fisrt_account;
+          new_arr[io].account_yc_yu = this.arr_get_goods_n(new_arr[io], pt_res).fisrt_account_yu;
         }
       }
  
@@ -7118,6 +7120,15 @@ Page({
     }
   },
  
+
+  //从优惠的映射中拿出商品从表的item
+  arr_get_goods_n: function (good, arr) {
+    for (var i in arr) {
+      if (arr[i].goods_id == good.goods_id && arr[i].prom_id == good.prom_id && arr[i].prom_type == good.prom_type ) return arr[i];
+    }
+  },
+
+
   //检查是不是有其他门店的订单在选择了券
   check_other_use: function (iter, pkid) {
     var using = this.data.using_quan;
@@ -357,7 +357,8 @@ Page({
       let obj = {
         wareno: ite.goods_sn,
         price: ite.goods_price,
-        qty: ite.goods_num
+        qty: ite.goods_num,
+        sumprice:ite.sumprice
       }
       listform.push(obj)
     })
@@ -970,6 +971,79 @@ Page({
           }
         })
       }
+
+
+
+    //判断是否同城配送,而且没有调用过
+    if(th.data.bn_exp_type==2 && th.data.user_addr) {
+
+      var lon=0;var lat=0;
+      //-- 获取距离  --
+      await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", {
+        is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address,store_id:os.stoid}
+      }).then(res=>{
+        if(res.data.code==0){
+          var data= JSON.parse(res.data.data);
+          if(data.status==0){
+            lon=data.result.location.lng;
+            lat=data.result.location.lat;
+          }
+        }
+      })
+
+
+      var gd_w = good['weight'] * good['buynum'];
+      //-- 获取距离  --
+      var req_data = {
+        store_id: os.stoid,
+        order_amount: order_m,
+        lon: lon, lat: lat,
+        pickup_id: bn_pick,
+        goods_weight: gd_w
+      }
+
+      var is_next=1;
+      //获取同城配送参数
+      await getApp().request.promisePost("/api/weshop/order/sameCityExp/getMoney", {
+        is_json: 1,
+        data: req_data
+      }).then(res => {
+        if (res.data.code == 0) {
+          var wl_txt = "formData.shipping_price";
+          th.setData({ [wl_txt]: res.data.data, })
+        }else{
+          is_next=0;
+          wx.showToast({
+            title: res.data.msg, icon: 'none',  duration: 2000
+          })
+        }
+      })
+      if(!is_next){
+         th.setData({is_show_sub:1, submit: 0,same_ok:0,show_submit:1})
+         return false
+      }
+
+      th.data.lon=lon;
+      th.data.lat=lat;
+      th.data.bn_gd_w=gd_w;
+      th.data.bn_samecity_order_amount=req_data.order_amount;
+
+    }
+
+
+
+    var yc_order_m=order_m;
+
+    //--看一下有没有订单优惠--0
+    total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price);
+    order_m = parseFloat(order_m) + parseFloat(th.data.formData.shipping_price);
+    var atxt = "formData.total_amount";
+    th.setData({ [atxt]: total_m, })
+
+    var txt = "formData.user_money";
+    var txt2 = "formData.order_amount";
+    var txt4 = "formData.integral";
+
       if (th.data.bn_goods.keyid) {
         let cart_yc = await th.beforAdvancesum({
           order_amount: order_m,
@@ -977,6 +1051,7 @@ Page({
             goods_sn: th.data.bn_goods.goods_sn,
             goods_price: th.data.bn_goods.shop_price || th.data.bn_goods.goods_price,
             goods_num: th.data.bn_goods.buynum || th.data.bn_goods.goods_num,
+            sumprice:parseFloat(yc_order_m).toFixed(2)
           }],
           sto: {
             keyid: th.data.bn_goods.keyid
@@ -1044,73 +1119,7 @@ Page({
       })
     }
  
-    //判断是否同城配送,而且没有调用过
-    if(th.data.bn_exp_type==2 && th.data.user_addr) {
  
-      var lon=0;var lat=0;
-      //-- 获取距离  --
-      await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", {
-        is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address,store_id:os.stoid}
-      }).then(res=>{
-        if(res.data.code==0){
-          var data= JSON.parse(res.data.data);
-          if(data.status==0){
-            lon=data.result.location.lng;
-            lat=data.result.location.lat;
-          }
-        }
-      })
-
-
-      var gd_w = good['weight'] * good['buynum'];
-      //-- 获取距离  --
-      var req_data = {
-        store_id: os.stoid,
-        order_amount: order_m,
-        lon: lon, lat: lat,
-        pickup_id: bn_pick,
-        goods_weight: gd_w
-      }
-
-      var is_next=1;
-      //获取同城配送参数
-      await getApp().request.promisePost("/api/weshop/order/sameCityExp/getMoney", {
-        is_json: 1,
-        data: req_data
-      }).then(res => {
-        if (res.data.code == 0) {
-          var wl_txt = "formData.shipping_price";
-          th.setData({ [wl_txt]: res.data.data, })
-        }else{
-          is_next=0;
-          wx.showToast({
-            title: res.data.msg, icon: 'none',  duration: 2000
-          })
-        }
-      })
-      if(!is_next){
-         th.setData({is_show_sub:1, submit: 0,same_ok:0,show_submit:1})
-         return false
-      }
-
-      th.data.lon=lon;
-      th.data.lat=lat;
-      th.data.bn_gd_w=gd_w;
-      th.data.bn_samecity_order_amount=req_data.order_amount;
-
-    }
-
-
-
-    //--看一下有没有订单优惠--0
-    total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price);
-    order_m = parseFloat(order_m) + parseFloat(th.data.formData.shipping_price);
-    var atxt = "formData.total_amount";
-    th.setData({ [atxt]: total_m, })
-
-    var txt = "formData.user_money";
-    var txt2 = "formData.order_amount";
-    var txt4 = "formData.integral";
  
  
     //-- 最后的金额小于佣金 --
@@ -260,7 +260,8 @@ Page({
       let obj = {
         wareno: ite.goods_sn,
         price: ite.goods_price,
-        qty: ite.goods_num
+        qty: ite.goods_num,
+        sumprice:ite.sumprice
       }
       listform.push(obj)
     })
@@ -1042,6 +1043,7 @@ Page({
             goods_sn: th.data.bn_goods.goods_sn,
             goods_price: th.data.bn_goods.shop_price || th.data.bn_goods.goods_price,
             goods_num: th.data.bn_goods.buynum || th.data.bn_goods.goods_num,
+            sumprice:parseFloat(allpice).toFixed(2)
           }],
           sto: {
             keyid: th.data.bn_goods.keyid