Merge branch 'feature_optimize_order_create_refund' into test

c654fbab · pengfei · 80c0b8c0 · 3568ab33 · c654fbab
Commit c654fbab authored Sep 27, 2021 by pengfei
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

GoodsService.php application/services/goods/GoodsService.php +2 -2

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