运费模板，门店打分优化

Signed-off-by: houhezheng <houhezheng@romens.cn>

backend/controllers/v1/transport/TransportSettingController.php

@@ -178,6 +178,7 @@ class TransportSettingController extends BaseController
     {
         $params = Yii::$app->request->bodyParams;
         $model = new $this->modelClass();
+        $model->scenario = 'update';
         $_model = $model::findOne($params['GUID']);
         if (!$_model) {
             throw new BadRequestHttpException('Requested resource does not exist !');
@@ -191,18 +192,7 @@ class TransportSettingController extends BaseController
             throw new BadRequestHttpException('没有修改权限！');
         }
 
-        $_model->attributes = [
-            "TRANSPOR_TTYPE" => $params['TRANSPOR_TTYPE'],
-            "BASE_FEE" => is_numeric($params['BASE_FEE']) ? $params['BASE_FEE'] : 0,
-            "BASE_WEIGHT" => is_numeric($params['BASE_WEIGHT']) ? $params['BASE_WEIGHT'] : '0',
-            "BASE_WEIGHT_FEE" => is_numeric($params['BASE_WEIGHT_FEE']) ? $params['BASE_WEIGHT_FEE'] : 0,
-            "INCREASE_WEIGHT" => is_numeric($params['INCREASE_WEIGHT']) ? $params['INCREASE_WEIGHT'] : '0',
-            "INCREASE_WEIGHT_FEE" => is_numeric($params['INCREASE_WEIGHT_FEE']) ? $params['INCREASE_WEIGHT_FEE'] : 0,
-            "IS_USED" => is_null($params['IS_USED']) ? 1 : $params['IS_USED'],
-            "DESCRIPTION" => $params['DESCRIPTION'],
-            "LIMIT_MEMBER_GROUP_GUID" => $params['LIMIT_MEMBER_GROUP_GUID'],
-            "SELECT_AREA" => $params['SELECT_AREA'],
-        ];
+        $_model->attributes = $params;
 
         //删除条件：总部权限删除所有，省级只能删除自己。
         switch ($userInfo['ROLE_ID']) {
@@ -373,22 +363,11 @@ class TransportSettingController extends BaseController
         $userInfo = (new ShopRbacUser)->getRbacUserInfo(Yii::$app->user->identity->GUID);
         $model = new $this->modelClass();
         $model->scenario = 'creation';
-        $model->attributes = [
-            "GUID" => Func::create_guid(),
-            "ORG_GUID" => Yii::$app->user->identity->ORG_GUID,
-            "TRANSPOR_TTYPE" => $params['TRANSPOR_TTYPE'],
-            "BASE_FEE" => is_numeric($params['BASE_FEE']) ? $params['BASE_FEE'] : 0,
-            "BASE_WEIGHT" => is_numeric($params['BASE_WEIGHT']) ? $params['BASE_WEIGHT'] : '0',
-            "BASE_WEIGHT_FEE" => is_numeric($params['BASE_WEIGHT_FEE']) ? $params['BASE_WEIGHT_FEE'] : 0,
-            "INCREASE_WEIGHT" => is_numeric($params['INCREASE_WEIGHT']) ? $params['INCREASE_WEIGHT'] : '0',
-            "INCREASE_WEIGHT_FEE" => is_numeric($params['INCREASE_WEIGHT_FEE']) ? $params['INCREASE_WEIGHT_FEE'] : 0,
-            "IS_USED" => is_null($params['IS_USED']) ? 1 : $params['IS_USED'],
-            "DESCRIPTION" => $params['DESCRIPTION'],
-            "LIMIT_MEMBER_GROUP_GUID" => $params['LIMIT_MEMBER_GROUP_GUID'],
-            "SELECT_AREA" => $params['SELECT_AREA'],
-            "GROUP_GUID" => $userInfo['BRANCH_GUID'],
-            "PLATFORM_TYPE" => empty($params['PLATFORM_TYPE']) ? 'shop' : $params['PLATFORM_TYPE'],
-        ];
+        
+        $model->attributes = $params;
+        $model->GUID = Func::create_guid();
+        $model->ORG_GUID = Yii::$app->user->identity->ORG_GUID;
+        $model->GROUP_GUID = $userInfo['BRANCH_GUID'];
 
         //开启事务
         $packagingcostsBranches = new ShopPackagingcostsBranches();

backend/models/v1/branch/ShopBranchScore.php

@@ -4,7 +4,6 @@ namespace app\models\v1\branch;
 
 use Yii;
 use app\models\v1\BaseModel;
-use backend\helpers\Func;
 use yii\data\ActiveDataProvider;
 
 /**

backend/models/v1/transport/TransportSetting.php

@@ -50,6 +50,9 @@ class TransportSetting extends \app\models\v1\BaseModel
             [['GUID', 'ORG_GUID', 'TRANSPOR_TTYPE', 'TRANSPORT_COMPANY', 'BASE_WEIGHT', 'INCREASE_WEIGHT', 'PLATFORM_TYPE', 'GROUP_GUID'], 'string', 'max' => 50],
             [['DESCRIPTION'], 'string', 'max' => 300],
             [['GUID'], 'unique', 'on' => ['creation']],
+            [['BASE_FEE', 'BASE_WEIGHT_FEE', 'INCREASE_WEIGHT_FEE', 'BASE_WEIGHT', 'INCREASE_WEIGHT'], 'default', 'value' => 0, 'on' => ['creation', 'update']],
+            ['IS_USED', 'defalut', 'value' => 1, 'on' => ['creation', 'update']],
+            ['PLATFORM_TYPE', 'default', 'value' => 'shop', 'on' => 'creation'],
         ];
     }
 
@@ -97,7 +100,7 @@ class TransportSetting extends \app\models\v1\BaseModel
                 $where = ['or', ['ts.GROUP_GUID' => $userInfo['PARENT_BRANCH_GUID']], ['ts.GROUP_GUID' => $userInfo['BRANCH_GUID']]];
                 break;
             default:
-                $where = ['>',1,2];
+                $where = ['>', 1, 2];
                 break;
         }