update:tcc cancel

application/services/tcc/TccService.php

@@ -75,6 +75,10 @@ class TccService
                     }
                     $num = $numList[$goodsSkuId];
 
+                    if ($sku["inventory_rest"] < $num) {
+                        GoodsSku::rollback();
+                        return self::TCC_RESULT_FAIL;
+                    }
                     GoodsSku::save([
                         "inventory_lock" => $sku["inventory_lock"] + $num,
                         "inventory_rest" => $sku["inventory_rest"] - $num,
@@ -196,6 +200,11 @@ class TccService
                     }
                     $num = $numList[$goodsSkuId];
 
+                    if ($sku["inventory_lock"] < $num) {
+                        GoodsSku::rollback();
+                        return self::TCC_RESULT_FAIL;
+                    }
+
                     GoodsSku::save([
                         "inventory_lock" => $sku["inventory_lock"] - $num,
                         "total_amount_order" => $sku["total_amount_order"] + $num,
@@ -316,6 +325,11 @@ class TccService
                     }
                     $num = $numList[$goodsSkuId];
 
+                    if ($sku["inventory_lock"] < $num) {
+                        GoodsSku::rollback();
+                        return self::TCC_RESULT_FAIL;
+                    }
+
                     GoodsSku::save([
                         "inventory_lock" => $sku["inventory_lock"] - $num,
                         "inventory_rest" => $sku["inventory_rest"] + $num,
@@ -418,6 +432,11 @@ class TccService
                     }
                     $num = $numList[$goodsSkuId];
 
+                    if ($sku["total_amount_order"] < $num) {
+                        GoodsSku::rollback();
+                        return self::TCC_RESULT_FAIL;
+                    }
+
                     GoodsSku::save([
                         "inventory_lock" => $sku["inventory_lock"] + $num,
                         "total_amount_order" => $sku["total_amount_order"] - $num,
@@ -539,6 +558,11 @@ class TccService
                     }
                     $num = $numList[$goodsSkuId];
 
+                    if ($sku["inventory_lock"] < $num) {
+                        GoodsSku::rollback();
+                        return self::TCC_RESULT_FAIL;
+                    }
+
                     GoodsSku::save([
                         "inventory_lock" => $sku["inventory_lock"] - $num,
                         "inventory_rest" => $sku["inventory_rest"] + $num,
@@ -647,7 +671,7 @@ class TccService
         }
 
         $skus = GoodsSku::getRecords(["goods_sku_id" => $goodsSkuIds]
-            , ["goods_sku_id", "inventory_rest", "inventory_lock", "online_status"]);
+            , ["goods_sku_id", "total_amount_order", "inventory_lock", "online_status"]);
         if (!empty($skus)) {
             GoodsSku::beginTransaction();
             foreach ($skus as $sku) {
@@ -659,6 +683,11 @@ class TccService
                     }
                     $num = $numList[$goodsSkuId];
 
+                    if ($sku["inventory_lock"] < $num) {
+                        GoodsSku::rollback();
+                        return self::TCC_RESULT_FAIL;
+                    }
+
                     GoodsSku::save([
                         "inventory_lock" => $sku["inventory_lock"] - $num,
                         "total_amount_order" => $sku["total_amount_order"] + $num,