取厂家颜色

@@ -749,7 +749,7 @@ class Helpers
             $oneGoods['isStudents'] = $value['sales_price'] !== $value['last_vip_price'] && $value['discount_tag'] === 'S';
             $oneGoods['count'] = $value['buy_number'];
             $oneGoods['promotion_id'] = $value['promotion_id'];
-            $oneGoods['factoryColor'] = isset($value['factory_goods_name']) ? $value['color_name'] : $value['factory_goods_name'];
+            $oneGoods['factoryColor'] = isset($value['factory_goods_name']) ? $value['factory_goods_name'] : $value['color_name'];
 
             if ($isValid) {
                 // 库存不足

@@ -496,7 +496,7 @@ class CartModel
                     $oneGoods['id'] = $single['product_sku'];
                     $oneGoods['thumb'] = Images::getImageUrl($single['goods_images'], 120, 160);
                     $oneGoods['name'] = $single['product_name'];
-                    $oneGoods['color'] = isset($single['factory_goods_name']) ? $single['color_name'] : $single['factory_goods_name'];
+                    $oneGoods['color'] = !isset($single['factory_goods_name']) ? $single['color_name'] : $single['factory_goods_name'];
                     $oneGoods['size'] = $single['size_name'];
                     $oneGoods['count'] = $single['buy_number'];
                     $oneGoods['price'] = Helpers::transPrice($single['last_price']);
@@ -934,7 +934,7 @@ class CartModel
                     $oneColor = array();
                     $oneColor['id'] = $val['color_id'];
                     $oneColor['skcId'] = $val['product_skc'];
-                    $oneColor['name'] = isset($val['factory_goods_name']) ?  $val['color_name'] : $val['factory_goods_name'];
+                    $oneColor['name'] = !isset($val['factory_goods_name']) ?  $val['color_name'] : $val['factory_goods_name'];
                     $oneColor['goodsName'] = $productData['product_name'];
                     $oneColor['colorNum'] = $colorNum;
                     $colorList[] = $oneColor;