Merge branch 'hotfix/gift' into 'master'

Hotfix/gift



See merge request !444

@@ -611,8 +611,14 @@ const formatCart = (cartDataRet, uid, shoppingKey, cartDelList) => {
         // gifts: giftsList,   // chelper.formatGifts(_.get(ordCartData, 'gift_list')),
         // 全场可选的加价购商品列表
         // priceGifts: priceGifts, // chelper.formatPriceGifts(_.get(ordCartData, 'price_gift')),
-        giftsPromotionInfos: formatPoolPromotionInfos(_.get(ordCartData, 'g_gift_list')),
-        priceGiftsPromotionInfos: formatPoolPromotionInfos(_.get(ordCartData, 'g_price_gift_list')),
+        giftsPromotionInfos: formatPoolPromotionInfos(_.get(ordCartData, 'g_gift_list', []).map(i => {
+            i.promotion_type = 'Gift';
+            return i;
+        })),
+        priceGiftsPromotionInfos: formatPoolPromotionInfos(_.get(ordCartData, 'g_price_gift_list', []).map(i => {
+            i.promotion_type = 'Needpaygift';
+            return i;
+        })),
 
         // 已选择的全场加价购和赠品
         goodsList: goodsList,