Explorar o código

refactor(migration): 统一数据库迁移基类为 Phinx\Migration\AbstractMigration,
统一代码风格

runphp hai 2 semanas
pai
achega
d9ee2c2d0e

+ 2 - 1
config.php

@@ -1,5 +1,6 @@
 <?php
+
 declare(strict_types=1);
 
 return [
-];
+];

+ 1 - 1
database/migrations/20251010100000_create_shipping_templates_table.php

@@ -17,4 +17,4 @@ class CreateShippingTemplatesTable extends \Phinx\Migration\AbstractMigration
             ->addIndex(['sort'])
             ->create();
     }
-}
+}

+ 3 - 3
database/migrations/20251010100100_create_shipping_template_rules_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use think\migration\Migrator;
+use Phinx\Migration\AbstractMigration;
 
-class CreateShippingTemplateRulesTable extends Migrator
+class CreateShippingTemplateRulesTable extends AbstractMigration
 {
     public function change()
     {
@@ -20,4 +20,4 @@ class CreateShippingTemplateRulesTable extends Migrator
             ->addIndex(['area_type'])
             ->create();
     }
-}
+}

+ 3 - 3
database/migrations/20251010100200_create_shipping_template_relations_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use think\migration\Migrator;
+use Phinx\Migration\AbstractMigration;
 
-class CreateShippingTemplateRelationsTable extends Migrator
+class CreateShippingTemplateRelationsTable extends AbstractMigration
 {
     public function change()
     {
@@ -17,4 +17,4 @@ class CreateShippingTemplateRelationsTable extends Migrator
             ->addIndex(['template_id', 'biz_type', 'biz_id'], ['unique' => true])
             ->create();
     }
-}
+}

+ 2 - 1
info.php

@@ -1,7 +1,8 @@
 <?php
+
 declare(strict_types=1);
 
 return [
     'id' => 'shipping_template',
     'name' => '运费模板',
-];
+];

+ 3 - 1
route/admin.php

@@ -1,13 +1,15 @@
 <?php
+
 declare(strict_types=1);
 
 
 use think\facade\Route;
 use SixShop\ShippingTemplate\Controller\ShippingTemplateController;
+
 // Admin路由
 // 路由前缀: /admin/shipping_template
 // 如果需要登录请添加认证中间件auth
 // ->middleware(['auth'])
 
 // 运费模板相关路由
-Route::resource('', ShippingTemplateController::class)->middleware(['auth']);
+Route::resource('', ShippingTemplateController::class)->middleware(['auth']);

+ 2 - 3
route/api.php

@@ -1,12 +1,11 @@
 <?php
+
 declare(strict_types=1);
 
 
-use think\facade\Route;
-use SixShop\ShippingTemplate\Controller\ShippingTemplateController;
 // API路由
 // 路由前缀: /api/shipping_template/
 // 如果需要登录请添加认证中间件auth
 // ->middleware(['auth'])
 
-// 运费模板相关路由
+// 运费模板相关路由

+ 5 - 3
src/Controller/ShippingTemplateController.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SixShop\ShippingTemplate\Controller;
@@ -8,6 +9,7 @@ use SixShop\ShippingTemplate\Model\ShippingTemplateModel;
 use SixShop\ShippingTemplate\Model\ShippingTemplateRelationModel;
 use SixShop\ShippingTemplate\Model\ShippingTemplateRuleModel;
 use think\Request;
+
 use function SixShop\Core\success_response;
 use function SixShop\Core\error_response;
 
@@ -259,10 +261,10 @@ class ShippingTemplateController
             'calc_method' => $templateModel->calc_method,
             'unit' => $templateModel->unit,
             'sort' => $templateModel->sort,
-            'default_rule' => $rules->filter(function($rule) {
+            'default_rule' => $rules->filter(function ($rule) {
                 return $rule->area_type === ShippingTemplateAreaTypeEnum::DEFAULT;
             })->first(),
-            'special_areas' => $rules->filter(function($rule) {
+            'special_areas' => $rules->filter(function ($rule) {
                 return $rule->area_type === ShippingTemplateAreaTypeEnum::SPECIAL;
             })->values()
         ], '模板详情读取成功');
@@ -286,4 +288,4 @@ class ShippingTemplateController
 
         return success_response([], '模板删除成功');
     }
-}
+}

+ 2 - 2
src/Entity/ShippingTemplateEntity.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SixShop\ShippingTemplate\Entity;
@@ -11,5 +12,4 @@ use SixShop\ShippingTemplate\Model\ShippingTemplateModel;
  */
 class ShippingTemplateEntity extends BaseEntity
 {
-
-}
+}

+ 6 - 5
src/Entity/ShippingTemplateRelationEntity.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SixShop\ShippingTemplate\Entity;
@@ -19,7 +20,7 @@ class ShippingTemplateRelationEntity extends BaseEntity
         $relation = $this->where('biz_type', $bizType)
             ->where('biz_id', $bizId)
             ->find();
-            
+
         return $relation ? $relation->template_id : null;
     }
 
@@ -31,7 +32,7 @@ class ShippingTemplateRelationEntity extends BaseEntity
         $relation = $this->where('biz_type', $bizType)
             ->where('biz_id', $bizId)
             ->find();
-            
+
         if ($relation) {
             // 更新已存在的关联
             return $relation->save([
@@ -55,11 +56,11 @@ class ShippingTemplateRelationEntity extends BaseEntity
         $relation = $this->where('biz_type', $bizType)
             ->where('biz_id', $bizId)
             ->find();
-            
+
         if ($relation) {
             return $relation->delete();
         }
-        
+
         return true;
     }
 
@@ -71,4 +72,4 @@ class ShippingTemplateRelationEntity extends BaseEntity
         return $this->where('template_id', $templateId)
             ->select();
     }
-}
+}

+ 7 - 6
src/Entity/ShippingTemplateRuleEntity.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SixShop\ShippingTemplate\Entity;
@@ -38,10 +39,10 @@ class ShippingTemplateRuleEntity extends BaseEntity
     {
         // 获取模板ID
         $templateId = $this->template_id;
-        
+
         // 查找适用的规则
         $rule = null;
-        
+
         // 如果提供了地区编码,先检查是否匹配特殊区域规则
         if ($regionCode) {
             $specialRules = $this->getSpecialRules($templateId);
@@ -53,17 +54,17 @@ class ShippingTemplateRuleEntity extends BaseEntity
                 }
             }
         }
-        
+
         // 如果没有匹配的特殊区域规则,则使用默认规则
         if (!$rule) {
             $rule = $this->getDefaultRule($templateId);
         }
-        
+
         // 如果没有找到任何规则,返回0
         if (!$rule) {
             return 0.0;
         }
-        
+
         // 计算运费
         if ($quantity <= $rule->first) {
             // 数量在首件/首重/首体积范围内
@@ -76,4 +77,4 @@ class ShippingTemplateRuleEntity extends BaseEntity
             return (float)$rule->first_price + $additionalFee;
         }
     }
-}
+}

+ 2 - 1
src/Enum/ShippingTemplateAreaTypeEnum.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SixShop\ShippingTemplate\Enum;
@@ -18,4 +19,4 @@ enum ShippingTemplateAreaTypeEnum: string
             self::SPECIAL => '特殊区域',
         };
     }
-}
+}

+ 2 - 1
src/Enum/ShippingTemplateCalcMethodEnum.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SixShop\ShippingTemplate\Enum;
@@ -20,4 +21,4 @@ enum ShippingTemplateCalcMethodEnum: string
             self::VOLUME => '按体积',
         };
     }
-}
+}

+ 2 - 1
src/Enum/ShippingTemplateStatusEnum.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SixShop\ShippingTemplate\Enum;
@@ -18,4 +19,4 @@ enum ShippingTemplateStatusEnum: int
             self::ENABLED => '启用',
         };
     }
-}
+}

+ 2 - 1
src/Extension.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SixShop\ShippingTemplate;
@@ -13,4 +14,4 @@ class Extension extends ExtensionAbstract
     {
         return dirname(__DIR__);
     }
-}
+}

+ 2 - 1
src/Model/ShippingTemplateModel.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SixShop\ShippingTemplate\Model;
@@ -43,4 +44,4 @@ class ShippingTemplateModel extends Model
     {
         return $this->hasMany(ShippingTemplateRuleModel::class, 'template_id', 'id')->order('id', 'asc');
     }
-}
+}

+ 2 - 1
src/Model/ShippingTemplateRelationModel.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SixShop\ShippingTemplate\Model;
@@ -60,4 +61,4 @@ class ShippingTemplateRelationModel extends Model
         $relation = self::getByBiz($bizType, $bizId);
         return $relation ? $relation->template_id : 0;
     }
-}
+}

+ 4 - 3
src/Model/ShippingTemplateRuleModel.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace SixShop\ShippingTemplate\Model;
@@ -68,14 +69,14 @@ class ShippingTemplateRuleModel extends Model
     public static function checkRegionInSpecialRules(int $templateId, string $regionCode)
     {
         $specialRules = self::getSpecialRules($templateId);
-        
+
         foreach ($specialRules as $rule) {
             $regions = json_decode($rule->regions, true);
             if (is_array($regions) && in_array($regionCode, $regions)) {
                 return $rule;
             }
         }
-        
+
         return null;
     }
-}
+}