Merge pull request #96 from diepxuan/feat/procedurecaller-refactor

refactor: shorten ProcedureCaller

Author: caothu159

src/StoredProcedures/AsGLChuyenSdTk.php

@@ -8,11 +8,12 @@
  * @author     Tran Ngoc Duc <ductn@diepxuan.com>
  * @author     Tran Ngoc Duc <caothu91@gmail.com>
  *
- * @lastupdate 2026-02-26 14:21:52
+ * @lastupdate 2026-02-27 21:55:53
  */
 
 namespace Diepxuan\Simba\StoredProcedures;
 
+use Carbon\Carbon;
 use Diepxuan\Simba\SModel\SModel;
 use Illuminate\Support\Collection;
 
@@ -69,11 +70,35 @@ class AsGLChuyenSdTk extends StoredProcedure
      *
      * @return mixed kết quả trả về từ procedure (có thể chứa output parameter)
      */
-    public static function call(array $params): Collection
+    public static function call(array $params)
     {
-        return parent::call(array_merge([
+        $params = [
             'pMa_cty'   => $params['pMa_cty'] ?? SModel::CTY,
-            'pNgay_cnt' => $params['pNgay_cnt'] ?? null,
-        ], $params));
+            'pNgay_cnt' => $params['pNgay_cnt'] ?? now()->endOfYear(),
+            'pRet'      => ['output' => true, 'type' => 'INT'],
+            ...$params,
+        ];
+        $ngayCnt = $params['pNgay_cnt'] ?? now()->endOfYear();
+
+        if ($ngayCnt instanceof Carbon) {
+            $ngayCnt = $ngayCnt->format('Y-m-d H:i:s');
+        }
+
+        $result = parent::call([
+            ...$params,
+            'pNgay_cnt' => $ngayCnt,
+        ]);
+
+        if ($result instanceof Collection && $result->isNotEmpty()) {
+            $firstItem = $result->first();
+            if (\is_object($firstItem) && property_exists($firstItem, 'pRet')) {
+                return (float) $firstItem->pRet;
+            }
+            if (\is_array($firstItem) && isset($firstItem['pRet'])) {
+                return (float) $firstItem['pRet'];
+            }
+        }
+
+        return 0;
     }
 }

src/StoredProcedures/ProcedureCaller.php

@@ -8,7 +8,7 @@
  * @author     Tran Ngoc Duc <ductn@diepxuan.com>
  * @author     Tran Ngoc Duc <caothu91@gmail.com>
  *
- * @lastupdate 2026-02-25 15:13:06
+ * @lastupdate 2026-02-27 21:55:53
  */
 
 namespace Diepxuan\Simba\StoredProcedures;
@@ -32,7 +32,7 @@ class ProcedureCaller
      *
      * @return mixed kết quả trả về từ procedure (tùy thuộc vào procedure)
      */
-    public static function call(string $name, array $params = [], ?string $connection = null): Collection
+    public static function call(string $name, array $params = [], ?string $connection = null)
     {
         $placeholders = '';
         if (!empty($params)) {

src/StoredProcedures/StoredProcedure.php

@@ -8,13 +8,12 @@
  * @author     Tran Ngoc Duc <ductn@diepxuan.com>
  * @author     Tran Ngoc Duc <caothu91@gmail.com>
  *
- * @lastupdate 2026-02-26 11:12:40
+ * @lastupdate 2026-02-27 21:46:55
  */
 
 namespace Diepxuan\Simba\StoredProcedures;
 
 use Diepxuan\Simba\SModel\SModel;
-use Illuminate\Support\Collection;
 
 class StoredProcedure
 {
@@ -27,7 +26,7 @@ class StoredProcedure
      *
      * @return mixed kết quả trả về từ procedure (có thể chứa output parameter)
      */
-    public static function call(array $params): Collection
+    public static function call(array $params)
     {
         $connection = (new SModel())->getConnectionName();