refactor(logistics): 重构物流模块

- 修改物流运费模板相关代码，优化数据传输对象和枚举类 - 重命名部分文件和类，统一命名规范- 添加物流公司的领域模型和仓储接口 - 调整数据库迁移文件，修正字段注释
red-jasmine · Nov 12, 2024 · 48ae6a3 · 48ae6a3
1 parent fb20294
commit 48ae6a3
Show file tree

Hide file tree

Showing 16 changed files with 73 additions and 24 deletions.
diff --git a/...ages/logistics/database/migrations/2024_03_09_210123_create_logistics_companies_table.php b/...ages/logistics/database/migrations/2024_03_09_210123_create_logistics_companies_table.php
@@ -10,10 +10,10 @@ public function up() : void
         // 运费
         Schema::create('logistics_companies', function (Blueprint $table) {
             $table->id();
-            $table->string('name')->comment('名称');
             $table->string('code')->comment('编码');
+            $table->string('name')->comment('名称');
             $table->string('letter')->nullable()->comment('首字母');
-            $table->string('logo')->nullable()->comment('名称');
+            $table->string('logo')->nullable()->comment('图标');
             $table->string('tel')->nullable()->comment('电话');
             $table->string('url')->nullable()->comment('网址');
             $table->timestamps();

diff --git a/packages/logistics/src/Actions/FreightTemplates/FreightTemplateCreateAction.php b/packages/logistics/src/Actions/FreightTemplates/FreightTemplateCreateAction.php
@@ -6,10 +6,10 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use RedJasmine\Logistics\DataTransferObjects\FreightTemplates\FreightTemplateDTO;
+use RedJasmine\Logistics\Domain\Models\LogisticsFreightTemplate;
+use RedJasmine\Logistics\Domain\Models\LogisticsFreightTemplateFeeRegion;
+use RedJasmine\Logistics\Domain\Models\LogisticsFreightTemplateFreeRegion;
 use RedJasmine\Logistics\FreightTemplateService;
-use RedJasmine\Logistics\Models\LogisticsFreightTemplate;
-use RedJasmine\Logistics\Models\LogisticsFreightTemplateFeeRegion;
-use RedJasmine\Logistics\Models\LogisticsFreightTemplateFreeRegion;
 use RedJasmine\Logistics\Pipelines\FreightTemplates\FreightTemplateValidatePipeline;
 use RedJasmine\Support\Foundation\Service\Action;
 use Throwable;

diff --git a/packages/logistics/src/Actions/FreightTemplates/FreightTemplateUpdateAction.php b/packages/logistics/src/Actions/FreightTemplates/FreightTemplateUpdateAction.php
@@ -6,10 +6,10 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use RedJasmine\Logistics\DataTransferObjects\FreightTemplates\FreightTemplateDTO;
+use RedJasmine\Logistics\Domain\Models\LogisticsFreightTemplate;
+use RedJasmine\Logistics\Domain\Models\LogisticsFreightTemplateFeeRegion;
+use RedJasmine\Logistics\Domain\Models\LogisticsFreightTemplateFreeRegion;
 use RedJasmine\Logistics\FreightTemplateService;
-use RedJasmine\Logistics\Models\LogisticsFreightTemplate;
-use RedJasmine\Logistics\Models\LogisticsFreightTemplateFeeRegion;
-use RedJasmine\Logistics\Models\LogisticsFreightTemplateFreeRegion;
 use RedJasmine\Logistics\Pipelines\FreightTemplates\FreightTemplateValidatePipeline;
 use RedJasmine\Support\Foundation\Service\Action;
 use Throwable;

diff --git a/packages/logistics/src/Application/Services/LogisticsCompanyCommandService.php b/packages/logistics/src/Application/Services/LogisticsCompanyCommandService.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace RedJasmine\Logistics\Application\Services;
+
+use RedJasmine\Support\Application\ApplicationCommandService;
+
+class LogisticsCompanyCommandService extends ApplicationCommandService
+{
+
+}
diff --git a/packages/logistics/src/DataTransferObjects/FreightTemplates/FreightTemplateDTO.php b/packages/logistics/src/DataTransferObjects/FreightTemplates/FreightTemplateDTO.php
@@ -2,7 +2,6 @@
 
 namespace RedJasmine\Logistics\DataTransferObjects\FreightTemplates;
 
-use RedJasmine\Logistics\Enums\FreightTemplates\FreightChargeTypeEnum;
 use RedJasmine\Support\Data\Data;
 use Spatie\LaravelData\DataCollection;
 
@@ -11,7 +10,7 @@ class FreightTemplateDTO extends Data
 
     public string $name;
 
-    public FreightChargeTypeEnum $chargeType;
+    public \RedJasmine\Logistics\Domain\Models\Enums\FreightTemplates\FreightChargeTypeEnum $chargeType;
 
     public bool $isFree;
 

diff --git a/...reightTemplates/FreightChargeTypeEnum.php → ...reightTemplates/FreightChargeTypeEnum.php b/...reightTemplates/FreightChargeTypeEnum.php → ...reightTemplates/FreightChargeTypeEnum.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RedJasmine\Logistics\Enums\FreightTemplates;
+namespace RedJasmine\Logistics\Domain\Models\Enums\FreightTemplates;
 
 use RedJasmine\Support\Helpers\Enums\EnumsHelper;
 

diff --git a/...logistics/src/Models/LogisticsCompany.php → ...cs/src/Domain/Models/LogisticsCompany.php b/...logistics/src/Models/LogisticsCompany.php → ...cs/src/Domain/Models/LogisticsCompany.php
@@ -1,12 +1,15 @@
 <?php
 
-namespace RedJasmine\Logistics\Models;
+namespace RedJasmine\Logistics\Domain\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\SoftDeletes;
+use RedJasmine\Support\Domain\Models\Traits\HasOperator;
 
 class LogisticsCompany extends Model
 {
+
+    use HasOperator;
+
     protected $fillable = [
         'code',
         'name',

diff --git a/...s/src/Models/LogisticsFreightTemplate.php → ...omain/Models/LogisticsFreightTemplate.php b/...s/src/Models/LogisticsFreightTemplate.php → ...omain/Models/LogisticsFreightTemplate.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace RedJasmine\Logistics\Models;
+namespace RedJasmine\Logistics\Domain\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use RedJasmine\Logistics\Enums\FreightTemplates\FreightChargeTypeEnum;
+use RedJasmine\Logistics\Domain\Models\Enums\FreightTemplates\FreightChargeTypeEnum;
 use RedJasmine\Support\Traits\Models\HasOperator;
 use RedJasmine\Support\Traits\Models\HasOwner;
-use RedJasmine\Support\Traits\Models\WithDTO;
+
 
 class LogisticsFreightTemplate extends Model
 {
@@ -18,7 +18,6 @@ class LogisticsFreightTemplate extends Model
 
     use HasOperator;
 
-    use WithDTO;
 
     public $incrementing = false;
 

diff --git a/...els/LogisticsFreightTemplateFeeRegion.php → ...els/LogisticsFreightTemplateFeeRegion.php b/...els/LogisticsFreightTemplateFeeRegion.php → ...els/LogisticsFreightTemplateFeeRegion.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RedJasmine\Logistics\Models;
+namespace RedJasmine\Logistics\Domain\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;

diff --git a/...ls/LogisticsFreightTemplateFreeRegion.php → ...ls/LogisticsFreightTemplateFreeRegion.php b/...ls/LogisticsFreightTemplateFreeRegion.php → ...ls/LogisticsFreightTemplateFreeRegion.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RedJasmine\Logistics\Models;
+namespace RedJasmine\Logistics\Domain\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;

diff --git a/packages/logistics/src/Domain/Repositories/LogisticsCompanyReadRepositoryInterface.php b/packages/logistics/src/Domain/Repositories/LogisticsCompanyReadRepositoryInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace RedJasmine\Logistics\Domain\Repositories;
+
+use RedJasmine\Support\Domain\Repositories\ReadRepositoryInterface;
+
+interface LogisticsCompanyReadRepositoryInterface extends ReadRepositoryInterface
+{
+
+}
diff --git a/packages/logistics/src/Domain/Repositories/LogisticsCompanyRepositoryInterface.php b/packages/logistics/src/Domain/Repositories/LogisticsCompanyRepositoryInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace RedJasmine\Logistics\Domain\Repositories;
+
+use RedJasmine\Support\Domain\Repositories\RepositoryInterface;
+
+interface LogisticsCompanyRepositoryInterface extends RepositoryInterface
+{
+
+}
diff --git a/packages/logistics/src/FreightTemplateService.php b/packages/logistics/src/FreightTemplateService.php
@@ -3,13 +3,11 @@
 namespace RedJasmine\Logistics;
 
 
-use Exception;
 use RedJasmine\Logistics\Actions\FreightTemplates\FreightTemplateUpdateAction;
 use RedJasmine\Logistics\DataTransferObjects\FreightTemplates\FreightTemplateDTO;
-use RedJasmine\Logistics\Models\LogisticsFreightTemplate;
+use RedJasmine\Logistics\Domain\Models\LogisticsFreightTemplate;
 use RedJasmine\Support\Foundation\Service\Service;
 use RedJasmine\Support\Foundation\Service\ServiceAwareAction;
-use RedJasmine\Support\Helpers\ID\Snowflake;
 
 /**
  * @see FreightTemplateCreateAction::execute()

diff --git a/packages/logistics/src/Infrastructure/Repositories/LogisticsCompanyRepository.php b/packages/logistics/src/Infrastructure/Repositories/LogisticsCompanyRepository.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace RedJasmine\Logistics\Infrastructure\Repositories;
+
+use RedJasmine\Logistics\Domain\Models\LogisticsCompany;
+use RedJasmine\Logistics\Domain\Repositories\LogisticsCompanyRepositoryInterface;
+use RedJasmine\Support\Infrastructure\Repositories\Eloquent\EloquentRepository;
+
+/**
+ * @method LogisticsCompany find($id)
+ */
+class LogisticsCompanyRepository extends EloquentRepository implements LogisticsCompanyRepositoryInterface
+{
+
+    /**
+     * @var $eloquentModelClass class-string
+     */
+    protected static string $eloquentModelClass = LogisticsCompany::class;
+
+}
diff --git a/packages/logistics/src/LogisticsCompanyService.php b/packages/logistics/src/LogisticsCompanyService.php
@@ -2,7 +2,7 @@
 
 namespace RedJasmine\Logistics;
 
-use RedJasmine\Logistics\Models\LogisticsCompany;
+use RedJasmine\Logistics\Domain\Models\LogisticsCompany;
 use RedJasmine\Support\Foundation\Service\Service;
 
 /**

diff --git a/packages/logistics/src/Pipelines/FreightTemplates/FreightTemplateValidatePipeline.php b/packages/logistics/src/Pipelines/FreightTemplates/FreightTemplateValidatePipeline.php
@@ -4,7 +4,7 @@
 
 use Closure;
 use Illuminate\Support\Facades\Validator;
-use RedJasmine\Logistics\Models\LogisticsFreightTemplate;
+use RedJasmine\Logistics\Domain\Models\LogisticsFreightTemplate;
 use RedJasmine\Region\Rules\RegionsExistRule;
 
 class FreightTemplateValidatePipeline