소스 검색

fixed:修复枚举错误,重新生成ide helper

Yin Bin 4 달 전
부모
커밋
a506baee41
69개의 변경된 파일476개의 추가작업 그리고 758개의 파일을 삭제
  1. 11 0
      .phpstorm.meta.php
  2. 281 0
      _ide_helper.php
  3. 41 2
      _ide_helper_models.php
  4. 0 27
      app/Enums/CommentStatus.php
  5. 2 12
      app/Enums/CouponRule.php
  6. 2 12
      app/Enums/CouponScope.php
  7. 2 12
      app/Enums/CouponStatus.php
  8. 2 12
      app/Enums/CouponType.php
  9. 2 12
      app/Enums/CouponValidType.php
  10. 2 12
      app/Enums/FeedbackStatus.php
  11. 2 12
      app/Enums/FeedbackType.php
  12. 2 12
      app/Enums/GrabOrderStatus.php
  13. 2 12
      app/Enums/MarketingRecordStatus.php
  14. 2 12
      app/Enums/MarketingStatus.php
  15. 2 12
      app/Enums/MarketingType.php
  16. 2 12
      app/Enums/OrderDistributionObject.php
  17. 2 12
      app/Enums/OrderDistributionType.php
  18. 2 12
      app/Enums/OrderExceptionStatus.php
  19. 2 12
      app/Enums/OrderRecordStatus.php
  20. 2 12
      app/Enums/OrderSource.php
  21. 2 12
      app/Enums/OrderStatus.php
  22. 2 12
      app/Enums/OrderType.php
  23. 2 12
      app/Enums/PaymentMethod.php
  24. 2 12
      app/Enums/PaymentStatus.php
  25. 2 12
      app/Enums/ProfitSource.php
  26. 2 12
      app/Enums/ProfitType.php
  27. 2 12
      app/Enums/RechargeSource.php
  28. 2 12
      app/Enums/RechargeStatus.php
  29. 2 12
      app/Enums/RechargeType.php
  30. 2 12
      app/Enums/RefundMethod.php
  31. 2 12
      app/Enums/RefundStatus.php
  32. 2 12
      app/Enums/ServiceFeeType.php
  33. 2 12
      app/Enums/ServiceRangeType.php
  34. 2 12
      app/Enums/ServiceStatus.php
  35. 2 12
      app/Enums/ShopContractStatus.php
  36. 2 12
      app/Enums/ShopServiceStatus.php
  37. 2 12
      app/Enums/ShopStatus.php
  38. 2 12
      app/Enums/ShopType.php
  39. 2 12
      app/Enums/SocialPlatform.php
  40. 2 12
      app/Enums/SysAreaType.php
  41. 2 12
      app/Enums/SysAuditStatus.php
  42. 2 12
      app/Enums/SysCacheType.php
  43. 2 12
      app/Enums/SysErrorStrategy.php
  44. 2 12
      app/Enums/SysParameterType.php
  45. 2 12
      app/Enums/SysRuleType.php
  46. 2 12
      app/Enums/SysStatus.php
  47. 2 12
      app/Enums/SysTaskType.php
  48. 2 12
      app/Enums/TechnicianAlarmType.php
  49. 2 12
      app/Enums/TechnicianAuthStatus.php
  50. 2 12
      app/Enums/TechnicianExpSource.php
  51. 1 9
      app/Enums/TechnicianLevel.php
  52. 2 12
      app/Enums/TechnicianLocationType.php
  53. 2 12
      app/Enums/TechnicianStatus.php
  54. 2 12
      app/Enums/TechnicianWorkStatus.php
  55. 2 12
      app/Enums/TransactionDirection.php
  56. 2 12
      app/Enums/TransactionType.php
  57. 2 12
      app/Enums/UserGender.php
  58. 2 12
      app/Enums/UserStatus.php
  59. 2 12
      app/Enums/UserType.php
  60. 1 9
      app/Enums/WalletType.php
  61. 2 12
      app/Enums/WithdrawAuditStatus.php
  62. 2 12
      app/Enums/WithdrawMethod.php
  63. 2 12
      app/Enums/WithdrawStatus.php
  64. 4 4
      app/Models/OrderComment.php
  65. 4 4
      app/Models/OrderDistRecord.php
  66. 4 4
      app/Models/OrderExcRecord.php
  67. 4 4
      app/Models/OrderGrabRecord.php
  68. 1 1
      app/Models/OrderRecord.php
  69. 10 10
      app/Services/Client/OrderService.php

+ 11 - 0
.phpstorm.meta.php

@@ -201,6 +201,7 @@ namespace PHPSTORM_META {
             'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
             'migrator' => \Illuminate\Database\Migrations\Migrator::class,
             'pipeline' => \Illuminate\Pipeline\Pipeline::class,
+            'qrcode' => \SimpleSoftwareIO\QrCode\Generator::class,
             'queue' => \Illuminate\Queue\QueueManager::class,
             'queue.connection' => \Illuminate\Queue\DatabaseQueue::class,
             'queue.failer' => \Illuminate\Queue\Failed\DatabaseUuidFailedJobProvider::class,
@@ -410,6 +411,7 @@ namespace PHPSTORM_META {
             'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
             'migrator' => \Illuminate\Database\Migrations\Migrator::class,
             'pipeline' => \Illuminate\Pipeline\Pipeline::class,
+            'qrcode' => \SimpleSoftwareIO\QrCode\Generator::class,
             'queue' => \Illuminate\Queue\QueueManager::class,
             'queue.connection' => \Illuminate\Queue\DatabaseQueue::class,
             'queue.failer' => \Illuminate\Queue\Failed\DatabaseUuidFailedJobProvider::class,
@@ -619,6 +621,7 @@ namespace PHPSTORM_META {
             'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
             'migrator' => \Illuminate\Database\Migrations\Migrator::class,
             'pipeline' => \Illuminate\Pipeline\Pipeline::class,
+            'qrcode' => \SimpleSoftwareIO\QrCode\Generator::class,
             'queue' => \Illuminate\Queue\QueueManager::class,
             'queue.connection' => \Illuminate\Queue\DatabaseQueue::class,
             'queue.failer' => \Illuminate\Queue\Failed\DatabaseUuidFailedJobProvider::class,
@@ -828,6 +831,7 @@ namespace PHPSTORM_META {
             'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
             'migrator' => \Illuminate\Database\Migrations\Migrator::class,
             'pipeline' => \Illuminate\Pipeline\Pipeline::class,
+            'qrcode' => \SimpleSoftwareIO\QrCode\Generator::class,
             'queue' => \Illuminate\Queue\QueueManager::class,
             'queue.connection' => \Illuminate\Queue\DatabaseQueue::class,
             'queue.failer' => \Illuminate\Queue\Failed\DatabaseUuidFailedJobProvider::class,
@@ -1037,6 +1041,7 @@ namespace PHPSTORM_META {
             'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
             'migrator' => \Illuminate\Database\Migrations\Migrator::class,
             'pipeline' => \Illuminate\Pipeline\Pipeline::class,
+            'qrcode' => \SimpleSoftwareIO\QrCode\Generator::class,
             'queue' => \Illuminate\Queue\QueueManager::class,
             'queue.connection' => \Illuminate\Queue\DatabaseQueue::class,
             'queue.failer' => \Illuminate\Queue\Failed\DatabaseUuidFailedJobProvider::class,
@@ -1246,6 +1251,7 @@ namespace PHPSTORM_META {
             'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
             'migrator' => \Illuminate\Database\Migrations\Migrator::class,
             'pipeline' => \Illuminate\Pipeline\Pipeline::class,
+            'qrcode' => \SimpleSoftwareIO\QrCode\Generator::class,
             'queue' => \Illuminate\Queue\QueueManager::class,
             'queue.connection' => \Illuminate\Queue\DatabaseQueue::class,
             'queue.failer' => \Illuminate\Queue\Failed\DatabaseUuidFailedJobProvider::class,
@@ -1455,6 +1461,7 @@ namespace PHPSTORM_META {
             'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
             'migrator' => \Illuminate\Database\Migrations\Migrator::class,
             'pipeline' => \Illuminate\Pipeline\Pipeline::class,
+            'qrcode' => \SimpleSoftwareIO\QrCode\Generator::class,
             'queue' => \Illuminate\Queue\QueueManager::class,
             'queue.connection' => \Illuminate\Queue\DatabaseQueue::class,
             'queue.failer' => \Illuminate\Queue\Failed\DatabaseUuidFailedJobProvider::class,
@@ -1664,6 +1671,7 @@ namespace PHPSTORM_META {
             'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
             'migrator' => \Illuminate\Database\Migrations\Migrator::class,
             'pipeline' => \Illuminate\Pipeline\Pipeline::class,
+            'qrcode' => \SimpleSoftwareIO\QrCode\Generator::class,
             'queue' => \Illuminate\Queue\QueueManager::class,
             'queue.connection' => \Illuminate\Queue\DatabaseQueue::class,
             'queue.failer' => \Illuminate\Queue\Failed\DatabaseUuidFailedJobProvider::class,
@@ -1873,6 +1881,7 @@ namespace PHPSTORM_META {
             'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
             'migrator' => \Illuminate\Database\Migrations\Migrator::class,
             'pipeline' => \Illuminate\Pipeline\Pipeline::class,
+            'qrcode' => \SimpleSoftwareIO\QrCode\Generator::class,
             'queue' => \Illuminate\Queue\QueueManager::class,
             'queue.connection' => \Illuminate\Queue\DatabaseQueue::class,
             'queue.failer' => \Illuminate\Queue\Failed\DatabaseUuidFailedJobProvider::class,
@@ -2082,6 +2091,7 @@ namespace PHPSTORM_META {
             'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
             'migrator' => \Illuminate\Database\Migrations\Migrator::class,
             'pipeline' => \Illuminate\Pipeline\Pipeline::class,
+            'qrcode' => \SimpleSoftwareIO\QrCode\Generator::class,
             'queue' => \Illuminate\Queue\QueueManager::class,
             'queue.connection' => \Illuminate\Queue\DatabaseQueue::class,
             'queue.failer' => \Illuminate\Queue\Failed\DatabaseUuidFailedJobProvider::class,
@@ -2291,6 +2301,7 @@ namespace PHPSTORM_META {
             'migration.repository' => \Illuminate\Database\Migrations\DatabaseMigrationRepository::class,
             'migrator' => \Illuminate\Database\Migrations\Migrator::class,
             'pipeline' => \Illuminate\Pipeline\Pipeline::class,
+            'qrcode' => \SimpleSoftwareIO\QrCode\Generator::class,
             'queue' => \Illuminate\Queue\QueueManager::class,
             'queue.connection' => \Illuminate\Queue\DatabaseQueue::class,
             'queue.failer' => \Illuminate\Queue\Failed\DatabaseUuidFailedJobProvider::class,

+ 281 - 0
_ide_helper.php

@@ -17377,6 +17377,286 @@ namespace Illuminate\Support\Facades {
             }
     }
 
+namespace SimpleSoftwareIO\QrCode\Facades {
+            /**
+     * 
+     *
+     */        class QrCode {
+                    /**
+         * Generates the QrCode.
+         *
+         * @param string $text
+         * @param string|null $filename
+         * @return void|\Illuminate\Support\HtmlString|string 
+         * @throws WriterException
+         * @throws InvalidArgumentException
+         * @static 
+         */        public static function generate($text, $filename = null)
+        {
+                        /** @var \SimpleSoftwareIO\QrCode\Generator $instance */
+                        return $instance->generate($text, $filename);
+        }
+                    /**
+         * Merges an image over the QrCode.
+         *
+         * @param string $filepath
+         * @param float $percentage
+         * @param \SimpleSoftwareIO\QrCode\SimpleSoftwareIO\QrCode\boolean|bool $absolute
+         * @return \Generator 
+         * @static 
+         */        public static function merge($filepath, $percentage = 0.2, $absolute = false)
+        {
+                        /** @var \SimpleSoftwareIO\QrCode\Generator $instance */
+                        return $instance->merge($filepath, $percentage, $absolute);
+        }
+                    /**
+         * Merges an image string with the center of the QrCode.
+         *
+         * @param string $content
+         * @param float $percentage
+         * @return \Generator 
+         * @static 
+         */        public static function mergeString($content, $percentage = 0.2)
+        {
+                        /** @var \SimpleSoftwareIO\QrCode\Generator $instance */
+                        return $instance->mergeString($content, $percentage);
+        }
+                    /**
+         * Sets the size of the QrCode.
+         *
+         * @param int $pixels
+         * @return \Generator 
+         * @static 
+         */        public static function size($pixels)
+        {
+                        /** @var \SimpleSoftwareIO\QrCode\Generator $instance */
+                        return $instance->size($pixels);
+        }
+                    /**
+         * Sets the format of the QrCode.
+         *
+         * @param string $format
+         * @return \Generator 
+         * @throws InvalidArgumentException
+         * @static 
+         */        public static function format($format)
+        {
+                        /** @var \SimpleSoftwareIO\QrCode\Generator $instance */
+                        return $instance->format($format);
+        }
+                    /**
+         * Sets the foreground color of the QrCode.
+         *
+         * @param int $red
+         * @param int $green
+         * @param int $blue
+         * @param null|int $alpha
+         * @return \Generator 
+         * @static 
+         */        public static function color($red, $green, $blue, $alpha = null)
+        {
+                        /** @var \SimpleSoftwareIO\QrCode\Generator $instance */
+                        return $instance->color($red, $green, $blue, $alpha);
+        }
+                    /**
+         * Sets the background color of the QrCode.
+         *
+         * @param int $red
+         * @param int $green
+         * @param int $blue
+         * @param null|int $alpha
+         * @return \Generator 
+         * @static 
+         */        public static function backgroundColor($red, $green, $blue, $alpha = null)
+        {
+                        /** @var \SimpleSoftwareIO\QrCode\Generator $instance */
+                        return $instance->backgroundColor($red, $green, $blue, $alpha);
+        }
+                    /**
+         * Sets the eye color for the provided eye index.
+         *
+         * @param int $eyeNumber
+         * @param int $innerRed
+         * @param int $innerGreen
+         * @param int $innerBlue
+         * @param int $outterRed
+         * @param int $outterGreen
+         * @param int $outterBlue
+         * @return \Generator 
+         * @throws InvalidArgumentException
+         * @static 
+         */        public static function eyeColor($eyeNumber, $innerRed, $innerGreen, $innerBlue, $outterRed = 0, $outterGreen = 0, $outterBlue = 0)
+        {
+                        /** @var \SimpleSoftwareIO\QrCode\Generator $instance */
+                        return $instance->eyeColor($eyeNumber, $innerRed, $innerGreen, $innerBlue, $outterRed, $outterGreen, $outterBlue);
+        }
+                    /**
+         * 
+         *
+         * @static 
+         */        public static function gradient($startRed, $startGreen, $startBlue, $endRed, $endGreen, $endBlue, $type)
+        {
+                        /** @var \SimpleSoftwareIO\QrCode\Generator $instance */
+                        return $instance->gradient($startRed, $startGreen, $startBlue, $endRed, $endGreen, $endBlue, $type);
+        }
+                    /**
+         * Sets the eye style.
+         *
+         * @param string $style
+         * @return \Generator 
+         * @throws InvalidArgumentException
+         * @static 
+         */        public static function eye($style)
+        {
+                        /** @var \SimpleSoftwareIO\QrCode\Generator $instance */
+                        return $instance->eye($style);
+        }
+                    /**
+         * Sets the style of the blocks for the QrCode.
+         *
+         * @param string $style
+         * @param float $size
+         * @return \Generator 
+         * @throws InvalidArgumentException
+         * @static 
+         */        public static function style($style, $size = 0.5)
+        {
+                        /** @var \SimpleSoftwareIO\QrCode\Generator $instance */
+                        return $instance->style($style, $size);
+        }
+                    /**
+         * Sets the encoding for the QrCode.
+         * 
+         * Possible values are
+         * ISO-8859-2, ISO-8859-3, ISO-8859-4, ISO-8859-5, ISO-8859-6,
+         * ISO-8859-7, ISO-8859-8, ISO-8859-9, ISO-8859-10, ISO-8859-11,
+         * ISO-8859-12, ISO-8859-13, ISO-8859-14, ISO-8859-15, ISO-8859-16,
+         * SHIFT-JIS, WINDOWS-1250, WINDOWS-1251, WINDOWS-1252, WINDOWS-1256,
+         * UTF-16BE, UTF-8, ASCII, GBK, EUC-KR.
+         *
+         * @param string $encoding
+         * @return \Generator 
+         * @static 
+         */        public static function encoding($encoding)
+        {
+                        /** @var \SimpleSoftwareIO\QrCode\Generator $instance */
+                        return $instance->encoding($encoding);
+        }
+                    /**
+         * Sets the error correction for the QrCode.
+         * 
+         * L: 7% loss.
+         * M: 15% loss.
+         * Q: 25% loss.
+         * H: 30% loss.
+         *
+         * @param string $errorCorrection
+         * @return \Generator 
+         * @static 
+         */        public static function errorCorrection($errorCorrection)
+        {
+                        /** @var \SimpleSoftwareIO\QrCode\Generator $instance */
+                        return $instance->errorCorrection($errorCorrection);
+        }
+                    /**
+         * Sets the margin of the QrCode.
+         *
+         * @param int $margin
+         * @return \Generator 
+         * @static 
+         */        public static function margin($margin)
+        {
+                        /** @var \SimpleSoftwareIO\QrCode\Generator $instance */
+                        return $instance->margin($margin);
+        }
+                    /**
+         * Fetches the Writer.
+         *
+         * @param \BaconQrCode\Renderer\ImageRenderer $renderer
+         * @return \BaconQrCode\Writer 
+         * @static 
+         */        public static function getWriter($renderer)
+        {
+                        /** @var \SimpleSoftwareIO\QrCode\Generator $instance */
+                        return $instance->getWriter($renderer);
+        }
+                    /**
+         * Fetches the Image Renderer.
+         *
+         * @return \BaconQrCode\Renderer\ImageRenderer 
+         * @static 
+         */        public static function getRenderer()
+        {
+                        /** @var \SimpleSoftwareIO\QrCode\Generator $instance */
+                        return $instance->getRenderer();
+        }
+                    /**
+         * Returns the Renderer Style.
+         *
+         * @return \BaconQrCode\Renderer\RendererStyle\RendererStyle 
+         * @static 
+         */        public static function getRendererStyle()
+        {
+                        /** @var \SimpleSoftwareIO\QrCode\Generator $instance */
+                        return $instance->getRendererStyle();
+        }
+                    /**
+         * Fetches the formatter.
+         *
+         * @return \BaconQrCode\Renderer\Image\ImageBackEndInterface 
+         * @static 
+         */        public static function getFormatter()
+        {
+                        /** @var \SimpleSoftwareIO\QrCode\Generator $instance */
+                        return $instance->getFormatter();
+        }
+                    /**
+         * Fetches the module.
+         *
+         * @return \BaconQrCode\Renderer\Module\ModuleInterface 
+         * @static 
+         */        public static function getModule()
+        {
+                        /** @var \SimpleSoftwareIO\QrCode\Generator $instance */
+                        return $instance->getModule();
+        }
+                    /**
+         * Fetches the eye style.
+         *
+         * @return \BaconQrCode\Renderer\Eye\EyeInterface 
+         * @static 
+         */        public static function getEye()
+        {
+                        /** @var \SimpleSoftwareIO\QrCode\Generator $instance */
+                        return $instance->getEye();
+        }
+                    /**
+         * Fetches the color fill.
+         *
+         * @return \BaconQrCode\Renderer\RendererStyle\Fill 
+         * @static 
+         */        public static function getFill()
+        {
+                        /** @var \SimpleSoftwareIO\QrCode\Generator $instance */
+                        return $instance->getFill();
+        }
+                    /**
+         * Creates a RGB or Alpha channel color.
+         *
+         * @param int $red
+         * @param int $green
+         * @param int $blue
+         * @param null|int $alpha
+         * @return \BaconQrCode\Renderer\Color\ColorInterface 
+         * @static 
+         */        public static function createColor($red, $green, $blue, $alpha = null)
+        {
+                        /** @var \SimpleSoftwareIO\QrCode\Generator $instance */
+                        return $instance->createColor($red, $green, $blue, $alpha);
+        }
+            }
+    }
+
 namespace Illuminate\Http {
             /**
      * 
@@ -21138,6 +21418,7 @@ namespace  {
             class URL extends \Illuminate\Support\Facades\URL {}
             class Validator extends \Illuminate\Support\Facades\Validator {}
             class View extends \Illuminate\Support\Facades\View {}
+            class QrCode extends \SimpleSoftwareIO\QrCode\Facades\QrCode {}
     }
 
 

+ 41 - 2
_ide_helper_models.php

@@ -555,6 +555,40 @@ namespace App\Models{
 	class CoachUser extends \Eloquent {}
 }
 
+namespace App\Models{
+/**
+ * 我的分销团队
+ *
+ * @property int $id 分销团队编号
+ * @property int $object_id 对象编号
+ * @property string $object_type 对象类型
+ * @property int $user_id 被邀用户编号
+ * @property string $level 层级
+ * @property string $state 状态
+ * @property \Illuminate\Support\Carbon|null $created_at 创建时间
+ * @property \Illuminate\Support\Carbon|null $updated_at 更新时间
+ * @property \Illuminate\Support\Carbon|null $deleted_at 删除时间
+ * @property-read \Illuminate\Database\Eloquent\Model|\Eloquent $inviter
+ * @property-read \App\Models\MemberUser $user
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|MarketDistTeam newModelQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|MarketDistTeam newQuery()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|MarketDistTeam onlyTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|MarketDistTeam query()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|MarketDistTeam whereCreatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|MarketDistTeam whereDeletedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|MarketDistTeam whereId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|MarketDistTeam whereLevel($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|MarketDistTeam whereObjectId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|MarketDistTeam whereObjectType($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|MarketDistTeam whereState($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|MarketDistTeam whereUpdatedAt($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|MarketDistTeam whereUserId($value)
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|MarketDistTeam withTrashed()
+ * @method static \Illuminate\Database\Eloquent\Builder<static>|MarketDistTeam withoutTrashed()
+ */
+	class MarketDistTeam extends \Eloquent {}
+}
+
 namespace App\Models{
 /**
  * 用户地址
@@ -815,6 +849,7 @@ namespace App\Models{
  * @property \Illuminate\Support\Carbon|null $deleted_at
  * @property-read \App\Models\CoachUser|null $coach
  * @property-read \App\Models\MemberUser|null $member
+ * @property-read \App\Models\Order|null $order
  * @method static \Illuminate\Database\Eloquent\Builder<static>|OrderComment newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|OrderComment newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|OrderComment onlyTrashed()
@@ -848,6 +883,7 @@ namespace App\Models{
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property-read \App\Models\Order|null $order
  * @method static \Illuminate\Database\Eloquent\Builder<static>|OrderDistRecord newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|OrderDistRecord newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|OrderDistRecord onlyTrashed()
@@ -881,6 +917,7 @@ namespace App\Models{
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property-read \App\Models\Order|null $order
  * @method static \Illuminate\Database\Eloquent\Builder<static>|OrderExcRecord newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|OrderExcRecord newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|OrderExcRecord onlyTrashed()
@@ -913,6 +950,7 @@ namespace App\Models{
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at
  * @property-read \App\Models\CoachUser|null $coach
+ * @property-read \App\Models\Order|null $order
  * @method static \Illuminate\Database\Eloquent\Builder<static>|OrderGrabRecord newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|OrderGrabRecord newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|OrderGrabRecord onlyTrashed()
@@ -943,6 +981,7 @@ namespace App\Models{
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at
+ * @property-read \App\Models\Order|null $order
  * @method static \Illuminate\Database\Eloquent\Builder<static>|OrderRecord newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|OrderRecord newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|OrderRecord onlyTrashed()
@@ -1023,8 +1062,8 @@ namespace App\Models{
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @property \Illuminate\Support\Carbon|null $deleted_at
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Project> $services
- * @property-read int|null $services_count
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Project> $projects
+ * @property-read int|null $projects_count
  * @method static \Illuminate\Database\Eloquent\Builder<static>|ProjectCate newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|ProjectCate newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|ProjectCate onlyTrashed()

+ 0 - 27
app/Enums/CommentStatus.php

@@ -89,31 +89,4 @@ enum CommentStatus: int
         ];
     }
 
-    /**
-     * 将枚举转换为字符串
-     *
-     * 使用示例:
-     * $status = CommentStatus::PENDING;
-     *
-     * // 与字符串比较
-     * if ($status == '1') { // 可以直接与字符串比较
-     *     // do something
-     * }
-     *
-     * // 与数字比较
-     * if ($status == 1) { // 可以直接与数字比较
-     *     // do something
-     * }
-     *
-     * echo $status; // 输出 "1"
-     * $str = (string)$status; // 显式转换为字符串 "1"
-     * $num = (int)$status; // 显式转换为数字 1
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
-
 }

+ 2 - 12
app/Enums/CouponRule.php

@@ -44,7 +44,7 @@ enum CouponRule: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::UNLIMITED => '无限制',
             self::FIRST_ORDER => '首单专享',
             self::NEW_USER => '新用户专享',
@@ -83,7 +83,7 @@ enum CouponRule: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::UNLIMITED->value => self::UNLIMITED,
             self::FIRST_ORDER->value => self::FIRST_ORDER,
             self::NEW_USER->value => self::NEW_USER,
@@ -120,14 +120,4 @@ enum CouponRule: int
             self::SPECIFIED_AMOUNT->value => self::SPECIFIED_AMOUNT->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/CouponScope.php

@@ -29,7 +29,7 @@ enum CouponScope: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::ALL => '全部商品',
             self::CATEGORY => '分类商品',
             self::SPECIFIC => '指定商品',
@@ -65,7 +65,7 @@ enum CouponScope: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::ALL->value => self::ALL,
             self::CATEGORY->value => self::CATEGORY,
             self::SPECIFIC->value => self::SPECIFIC,
@@ -96,14 +96,4 @@ enum CouponScope: int
             self::SPECIFIC->value => self::SPECIFIC->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/CouponStatus.php

@@ -29,7 +29,7 @@ enum CouponStatus: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::UNUSED => '未使用',
             self::USED => '已使用',
             self::EXPIRED => '已过期',
@@ -65,7 +65,7 @@ enum CouponStatus: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::UNUSED->value => self::UNUSED,
             self::USED->value => self::USED,
             self::EXPIRED->value => self::EXPIRED,
@@ -96,14 +96,4 @@ enum CouponStatus: int
             self::EXPIRED->value => self::EXPIRED->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/CouponType.php

@@ -29,7 +29,7 @@ enum CouponType: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::FIXED => '固定金额',
             self::PERCENT => '折扣比例',
             self::FREE => '免费券',
@@ -65,7 +65,7 @@ enum CouponType: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::FIXED->value => self::FIXED,
             self::PERCENT->value => self::PERCENT,
             self::FREE->value => self::FREE,
@@ -96,14 +96,4 @@ enum CouponType: int
             self::FREE->value => self::FREE->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/CouponValidType.php

@@ -29,7 +29,7 @@ enum CouponValidType: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::FIXED => '固定日期',
             self::DYNAMIC => '领取后计时',
             self::PERMANENT => '永久有效',
@@ -65,7 +65,7 @@ enum CouponValidType: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::FIXED->value => self::FIXED,
             self::DYNAMIC->value => self::DYNAMIC,
             self::PERMANENT->value => self::PERMANENT,
@@ -96,14 +96,4 @@ enum CouponValidType: int
             self::PERMANENT->value => self::PERMANENT->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/FeedbackStatus.php

@@ -29,7 +29,7 @@ enum FeedbackStatus: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::PENDING => '待处理',
             self::PROCESSING => '处理中',
             self::PROCESSED => '已处理',
@@ -65,7 +65,7 @@ enum FeedbackStatus: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::PENDING->value => self::PENDING,
             self::PROCESSING->value => self::PROCESSING,
             self::PROCESSED->value => self::PROCESSED,
@@ -96,14 +96,4 @@ enum FeedbackStatus: int
             self::PROCESSED->value => self::PROCESSED->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/FeedbackType.php

@@ -39,7 +39,7 @@ enum FeedbackType: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::SUGGESTION => '建议反馈',
             self::COMPLAINT => '投诉反馈',
             self::CONSULTATION => '咨询反馈',
@@ -77,7 +77,7 @@ enum FeedbackType: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::SUGGESTION->value => self::SUGGESTION,
             self::COMPLAINT->value => self::COMPLAINT,
             self::CONSULTATION->value => self::CONSULTATION,
@@ -112,14 +112,4 @@ enum FeedbackType: int
             self::OTHER->value => self::OTHER->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/GrabOrderStatus.php

@@ -29,7 +29,7 @@ enum GrabOrderStatus: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::PENDING => '待抢单',
             self::GRABBED => '已抢单',
             self::EXPIRED => '已过期',
@@ -65,7 +65,7 @@ enum GrabOrderStatus: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::PENDING->value => self::PENDING,
             self::GRABBED->value => self::GRABBED,
             self::EXPIRED->value => self::EXPIRED,
@@ -96,14 +96,4 @@ enum GrabOrderStatus: int
             self::EXPIRED->value => self::EXPIRED->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/MarketingRecordStatus.php

@@ -34,7 +34,7 @@ enum MarketingRecordStatus: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::PENDING => '待使用',
             self::USED => '已使用',
             self::EXPIRED => '已过期',
@@ -71,7 +71,7 @@ enum MarketingRecordStatus: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::PENDING->value => self::PENDING,
             self::USED->value => self::USED,
             self::EXPIRED->value => self::EXPIRED,
@@ -104,14 +104,4 @@ enum MarketingRecordStatus: int
             self::CANCELLED->value => self::CANCELLED->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/MarketingStatus.php

@@ -29,7 +29,7 @@ enum MarketingStatus: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::PENDING => '未开始',
             self::PROCESSING => '进行中',
             self::ENDED => '已结束',
@@ -65,7 +65,7 @@ enum MarketingStatus: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::PENDING->value => self::PENDING,
             self::PROCESSING->value => self::PROCESSING,
             self::ENDED->value => self::ENDED,
@@ -96,14 +96,4 @@ enum MarketingStatus: int
             self::ENDED->value => self::ENDED->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/MarketingType.php

@@ -34,7 +34,7 @@ enum MarketingType: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::COUPON => '优惠券',
             self::DISCOUNT => '折扣',
             self::CASHBACK => '返现',
@@ -71,7 +71,7 @@ enum MarketingType: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::COUPON->value => self::COUPON,
             self::DISCOUNT->value => self::DISCOUNT,
             self::CASHBACK->value => self::CASHBACK,
@@ -104,14 +104,4 @@ enum MarketingType: int
             self::GIFT->value => self::GIFT->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/OrderDistributionObject.php

@@ -34,7 +34,7 @@ enum OrderDistributionObject: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::TECHNICIAN => '技师',
             self::SHOP => '店铺',
             self::AGENT => '代理商',
@@ -71,7 +71,7 @@ enum OrderDistributionObject: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::TECHNICIAN->value => self::TECHNICIAN,
             self::SHOP->value => self::SHOP,
             self::AGENT->value => self::AGENT,
@@ -104,14 +104,4 @@ enum OrderDistributionObject: int
             self::PROMOTER->value => self::PROMOTER->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/OrderDistributionType.php

@@ -34,7 +34,7 @@ enum OrderDistributionType: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::PLATFORM => '平台分销',
             self::SHOP => '店铺分销',
             self::PERSONAL => '个人分销',
@@ -71,7 +71,7 @@ enum OrderDistributionType: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::PLATFORM->value => self::PLATFORM,
             self::SHOP->value => self::SHOP,
             self::PERSONAL->value => self::PERSONAL,
@@ -104,14 +104,4 @@ enum OrderDistributionType: int
             self::TEAM->value => self::TEAM->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/OrderExceptionStatus.php

@@ -34,7 +34,7 @@ enum OrderExceptionStatus: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::PENDING => '待处理',
             self::PROCESSING => '处理中',
             self::RESOLVED => '已解决',
@@ -71,7 +71,7 @@ enum OrderExceptionStatus: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::PENDING->value => self::PENDING,
             self::PROCESSING->value => self::PROCESSING,
             self::RESOLVED->value => self::RESOLVED,
@@ -104,14 +104,4 @@ enum OrderExceptionStatus: int
             self::CANCELLED->value => self::CANCELLED->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/OrderRecordStatus.php

@@ -54,7 +54,7 @@ enum OrderRecordStatus: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::CREATED => '创建订单',
             self::PAID => '支付完成',
             self::ASSIGNED => '已分配技师',
@@ -95,7 +95,7 @@ enum OrderRecordStatus: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::CREATED->value => self::CREATED,
             self::PAID->value => self::PAID,
             self::ASSIGNED->value => self::ASSIGNED,
@@ -136,14 +136,4 @@ enum OrderRecordStatus: int
             self::CANCELLED->value => self::CANCELLED->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/OrderSource.php

@@ -24,7 +24,7 @@ enum OrderSource: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::PLATFORM => '平台',
             self::SHOP => '店铺',
         };
@@ -59,7 +59,7 @@ enum OrderSource: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::PLATFORM->value => self::PLATFORM,
             self::SHOP->value => self::SHOP,
             default => null
@@ -88,14 +88,4 @@ enum OrderSource: int
             self::SHOP->value => self::SHOP->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/OrderStatus.php

@@ -34,7 +34,7 @@ enum OrderStatus: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::PENDING => '待处理',
             self::PROCESSING => '处理中',
             self::COMPLETED => '已完成',
@@ -71,7 +71,7 @@ enum OrderStatus: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::PENDING->value => self::PENDING,
             self::PROCESSING->value => self::PROCESSING,
             self::COMPLETED->value => self::COMPLETED,
@@ -104,14 +104,4 @@ enum OrderStatus: int
             self::CANCELLED->value => self::CANCELLED->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/OrderType.php

@@ -39,7 +39,7 @@ enum OrderType: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::VISIT => '上门',
             self::GRAB => '抢单',
             self::OVERTIME => '加钟',
@@ -77,7 +77,7 @@ enum OrderType: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::VISIT->value => self::VISIT,
             self::GRAB->value => self::GRAB,
             self::OVERTIME->value => self::OVERTIME,
@@ -112,14 +112,4 @@ enum OrderType: int
             self::EMERGENCY->value => self::EMERGENCY->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/PaymentMethod.php

@@ -34,7 +34,7 @@ enum PaymentMethod: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::WECHAT => '微信支付',
             self::ALIPAY => '支付宝',
             self::BALANCE => '余额支付',
@@ -71,7 +71,7 @@ enum PaymentMethod: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::WECHAT->value => self::WECHAT,
             self::ALIPAY->value => self::ALIPAY,
             self::BALANCE->value => self::BALANCE,
@@ -104,14 +104,4 @@ enum PaymentMethod: int
             self::MIXED->value => self::MIXED->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/PaymentStatus.php

@@ -29,7 +29,7 @@ enum PaymentStatus: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::PENDING => '待支付',
             self::PAID => '已支付',
             self::CANCELLED => '已取消',
@@ -65,7 +65,7 @@ enum PaymentStatus: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::PENDING->value => self::PENDING,
             self::PAID->value => self::PAID,
             self::CANCELLED->value => self::CANCELLED,
@@ -96,14 +96,4 @@ enum PaymentStatus: int
             self::CANCELLED->value => self::CANCELLED->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/ProfitSource.php

@@ -34,7 +34,7 @@ enum ProfitSource: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::ORDER => '订单分账',
             self::PROMOTION => '推广分账',
             self::TEAM => '团队分账',
@@ -71,7 +71,7 @@ enum ProfitSource: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::ORDER->value => self::ORDER,
             self::PROMOTION->value => self::PROMOTION,
             self::TEAM->value => self::TEAM,
@@ -104,14 +104,4 @@ enum ProfitSource: int
             self::OTHER->value => self::OTHER->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/ProfitType.php

@@ -39,7 +39,7 @@ enum ProfitType: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::PLATFORM => '平台分账',
             self::SHOP => '店铺分账',
             self::TECHNICIAN => '技师分账',
@@ -77,7 +77,7 @@ enum ProfitType: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::PLATFORM->value => self::PLATFORM,
             self::SHOP->value => self::SHOP,
             self::TECHNICIAN->value => self::TECHNICIAN,
@@ -112,14 +112,4 @@ enum ProfitType: int
             self::PROMOTER->value => self::PROMOTER->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/RechargeSource.php

@@ -34,7 +34,7 @@ enum RechargeSource: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::WECHAT => '微信',
             self::ALIPAY => '支付宝',
             self::BANK => '银行卡',
@@ -71,7 +71,7 @@ enum RechargeSource: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::WECHAT->value => self::WECHAT,
             self::ALIPAY->value => self::ALIPAY,
             self::BANK->value => self::BANK,
@@ -104,14 +104,4 @@ enum RechargeSource: int
             self::OTHER->value => self::OTHER->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/RechargeStatus.php

@@ -34,7 +34,7 @@ enum RechargeStatus: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::PENDING => '待充值',
             self::PROCESSING => '充值中',
             self::SUCCESS => '充值成功',
@@ -71,7 +71,7 @@ enum RechargeStatus: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::PENDING->value => self::PENDING,
             self::PROCESSING->value => self::PROCESSING,
             self::SUCCESS->value => self::SUCCESS,
@@ -104,14 +104,4 @@ enum RechargeStatus: int
             self::FAILED->value => self::FAILED->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/RechargeType.php

@@ -34,7 +34,7 @@ enum RechargeType: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::NORMAL => '普通充值',
             self::FIRST => '首充',
             self::ACTIVITY => '活动充值',
@@ -71,7 +71,7 @@ enum RechargeType: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::NORMAL->value => self::NORMAL,
             self::FIRST->value => self::FIRST,
             self::ACTIVITY->value => self::ACTIVITY,
@@ -104,14 +104,4 @@ enum RechargeType: int
             self::GIFT->value => self::GIFT->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/RefundMethod.php

@@ -29,7 +29,7 @@ enum RefundMethod: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::ORIGINAL => '原路退回',
             self::BALANCE => '退回余额',
             self::MANUAL => '人工处理',
@@ -65,7 +65,7 @@ enum RefundMethod: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::ORIGINAL->value => self::ORIGINAL,
             self::BALANCE->value => self::BALANCE,
             self::MANUAL->value => self::MANUAL,
@@ -96,14 +96,4 @@ enum RefundMethod: int
             self::MANUAL->value => self::MANUAL->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/RefundStatus.php

@@ -34,7 +34,7 @@ enum RefundStatus: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::PENDING => '待退款',
             self::PROCESSING => '退款中',
             self::SUCCESS => '退款成功',
@@ -71,7 +71,7 @@ enum RefundStatus: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::PENDING->value => self::PENDING,
             self::PROCESSING->value => self::PROCESSING,
             self::SUCCESS->value => self::SUCCESS,
@@ -104,14 +104,4 @@ enum RefundStatus: int
             self::FAILED->value => self::FAILED->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/ServiceFeeType.php

@@ -34,7 +34,7 @@ enum ServiceFeeType: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::FIXED => '固定费用',
             self::DISTANCE => '距离费用',
             self::TIME => '时间费用',
@@ -71,7 +71,7 @@ enum ServiceFeeType: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::FIXED->value => self::FIXED,
             self::DISTANCE->value => self::DISTANCE,
             self::TIME->value => self::TIME,
@@ -104,14 +104,4 @@ enum ServiceFeeType: int
             self::MIXED->value => self::MIXED->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/ServiceRangeType.php

@@ -29,7 +29,7 @@ enum ServiceRangeType: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::CIRCLE => '圆形范围',
             self::POLYGON => '多边形范围',
             self::ADMINISTRATIVE => '行政区划',
@@ -65,7 +65,7 @@ enum ServiceRangeType: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::CIRCLE->value => self::CIRCLE,
             self::POLYGON->value => self::POLYGON,
             self::ADMINISTRATIVE->value => self::ADMINISTRATIVE,
@@ -96,14 +96,4 @@ enum ServiceRangeType: int
             self::ADMINISTRATIVE->value => self::ADMINISTRATIVE->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/ServiceStatus.php

@@ -29,7 +29,7 @@ enum ServiceStatus: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::AVAILABLE => '可服务',
             self::UNAVAILABLE => '不可服务',
             self::MAINTENANCE => '维护中',
@@ -65,7 +65,7 @@ enum ServiceStatus: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::AVAILABLE->value => self::AVAILABLE,
             self::UNAVAILABLE->value => self::UNAVAILABLE,
             self::MAINTENANCE->value => self::MAINTENANCE,
@@ -96,14 +96,4 @@ enum ServiceStatus: int
             self::MAINTENANCE->value => self::MAINTENANCE->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/ShopContractStatus.php

@@ -29,7 +29,7 @@ enum ShopContractStatus: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::SIGNING => '签约中',
             self::SIGNED => '已签约',
             self::TERMINATED => '已解约',
@@ -65,7 +65,7 @@ enum ShopContractStatus: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::SIGNING->value => self::SIGNING,
             self::SIGNED->value => self::SIGNED,
             self::TERMINATED->value => self::TERMINATED,
@@ -96,14 +96,4 @@ enum ShopContractStatus: int
             self::TERMINATED->value => self::TERMINATED->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/ShopServiceStatus.php

@@ -34,7 +34,7 @@ enum ShopServiceStatus: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::AVAILABLE => '可预约',
             self::BUSY => '繁忙中',
             self::UNAVAILABLE => '不可预约',
@@ -71,7 +71,7 @@ enum ShopServiceStatus: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::AVAILABLE->value => self::AVAILABLE,
             self::BUSY->value => self::BUSY,
             self::UNAVAILABLE->value => self::UNAVAILABLE,
@@ -104,14 +104,4 @@ enum ShopServiceStatus: int
             self::MAINTENANCE->value => self::MAINTENANCE->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/ShopStatus.php

@@ -34,7 +34,7 @@ enum ShopStatus: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::PENDING => '待开业',
             self::OPERATING => '营业中',
             self::SUSPENDED => '暂停营业',
@@ -71,7 +71,7 @@ enum ShopStatus: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::PENDING->value => self::PENDING,
             self::OPERATING->value => self::OPERATING,
             self::SUSPENDED->value => self::SUSPENDED,
@@ -104,14 +104,4 @@ enum ShopStatus: int
             self::CLOSED->value => self::CLOSED->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/ShopType.php

@@ -34,7 +34,7 @@ enum ShopType: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::DIRECT => '直营店',
             self::FRANCHISE => '加盟店',
             self::COOPERATION => '合作店',
@@ -71,7 +71,7 @@ enum ShopType: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::DIRECT->value => self::DIRECT,
             self::FRANCHISE->value => self::FRANCHISE,
             self::COOPERATION->value => self::COOPERATION,
@@ -104,14 +104,4 @@ enum ShopType: int
             self::ALLIANCE->value => self::ALLIANCE->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/SocialPlatform.php

@@ -39,7 +39,7 @@ enum SocialPlatform: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::WECHAT => '微信',
             self::QQ => 'QQ',
             self::WEIBO => '微博',
@@ -77,7 +77,7 @@ enum SocialPlatform: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::WECHAT->value => self::WECHAT,
             self::QQ->value => self::QQ,
             self::WEIBO->value => self::WEIBO,
@@ -112,14 +112,4 @@ enum SocialPlatform: int
             self::XIAOHONGSHU->value => self::XIAOHONGSHU->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/SysAreaType.php

@@ -29,7 +29,7 @@ enum SysAreaType: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::PROVINCE => '省',
             self::CITY => '市',
             self::DISTRICT => '区',
@@ -65,7 +65,7 @@ enum SysAreaType: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::PROVINCE->value => self::PROVINCE,
             self::CITY->value => self::CITY,
             self::DISTRICT->value => self::DISTRICT,
@@ -96,14 +96,4 @@ enum SysAreaType: int
             self::DISTRICT->value => self::DISTRICT->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/SysAuditStatus.php

@@ -29,7 +29,7 @@ enum SysAuditStatus: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::PENDING => '待审核',
             self::PASSED => '通过',
             self::REJECTED => '拒绝',
@@ -65,7 +65,7 @@ enum SysAuditStatus: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::PENDING->value => self::PENDING,
             self::PASSED->value => self::PASSED,
             self::REJECTED->value => self::REJECTED,
@@ -96,14 +96,4 @@ enum SysAuditStatus: int
             self::REJECTED->value => self::REJECTED->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/SysCacheType.php

@@ -34,7 +34,7 @@ enum SysCacheType: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::MEMORY => '内存缓存',
             self::REDIS => 'Redis缓存',
             self::LOCAL => '本地缓存',
@@ -71,7 +71,7 @@ enum SysCacheType: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::MEMORY->value => self::MEMORY,
             self::REDIS->value => self::REDIS,
             self::LOCAL->value => self::LOCAL,
@@ -104,14 +104,4 @@ enum SysCacheType: int
             self::HYBRID->value => self::HYBRID->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/SysErrorStrategy.php

@@ -34,7 +34,7 @@ enum SysErrorStrategy: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::CONTINUE => '继续执行',
             self::RETRY => '重试执行',
             self::SKIP => '跳过执行',
@@ -71,7 +71,7 @@ enum SysErrorStrategy: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::CONTINUE->value => self::CONTINUE,
             self::RETRY->value => self::RETRY,
             self::SKIP->value => self::SKIP,
@@ -104,14 +104,4 @@ enum SysErrorStrategy: int
             self::STOP->value => self::STOP->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/SysParameterType.php

@@ -34,7 +34,7 @@ enum SysParameterType: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::SYSTEM => '系统参数',
             self::BUSINESS => '业务参数',
             self::CONFIG => '配置参数',
@@ -71,7 +71,7 @@ enum SysParameterType: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::SYSTEM->value => self::SYSTEM,
             self::BUSINESS->value => self::BUSINESS,
             self::CONFIG->value => self::CONFIG,
@@ -104,14 +104,4 @@ enum SysParameterType: int
             self::OTHER->value => self::OTHER->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/SysRuleType.php

@@ -39,7 +39,7 @@ enum SysRuleType: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::ORDER => '订单规则',
             self::COMMISSION => '分佣规则',
             self::MARKETING => '营销规则',
@@ -77,7 +77,7 @@ enum SysRuleType: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::ORDER->value => self::ORDER,
             self::COMMISSION->value => self::COMMISSION,
             self::MARKETING->value => self::MARKETING,
@@ -112,14 +112,4 @@ enum SysRuleType: int
             self::OTHER->value => self::OTHER->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/SysStatus.php

@@ -24,7 +24,7 @@ enum SysStatus: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::ENABLE => '启用',
             self::DISABLE => '禁用',
         };
@@ -59,7 +59,7 @@ enum SysStatus: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::ENABLE->value => self::ENABLE,
             self::DISABLE->value => self::DISABLE,
             default => null
@@ -88,14 +88,4 @@ enum SysStatus: int
             self::DISABLE->value => self::DISABLE->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/SysTaskType.php

@@ -34,7 +34,7 @@ enum SysTaskType: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::SYSTEM => '系统任务',
             self::BUSINESS => '业务任务',
             self::CLEANUP => '清理任务',
@@ -71,7 +71,7 @@ enum SysTaskType: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::SYSTEM->value => self::SYSTEM,
             self::BUSINESS->value => self::BUSINESS,
             self::CLEANUP->value => self::CLEANUP,
@@ -104,14 +104,4 @@ enum SysTaskType: int
             self::STATISTICS->value => self::STATISTICS->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/TechnicianAlarmType.php

@@ -34,7 +34,7 @@ enum TechnicianAlarmType: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::EMERGENCY => '紧急求助',
             self::HARASSMENT => '骚扰投诉',
             self::DISPUTE => '纠纷',
@@ -71,7 +71,7 @@ enum TechnicianAlarmType: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::EMERGENCY->value => self::EMERGENCY,
             self::HARASSMENT->value => self::HARASSMENT,
             self::DISPUTE->value => self::DISPUTE,
@@ -104,14 +104,4 @@ enum TechnicianAlarmType: int
             self::OTHER->value => self::OTHER->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/TechnicianAuthStatus.php

@@ -29,7 +29,7 @@ enum TechnicianAuthStatus: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::AUDITING => '审核中',
             self::PASSED => '审核通过',
             self::REJECTED => '审核拒绝',
@@ -65,7 +65,7 @@ enum TechnicianAuthStatus: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::AUDITING->value => self::AUDITING,
             self::PASSED->value => self::PASSED,
             self::REJECTED->value => self::REJECTED,
@@ -96,14 +96,4 @@ enum TechnicianAuthStatus: int
             self::REJECTED->value => self::REJECTED->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/TechnicianExpSource.php

@@ -34,7 +34,7 @@ enum TechnicianExpSource: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::ORDER => '订单',
             self::OVERTIME => '加钟',
             self::COMMENT => '评价',
@@ -71,7 +71,7 @@ enum TechnicianExpSource: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::ORDER->value => self::ORDER,
             self::OVERTIME->value => self::OVERTIME,
             self::COMMENT->value => self::COMMENT,
@@ -104,14 +104,4 @@ enum TechnicianExpSource: int
             self::PROMOTION->value => self::PROMOTION->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 1 - 9
app/Enums/TechnicianLevel.php

@@ -121,13 +121,5 @@ enum TechnicianLevel: int
         ];
     }
 
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
+  
 }

+ 2 - 12
app/Enums/TechnicianLocationType.php

@@ -24,7 +24,7 @@ enum TechnicianLocationType: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::CURRENT => '当前定位',
             self::COMMON => '常用定位',
         };
@@ -59,7 +59,7 @@ enum TechnicianLocationType: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::CURRENT->value => self::CURRENT,
             self::COMMON->value => self::COMMON,
             default => null
@@ -88,14 +88,4 @@ enum TechnicianLocationType: int
             self::COMMON->value => self::COMMON->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/TechnicianStatus.php

@@ -39,7 +39,7 @@ enum TechnicianStatus: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::PENDING => '待认证',
             self::ACTIVE => '正常服务',
             self::SUSPENDED => '暂停服务',
@@ -77,7 +77,7 @@ enum TechnicianStatus: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::PENDING->value => self::PENDING,
             self::ACTIVE->value => self::ACTIVE,
             self::SUSPENDED->value => self::SUSPENDED,
@@ -112,14 +112,4 @@ enum TechnicianStatus: int
             self::TERMINATED->value => self::TERMINATED->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/TechnicianWorkStatus.php

@@ -29,7 +29,7 @@ enum TechnicianWorkStatus: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::REST => '休息',
             self::FREE => '空闲',
             self::BUSY => '忙碌',
@@ -65,7 +65,7 @@ enum TechnicianWorkStatus: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::REST->value => self::REST,
             self::FREE->value => self::FREE,
             self::BUSY->value => self::BUSY,
@@ -96,14 +96,4 @@ enum TechnicianWorkStatus: int
             self::BUSY->value => self::BUSY->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/TransactionDirection.php

@@ -24,7 +24,7 @@ enum TransactionDirection: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::IN => '收入',
             self::OUT => '支出',
         };
@@ -59,7 +59,7 @@ enum TransactionDirection: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::IN->value => self::IN,
             self::OUT->value => self::OUT,
             default => null
@@ -88,14 +88,4 @@ enum TransactionDirection: int
             self::OUT->value => self::OUT->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/TransactionType.php

@@ -49,7 +49,7 @@ enum TransactionType: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::RECHARGE => '充值',
             self::WITHDRAW => '提现',
             self::PAYMENT => '支付',
@@ -89,7 +89,7 @@ enum TransactionType: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::RECHARGE->value => self::RECHARGE,
             self::WITHDRAW->value => self::WITHDRAW,
             self::PAYMENT->value => self::PAYMENT,
@@ -128,14 +128,4 @@ enum TransactionType: int
             self::PENALTY->value => self::PENALTY->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/UserGender.php

@@ -29,7 +29,7 @@ enum UserGender: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::UNKNOWN => '未知',
             self::MALE => '男',
             self::FEMALE => '女',
@@ -65,7 +65,7 @@ enum UserGender: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::UNKNOWN->value => self::UNKNOWN,
             self::MALE->value => self::MALE,
             self::FEMALE->value => self::FEMALE,
@@ -96,14 +96,4 @@ enum UserGender: int
             self::FEMALE->value => self::FEMALE->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/UserStatus.php

@@ -24,7 +24,7 @@ enum UserStatus: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::OPEN => '开启',
             self::CLOSE => '关闭',
         };
@@ -59,7 +59,7 @@ enum UserStatus: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::OPEN->value => self::OPEN,
             self::CLOSE->value => self::CLOSE,
             default => null
@@ -88,14 +88,4 @@ enum UserStatus: int
             self::CLOSE->value => self::CLOSE->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/UserType.php

@@ -39,7 +39,7 @@ enum UserType: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::NORMAL => '普通用户',
             self::VIP => 'VIP用户',
             self::MERCHANT => '商户',
@@ -77,7 +77,7 @@ enum UserType: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::NORMAL->value => self::NORMAL,
             self::VIP->value => self::VIP,
             self::MERCHANT->value => self::MERCHANT,
@@ -112,14 +112,4 @@ enum UserType: int
             self::ADMIN->value => self::ADMIN->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 1 - 9
app/Enums/WalletType.php

@@ -105,13 +105,5 @@ enum WalletType: int
         ];
     }
 
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
+  
 }

+ 2 - 12
app/Enums/WithdrawAuditStatus.php

@@ -34,7 +34,7 @@ enum WithdrawAuditStatus: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::PENDING => '待审核',
             self::PASSED => '审核通过',
             self::REJECTED => '审核拒绝',
@@ -71,7 +71,7 @@ enum WithdrawAuditStatus: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::PENDING->value => self::PENDING,
             self::PASSED->value => self::PASSED,
             self::REJECTED->value => self::REJECTED,
@@ -104,14 +104,4 @@ enum WithdrawAuditStatus: int
             self::CANCELLED->value => self::CANCELLED->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/WithdrawMethod.php

@@ -29,7 +29,7 @@ enum WithdrawMethod: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::WECHAT => '微信',
             self::ALIPAY => '支付宝',
             self::BANK => '银行卡',
@@ -65,7 +65,7 @@ enum WithdrawMethod: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::WECHAT->value => self::WECHAT,
             self::ALIPAY->value => self::ALIPAY,
             self::BANK->value => self::BANK,
@@ -96,14 +96,4 @@ enum WithdrawMethod: int
             self::BANK->value => self::BANK->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 2 - 12
app/Enums/WithdrawStatus.php

@@ -34,7 +34,7 @@ enum WithdrawStatus: int
      */
     public function label(): string
     {
-        return match($this) {
+        return match ($this) {
             self::PENDING => '待处理',
             self::PROCESSING => '处理中',
             self::SUCCESS => '提现成功',
@@ -71,7 +71,7 @@ enum WithdrawStatus: int
      */
     public static function fromValue(int $value): ?self
     {
-        return match($value) {
+        return match ($value) {
             self::PENDING->value => self::PENDING,
             self::PROCESSING->value => self::PROCESSING,
             self::SUCCESS->value => self::SUCCESS,
@@ -104,14 +104,4 @@ enum WithdrawStatus: int
             self::FAILED->value => self::FAILED->label(),
         ];
     }
-
-    /**
-     * 将枚举转换为字符串
-     *
-     * @return string 返回枚举的值的字符串形式
-     */
-    public function __toString(): string
-    {
-        return (string) $this->value;
-    }
 }

+ 4 - 4
app/Models/OrderComment.php

@@ -10,9 +10,9 @@ use Slowlyo\OwlAdmin\Models\BaseModel as Model;
  */
 class OrderComment extends Model
 {
-	use SoftDeletes;
+    use SoftDeletes;
 
-	protected $table = 'order_comments';
+    protected $table = 'order_comments';
 
     /**
      * @Author FelixYin
@@ -20,7 +20,7 @@ class OrderComment extends Model
      */
     public function order()
     {
-        return $this->belongsTo('App\Models\OrderInfo', 'order_id');
+        return $this->belongsTo('App\Models\Order', 'order_id');
     }
 
     /**
@@ -40,4 +40,4 @@ class OrderComment extends Model
     {
         return $this->belongsTo('App\Models\CoachUser', 'coach_id');
     }
-}
+}

+ 4 - 4
app/Models/OrderDistRecord.php

@@ -10,9 +10,9 @@ use Slowlyo\OwlAdmin\Models\BaseModel as Model;
  */
 class OrderDistRecord extends Model
 {
-	use SoftDeletes;
+    use SoftDeletes;
 
-	protected $table = 'order_dist_records';
+    protected $table = 'order_dist_records';
 
     /**
      * @Author FelixYin
@@ -20,6 +20,6 @@ class OrderDistRecord extends Model
      */
     public function order()
     {
-        return $this->belongsTo('App\Models\OrderInfo', 'order_id');
+        return $this->belongsTo('App\Models\Order', 'order_id');
     }
-}
+}

+ 4 - 4
app/Models/OrderExcRecord.php

@@ -10,9 +10,9 @@ use Slowlyo\OwlAdmin\Models\BaseModel as Model;
  */
 class OrderExcRecord extends Model
 {
-	use SoftDeletes;
+    use SoftDeletes;
 
-	protected $table = 'order_exc_records';
+    protected $table = 'order_exc_records';
 
     /**
      * @Author FelixYin
@@ -20,6 +20,6 @@ class OrderExcRecord extends Model
      */
     public function order()
     {
-        return $this->belongsTo('App\Models\OrderInfo', 'order_id');
+        return $this->belongsTo('App\Models\Order', 'order_id');
     }
-}
+}

+ 4 - 4
app/Models/OrderGrabRecord.php

@@ -10,9 +10,9 @@ use Slowlyo\OwlAdmin\Models\BaseModel as Model;
  */
 class OrderGrabRecord extends Model
 {
-	use SoftDeletes;
+    use SoftDeletes;
 
-	protected $table = 'order_grab_records';
+    protected $table = 'order_grab_records';
 
     /**
      * @Author FelixYin
@@ -20,7 +20,7 @@ class OrderGrabRecord extends Model
      */
     public function order()
     {
-        return $this->belongsTo('App\Models\OrderInfo', 'order_id');
+        return $this->belongsTo('App\Models\Order', 'order_id');
     }
 
     /**
@@ -31,4 +31,4 @@ class OrderGrabRecord extends Model
     {
         return $this->belongsTo('App\Models\CoachUser', 'coach_id');
     }
-}
+}

+ 1 - 1
app/Models/OrderRecord.php

@@ -23,6 +23,6 @@ class OrderRecord extends Model
      */
     public function order()
     {
-        return $this->belongsTo('App\Models\OrderInfo', 'order_id');
+        return $this->belongsTo('App\Models\Order', 'order_id');
     }
 }

+ 10 - 10
app/Services/Client/OrderService.php

@@ -175,9 +175,9 @@ class OrderService
     {
         $coach = CoachUser::where('id', $coachId)
             ->where('state', 'enable')
-            ->whereHas('info', fn ($q) => $q->where('state', 'approved'))
-            ->whereHas('qual', fn ($q) => $q->where('state', 'approved'))
-            ->whereHas('real', fn ($q) => $q->where('state', 'approved'))
+            ->whereHas('info', fn($q) => $q->where('state', 'approved'))
+            ->whereHas('qual', fn($q) => $q->where('state', 'approved'))
+            ->whereHas('real', fn($q) => $q->where('state', 'approved'))
             ->firstOrFail();
 
         return $coach;
@@ -730,10 +730,10 @@ class OrderService
         try {
             // 1. 校验技师
             $coach = CoachUser::where('state', 'enable')
-                ->whereHas('info', fn ($q) => $q->where('state', 'approved'))
-                ->whereHas('real', fn ($q) => $q->where('state', 'approved'))
-                ->whereHas('qual', fn ($q) => $q->where('state', 'approved'))
-                ->with(['projects' => fn ($q) => $q->where('project_id', $projectId)])
+                ->whereHas('info', fn($q) => $q->where('state', 'approved'))
+                ->whereHas('real', fn($q) => $q->where('state', 'approved'))
+                ->whereHas('qual', fn($q) => $q->where('state', 'approved'))
+                ->with(['projects' => fn($q) => $q->where('project_id', $projectId)])
                 ->find($coachId);
 
             abort_if(! $coach, 404, '技师不存在或状态异常');
@@ -761,7 +761,7 @@ class OrderService
                 ? bcmul($fee, '2', 2)
                 : $fee;
         } catch (Exception $e) {
-            Log::error(__CLASS__.'->'.__FUNCTION__.'计算路费失败:', [
+            Log::error(__CLASS__ . '->' . __FUNCTION__ . '计算路费失败:', [
                 'message' => $e->getMessage(),
                 'coach_id' => $coachId,
                 'project_id' => $projectId,
@@ -904,7 +904,7 @@ class OrderService
                 'delivery_fee' => $deliveryFee,
             ];
         } catch (Exception $e) {
-            Log::error(__CLASS__.'->'.__FUNCTION__.'计算订单金额失败:', [
+            Log::error(__CLASS__ . '->' . __FUNCTION__ . '计算订单金额失败:', [
                 'message' => $e->getMessage(),
                 'user_id' => $userId,
                 'project_id' => $projectId,
@@ -1044,7 +1044,7 @@ class OrderService
         WalletPaymentRecord::create([
             'order_id' => $order->id,
             'wallet_id' => $wallet->id,
-            'payment_no' => 'balance_'.$order->id,
+            'payment_no' => 'balance_' . $order->id,
             'payment_method' => 'balance',
             'total_amount' => $order->balance_amount,
             'actual_amount' => 0,