Merge branch 'goods' of 121.43.114.153:/home/git/repositories/shopnc into goods

data/logic/buy.logic.php

@@ -735,6 +735,7 @@ class buyLogic {
                     $promotion_value = floor($goods_total*($promotion_rate));
                     $order_goods[$i]['goods_pay_price'] = $goods_total - $promotion_value;
                     $promotion_sum += $promotion_value;
+                    $order_goods[$i]['goods_spec'] = $goods_info['goods_spec'];
                     $i++;
 
                     //存储库存报警数据
@@ -745,6 +746,8 @@ class buyLogic {
                         $notice_list['goods_storage_alarm'][$goods_info['store_id']] = $param;
                     }
 
+
+
                 } elseif (!empty($goods_info['bl_goods_list']) && is_array($goods_info['bl_goods_list'])) {
 
                     //优惠套装
@@ -768,6 +771,8 @@ class buyLogic {
                         $promotion_value = floor($goods_total*($promotion_rate));
                         $order_goods[$i]['goods_pay_price'] = $goods_total - $promotion_value;
                         $promotion_sum += $promotion_value;
+
+                        $order_goods[$i]['goods_spec'] = $goods_info['goods_spec'];
                         $i++;
     
                         //存储库存报警数据

data/logic/buy_1.logic.php

@@ -970,6 +970,12 @@ class buy_1Logic {
                 }
                 $cart_list[$key]['groupbuy_info'] = $goods_online_info['groupbuy_info'];
                 $cart_list[$key]['xianshi_info'] = $goods_online_info['xianshi_info'];
+                $goods_spec = unserialize($goods_online_info['goods_spec']);
+                $goods_spec_array = array();
+                foreach ($goods_spec as $value) {
+                    array_push($goods_spec_array, $value);
+                }
+                $cart_list[$key]['goods_spec'] = implode(',', $goods_spec_array);
             } else {
                 //如果商品下架
                 $cart_list[$key]['state'] = false;