Merge branch 'jielong' into test

2bb3fb8f · luhongguang · 81a5eb6b · 02fb6fe5 · 2bb3fb8f
Commit 2bb3fb8f authored Aug 16, 2021 by luhongguang
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
@@ -1579,7 +1579,7 @@ class GoodsService
                    $goodsSku = GoodsSku::getRecord(["goods_sku_id" => $goodsSkuId]);
                }
                if (empty($goodsSku)) {
-                    throw new GoodsException(["cus" => 15]);
+                    return false;
                }

                if (!empty($marketingId)) {
@@ -1620,7 +1620,7 @@ class GoodsService
                );
            }

-            return false;
+            throw new GoodsException(["cus" => 44]);
        } else {
            //同步到es
            if (empty($marketingId)) {