update:tcc cancel 允许空cancel

application/services/tcc/TccService.php

@@ -286,14 +286,15 @@ class TccService
             return self::TCC_RESULT_SUCCESS;
         }
 
-        //在cancel时候必须已经有try，如果没有就直接返回fail
-        $cTccInfoList = Tcc::getRecordMaster([
+        //允许空cancel(没有try情况)
+        //在cancel时候必须已经有try，如果没有就直接返回success
+        $tTccInfoList = Tcc::getRecordMaster([
             "tid" => $tid,
             "goods_sku_id" => $goodsSkuIds,
             "type" => Tcc::STATUS_TRY,
             "operator_result" => Tcc::OPERATOR_RESULT_SUCCESS
         ]);
-        if (empty($cTccInfoList) || count($cTccInfoList) != count($goodsSkuIds)) {
+        if (empty($tTccInfoList) || count($tTccInfoList) != count($goodsSkuIds)) {
             foreach ($goodsSkuIds as $goodsSkuId) {
                 Tcc::save([
                     "tid" => $tid,
@@ -302,7 +303,7 @@ class TccService
                     "operator_result" => Tcc::OPERATOR_RESULT_FAIL,
                 ]);
             }
-            return self::TCC_RESULT_FAIL;
+            return self::TCC_RESULT_SUCCESS;
         }
         //如果已经 confirm 成功, 则失败
         $cTccInfoList = Tcc::getRecordMaster([
@@ -660,7 +661,8 @@ class TccService
             return self::TCC_RESULT_SUCCESS;
         }
 
-        //在cancel时候必须已经有try，如果没有就直接返回fail
+        //允许空cancel(没有try情况)
+        //在cancel时候必须已经有try，如果没有就直接返回success
         $cTccInfoList = Tcc::getRecordMaster([
             "tid" => $tid,
             "goods_sku_id" => $goodsSkuIds,
@@ -676,8 +678,9 @@ class TccService
                     "operator_result" => Tcc::OPERATOR_RESULT_FAIL,
                 ]);
             }
-            return self::TCC_RESULT_FAIL;
+            return self::TCC_RESULT_SUCCESS;
         }
+
         //如果已经 confirm 成功, 则失败
         $cTccInfoList = Tcc::getRecordMaster([
             "tid" => $tid,