From 281dde332a4b5e716deba3781b3368c1e85a4b5b Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Thu, 26 May 2022 18:03:06 +0800
Subject: [PATCH] 代发商品的拆单的bug优化

---
 pages/cart/cart2/cart2.js | 40 ++++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 47c3850..edcf86f 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -702,7 +702,7 @@ Page({
                             user_money: 0,
                             total_amount: 0,
                             order_amount: 0,
-                            user_note: 0
+                            user_note: ""
                         };
 
                         //-- 把等级卡会优惠多少钱装进去 --
@@ -1026,7 +1026,7 @@ Page({
                                         user_money: 0,
                                         total_amount: 0,
                                         order_amount: 0,
-                                        user_note: 0
+                                        user_note: ""
                                     };
                                     cart_arr.push(ie);
                                     th.data.old_cartlist = cart_arr;
@@ -1888,6 +1888,10 @@ Page({
                                         break;
                                     case 1:
                                         //order_m = o_condition - ord_prom['expression'];//满额优惠金额
+                                        var bs=1;
+                                        if(ord_prom.is_bz){
+                                            bs=Math.floor(o_condition/ord_prom.money);
+                                        }
                                         order_prom_amount = ord_prom['expression'];
                                         break;
                                 }
@@ -2326,7 +2330,13 @@ Page({
                                         order_prom_amount = (o_condition - order_m).toFixed(2);
                                         break;
                                     case 1:
-                                        order_m = o_condition - ord_prom['expression'];//满额优惠金额
+                                        //-- 如果有优惠促销倍减的时候 --
+                                        var bs=1;
+                                        if(ord_prom.is_bz){
+                                            bs=Math.floor(o_condition/ord_prom.money);
+                                        }
+
+                                        order_m = o_condition - bs*ord_prom['expression'];//满额优惠金额
                                         order_prom_amount = ord_prom['expression'];
                                         break;
                                 }
@@ -2545,7 +2555,7 @@ Page({
                 'user_money': parseFloat(th.data.formData.user_money).toFixed(2),         //使用余额
                 'total_amount': parseFloat(th.data.formData.total_amount).toFixed(2),     //订单总价
                 'order_amount': parseFloat(th.data.formData.order_amount).toFixed(2),     //应付
-                'user_note': th.data.user_note['0'] ? th.data.user_note['0'] : 0,             //用户备注
+                'user_note': th.data.user_note['0'] ? th.data.user_note['0'] : "",             //用户备注
                 'store_id': oo.stoid,                //商家
                 'pickup_id': th.data.bn_pick,       //门店
                 'exp_type': th.data.bn_exp_type,    //配送方式
@@ -2918,10 +2928,14 @@ Page({
                 var df_price = 0;
                 var df_room_ids = "";
 
-                //多个商品才运算
-                if( t_item.goods.length>1) {
+
+
+
+
                     //-------------让商品添加到商品列表--------------------
                     for (var k = 0; k < t_item.goods.length; k++) {
+
+                        console.log("222");
                         var g_item = t_item.goods[k];
                         if (g_item.goods_num <= 0) continue;
                         var goods = {
@@ -3021,7 +3035,7 @@ Page({
                         }
 
                         //-- 如果有代发商品，就要开始拆单 --
-                        if (g_item.whsle_id) {
+                        if (g_item.whsle_id && t_item.goods.length>1) {
                             df_price += parseFloat(g_item.goods_num * g_item.goods_price);
                             goods.is_whsle_goods = 1;
                             df_goods.push(goods);
@@ -3035,14 +3049,13 @@ Page({
                             }
                         }
                     }
-                }
+
 
                 //如果房间号不为空的时候
                 if (room_ids != "") item.room_ids = ut.sub_last(room_ids);
-
-
+                
                 //处理代发商品的拆分
-                if(df_goods.length>0){
+                if(df_goods.length>0 &&  item.order_goods.length>0 ){
                     var df_item=JSON.parse(JSON.stringify(item));
                     item.goods_price= parseFloat(item.goods_price-df_price).toFixed(2);
                     item.total_amount= parseFloat(item.total_amount-df_price).toFixed(2);
@@ -3082,7 +3095,10 @@ Page({
                     df_item.order_goods=df_goods;
                     pdata.push(df_item);
                 }
-
+                //如果只有代发商品的时候
+                if(df_goods.length>0 &&  item.order_goods.length<=0){
+                    item.order_goods=df_goods;
+                }
                 pdata.push(item);
             }
 
--
libgit2 0.21.4