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