Merge branch 'test' of https://gitlab.yidian-inc.com/bp/goods into test

application/services/goods/GoodsService.php

@@ -2035,8 +2035,8 @@ class GoodsService
         }
         $goodsSkuList = [];
         foreach ($goodsSkuIdList as $goodsType => $goodsSkuIds) {
-            // 现在只有两种类型 实体，虚拟
-            if ($goodsType == GoodsSpu::TYPE_VIRTUAL) {
+            // 现在只有两种类型 实体，虚拟  ($goodsType == '' 虚拟商品)
+            if (empty($goodsType) || $goodsType == GoodsSpu::TYPE_VIRTUAL) {
                 $goodsData = self::generalGetGoodsSkuList(['goods_sku_id' => $goodsSkuIds]);
             } else {
                 $goodsData = self::generalGetPindanGoodsSkuList(['goods_sku_id' => $goodsSkuIds]);