Merge branch 'jielong' into test

application/exception/custom/GoodsException.php

@@ -63,5 +63,6 @@ class GoodsException extends BaseException
         44 => '事务commit失败',
         45 => '还没有try，就去执行confirm',
         46 => '已经执行过cancel',
+        47 => 'sku rollback error',
     ];
 }
\ No newline at end of file

application/services/tcc/Tcc2Service.php

@@ -545,24 +545,17 @@ class Tcc2Service
         if (!empty($goodsInfoList)) {
             PindanGoodsSku::beginTransaction();
             foreach ($goodsInfoList as $item) {
-                $goodsSkuId = $item["goods_sku_id"];
                 $num = $item["num"];
-
-                $sku = PindanGoodsSku::getRecordMaster(["goods_sku_id" => $goodsSkuId]
-                    , ["goods_sku_id", "total_amount_order", "inventory_rest", "inventory_lock", "online_status"]);
-                if (!empty($sku[0])) {
-                    $params = [
-                        "inventory_rest" => $sku[0]["inventory_rest"] + $num,
-                        "total_amount_order" => $sku[0]["total_amount_order"] - $num,
-                    ];
-                    $rowCount = PindanGoodsSku::save($params, ["goods_sku_id" => $goodsSkuId, "total_amount_order[>=]" => $num]);
-                    if ($rowCount <= 0) {
-                        PindanGoodsSku::rollback();
-                        throw new GoodsException(["cus" => 32]);
-                    }
+                $params = [
+                    "inventory_rest[+]" => $num,
+                    "total_amount_order[-]" =>  $num,
+                ];
+                $rowCount = PindanGoodsSku::save($params, ["goods_sku_id" => $item["goods_sku_id"]]);
+                if ($rowCount <= 0) {
+                    PindanGoodsSku::rollback();
+                    throw new GoodsException(["cus" => 47]);
                 }
             }
-
             if (!PindanGoodsSku::commit()) {
                 PindanGoodsSku::rollback();
             }