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

22746e4e · jianghaiming · f732afc5 · 4fad3f94 · 22746e4e · 22746e4e
Commit 22746e4e authored Jul 21, 2021 by jianghaiming
Expand all Show whitespace changes
Inline Side-by-side

Showing with 102 additions and 57 deletions

GoodsException.php application/exception/custom/GoodsException.php +2 -0

TccService.php application/services/tcc/TccService.php +100 -57

No files found.
--- a/application/exception/custom/GoodsException.php
+++ b/application/exception/custom/GoodsException.php
@@ -42,5 +42,7 @@ class GoodsException extends BaseException
        28 => '上架状态不能编辑，需先下架，再做编辑操作',
        29 => '发布商品的生活号不存在',
        30 => '当前商品已过期',
+        31 => '当前商品锁定库存不足',
+        32 => '当前商品已下单数量不足',
    ];
 }
\ No newline at end of file
--- a/application/services/tcc/TccService.php
+++ b/application/services/tcc/TccService.php