修改字段

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

backend/controllers/v1/transport/TransportSettingController.php

@@ -70,7 +70,7 @@ class TransportSettingController extends BaseController
      *   @OA\Parameter(name="GUID",in="query",required=true,description="运费模板GUID",@OA\Schema(type="string")),
      *   @OA\Response(response="200",description="
      *                GUID:运费模板GUID,
-     *                TRANSPOR_TTYPE:配送方式,
+     *                TRANSPORT_TYPE:配送方式,
      *                BASE_FEE:统一费用,
      *                BASE_WEIGHT:首重,
      *                BASE_WEIGHT_FEE:首重费用,
@@ -137,9 +137,9 @@ class TransportSettingController extends BaseController
      *             mediaType="application/x-www-form-urlencoded",
      *             @OA\Schema(
      *                type="object",
-     *                required={"GUID","TRANSPOR_TTYPE","IS_USED"},
+     *                required={"GUID","TRANSPORT_TYPE","IS_USED"},
      *                @OA\Property(property="GUID", type="string",description="运费模板GUID"),
-     *                @OA\Property(property="TRANSPOR_TTYPE" ,type="string", description="配送方式"),
+     *                @OA\Property(property="TRANSPORT_TYPE" ,type="string", description="配送方式"),
      *                @OA\Property(property="BASE_FEE", type="float(18,2)",description="统一费用(元)"),
      *                @OA\Property(property="BASE_WEIGHT", type="string",description="首重(克)"),
      *                @OA\Property(property="BASE_WEIGHT_FEE", type="float(18,2)",description="首重费用(元)"),
@@ -226,11 +226,9 @@ class TransportSettingController extends BaseController
         }
 
         //如果是总部创建的模板门店不能修改shop_transport_setting 数据
-        if ($userInfo['PARENT_BRANCH_GUID'] != $_model['GROUP_GUID']) {
-            if (!$_model->save()) {
-                Yii::$app->response->statusCode = 422;
-                return $_model->errors;
-            }
+        if (!$_model->save()) {
+            Yii::$app->response->statusCode = 422;
+            return $_model->errors;
         }
         throw new HttpException(200, "更新成功！");
     }
@@ -325,9 +323,9 @@ class TransportSettingController extends BaseController
      *         @OA\MediaType(
      *             mediaType="application/x-www-form-urlencoded",
      *             @OA\Schema(
-     *                required={"PLATFORM_TYPE","TRANSPOR_TTYPE","IS_USED"},
+     *                required={"PLATFORM_TYPE","TRANSPORT_TYPE","IS_USED"},
      *                @OA\Property(property="PLATFORM_TYPE",type="sting",description="运费模板所属平台(默认微商城:shop,积分商城:points)",example="shop"),
-     *                @OA\Property(property="TRANSPOR_TTYPE" ,type="string", description="配送方式(GUID)"),
+     *                @OA\Property(property="TRANSPORT_TYPE" ,type="string", description="配送方式(GUID)"),
      *                @OA\Property(property="BASE_FEE", type="float(18,2)",description="统一费用(元)"),
      *                @OA\Property(property="BASE_WEIGHT", type="float(18,2)",description="首重(克)"),
      *                @OA\Property(property="BASE_WEIGHT_FEE", type="float(18,2)",description="首重费用(元)"),

backend/models/v1/transport/TransportSetting.php

@@ -12,7 +12,7 @@ use yii\data\ActiveDataProvider;
  *
  * @property string $GUID
  * @property string $ORG_GUID 组织机构号
- * @property string|null $TRANSPOR_TTYPE 配送方式
+ * @property string|null $TRANSPORT_TYPE 配送方式
  * @property string|null $TRANSPORT_COMPANY 配送公司
  * @property float|null $BASE_FEE 统一费用
  * @property string|null $BASE_WEIGHT 首重
@@ -47,7 +47,7 @@ class TransportSetting extends \app\models\v1\BaseModel
             [['BASE_FEE', 'BASE_WEIGHT_FEE', 'INCREASE_WEIGHT_FEE', 'INCREASE_WEIGHT', 'BASE_WEIGHT'], 'number'],
             [['SELECT_AREA', 'LIMIT_MEMBER_GROUP_GUID'], 'string'],
             [['IS_DEFAULT', 'IS_USED'], 'integer'],
-            [['GUID', 'ORG_GUID', 'TRANSPOR_TTYPE', 'TRANSPORT_COMPANY', 'PLATFORM_TYPE', 'GROUP_GUID'], 'string', 'max' => 50],
+            [['GUID', 'ORG_GUID', 'TRANSPORT_TYPE', 'TRANSPORT_COMPANY', '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']],
@@ -64,7 +64,7 @@ class TransportSetting extends \app\models\v1\BaseModel
         return [
             'GUID' => 'Guid',
             'ORG_GUID' => '组织机构号',
-            'TRANSPOR_TTYPE' => '配送方式',
+            'TRANSPORT_TYPE' => '配送方式',
             'TRANSPORT_COMPANY' => '配送公司',
             'BASE_FEE' => '统一费用',
             'BASE_WEIGHT' => '首重',
@@ -106,7 +106,7 @@ class TransportSetting extends \app\models\v1\BaseModel
 
         $query = static::find()->alias('ts')
             ->select(['ts.GUID', 'stt.NAME as TRANSPORT_NAME', 'ts.BASE_FEE', 'ts.BASE_WEIGHT', 'ts.BASE_WEIGHT_FEE', 'ts.IS_USED', 'ts.SELECT_AREA'])
-            ->leftJoin('shop_transport_type stt', 'ts.TRANSPOR_TTYPE=stt.GUID')
+            ->leftJoin('shop_transport_type stt', 'ts.TRANSPORT_TYPE=stt.GUID')
             ->where(['ts.PLATFORM_TYPE' => $platform_type])
             ->andFilterWhere($where);
 
@@ -116,7 +116,7 @@ class TransportSetting extends \app\models\v1\BaseModel
                 'pageSize' => PAGE_SIZE
             ],
             'sort' => [
-                'attributes' => ['TRANSPOR_TTYPE']
+                'attributes' => ['TRANSPORT_TYPE']
             ]
         ]);
 
@@ -143,7 +143,7 @@ class TransportSetting extends \app\models\v1\BaseModel
     public function details($guid)
     {
         $info = static::find()
-            ->select(['GUID', 'TRANSPOR_TTYPE', 'BASE_FEE', 'BASE_WEIGHT', 'BASE_WEIGHT_FEE', 'INCREASE_WEIGHT', 'INCREASE_WEIGHT_FEE', 'DESCRIPTION', 'SELECT_AREA', 'IS_USED', 'LIMIT_MEMBER_GROUP_GUID', 'GROUP_GUID'])
+            ->select(['GUID', 'TRANSPORT_TYPE', 'BASE_FEE', 'BASE_WEIGHT', 'BASE_WEIGHT_FEE', 'INCREASE_WEIGHT', 'INCREASE_WEIGHT_FEE', 'DESCRIPTION', 'SELECT_AREA', 'IS_USED', 'LIMIT_MEMBER_GROUP_GUID', 'GROUP_GUID'])
             ->where(['GUID' => $guid])
             ->asArray()
             ->one();