AI Assistant 6 ay önce
ebeveyn
işleme
5536752579

+ 2 - 7
app/Module/Farm/Validators/HarvestableStatusValidator.php

@@ -54,12 +54,7 @@ class HarvestableStatusValidator extends Validator
      */
     private function getStatusName(int $status): string
     {
-        return match ($status) {
-            LAND_STATUS::IDLE->value => '空闲',
-            LAND_STATUS::PLANTING->value => '种植中',
-            LAND_STATUS::HARVESTABLE->value => '可收获',
-            LAND_STATUS::WITHERED->value => '枯萎',
-            default => '未知状态'
-        };
+        // 使用LAND_STATUS枚举的getName方法,确保状态名称一致性
+        return LAND_STATUS::getName($status);
     }
 }

+ 2 - 7
app/Module/Farm/Validators/LandStatusValidator.php

@@ -53,12 +53,7 @@ class LandStatusValidator extends Validator
      */
     private function getStatusName(int $status): string
     {
-        return match ($status) {
-            LAND_STATUS::IDLE->value => '空闲',
-            LAND_STATUS::PLANTING->value => '种植中',
-            LAND_STATUS::HARVESTABLE->value => '可收获',
-            LAND_STATUS::WITHERED->value => '枯萎',
-            default => '未知状态'
-        };
+        // 使用LAND_STATUS枚举的getName方法,确保状态名称一致性
+        return LAND_STATUS::getName($status);
     }
 }

+ 2 - 8
app/Module/Farm/Validators/LandUpgradeStatusValidator.php

@@ -62,13 +62,7 @@ class LandUpgradeStatusValidator extends Validator
      */
     private function getStatusName(int $status): string
     {
-        return match ($status) {
-            LAND_STATUS::IDLE->value => '空闲',
-            LAND_STATUS::PLANTING->value => '种植中',
-            LAND_STATUS::HARVESTABLE->value => '可收获',
-            LAND_STATUS::WITHERED->value => '枯萎',
-            LAND_STATUS::DISASTER->value => '灾害',
-            default => '未知状态'
-        };
+        // 使用LAND_STATUS枚举的getName方法,确保状态名称一致性
+        return LAND_STATUS::getName($status);
     }
 }

+ 2 - 8
app/Module/Farm/Validators/RemovableStatusValidator.php

@@ -61,13 +61,7 @@ class RemovableStatusValidator extends Validator
      */
     private function getStatusName(int $status): string
     {
-        return match ($status) {
-            LAND_STATUS::IDLE->value => '空闲',
-            LAND_STATUS::PLANTING->value => '种植中',
-            LAND_STATUS::DISASTER->value => '灾害',
-            LAND_STATUS::HARVESTABLE->value => '可收获',
-            LAND_STATUS::WITHERED->value => '枯萎',
-            default => '未知状态'
-        };
+        // 使用LAND_STATUS枚举的getName方法,确保状态名称一致性
+        return LAND_STATUS::getName($status);
     }
 }