修复电子围栏接口

backend/controllers/v1/branch/CityDistributionSettingController.php

@@ -235,7 +235,6 @@ class CityDistributionSettingController extends BaseController
             if(!$model){
                 throw new BadRequestHttpException('没有找到记录');
             }
-            $model->setAttributes(Yii::$app->getRequest()->post());
         }else{
             $model = $this->modelClass::findOne(['SETTING_TYPE'=>$setting_type,'BRANCH_GUID'=>$branch_guid]);
             if($model){
@@ -243,23 +242,19 @@ class CityDistributionSettingController extends BaseController
             }else{
                 $model = new $this->modelClass();
             }
-            $model->setAttributes(Yii::$app->getRequest()->post());
             $other_param = array(
                 'GUID'=>Func::create_guid(),
                 'ORG_GUID'=>'100',//Yii::$app->user->identity->ORG_GUID,
             );
-            $model->scenario = 'update';//创建的场景
-            // $model->attribute->GUID='123';
-            $model->attributes=$other_param;
+            $model->setAttributes($other_param,false);
         }
         $region_model = new ShopCityDistributionRegion();
+        $model->setAttributes(Yii::$app->getRequest()->post());
 
         //开启事务 
         $trans = $model->getDb()->beginTransaction();
         try{
             //添加主表
-            print_r($model);die;
-
             if($model->save()===false){
                 if(!$model->hasErrors()){
                     throw new ServerErrorHttpException('Failed to update the object for unknown reason.');
@@ -275,6 +270,7 @@ class CityDistributionSettingController extends BaseController
             //传过来的数据全部新增
             $region_value = [];
             foreach($region as $value){
+                $region_model->scenario = 'save';//创建的场景                
                 $region_model->setAttributes($value);
                 $other_param_region = array(
                     'GUID'=>Func::create_guid(),
@@ -282,7 +278,6 @@ class CityDistributionSettingController extends BaseController
                     "CITY_DISTR_GUID"=>$model->GUID,
                 );
                 $region_model->setAttributes($other_param_region,false);
-                $region_model->scenario = 'save';//创建的场景
 
                 if ($region_model->validate()) { 
                     $region_value[] = $region_model->getAttributes(["GUID","ORG_GUID","CITY_DISTR_GUID","SORT","COLORS","DIVIDE_TYPE","REGION_R","REGION_RANGE","INITIAL_PRICE","DELIVERY_PRICE"]);
@@ -324,7 +319,6 @@ class CityDistributionSettingController extends BaseController
         $guid = Yii::$app->getRequest()->post('GUID');
         //删除所有门店ID下的电子围栏 数据库外键会删除region表
         $res = $this->modelClass::deleteAll(["BRANCH_GUID"=>$guid]);
-
         if ($res === false) {
             throw new ServerErrorHttpException('Failed to delete the object for unknown reason.');
         }

backend/models/v1/branch/ShopCityDistributionRegion.php

@@ -42,7 +42,7 @@ class ShopCityDistributionRegion extends BaseModel
             [['GUID','SORT','COLORS','DIVIDE_TYPE','REGION_R','REGION_RANGE','INITIAL_PRICE','DELIVERY_PRICE'], 'required','on'=>"save"],
             [['DIVIDE_TYPE'], 'in', 'range' => [1, 2],'on'=>"save"],
             [['SORT'], 'integer'],
-            [['REGION_RANGE'], 'string'],
+            [['REGION_RANGE','COLORS'], 'string'],
             [['INITIAL_PRICE', 'DELIVERY_PRICE','REGION_R'], 'double'],
         ];
     }
@@ -58,11 +58,11 @@ class ShopCityDistributionRegion extends BaseModel
             'CITY_DISTR_GUID' => 'City Distr Guid',
             'SORT' => 'SORT',
             'COLORS' => 'Colors',
-            'DIVIDE_TYPE' => 'Hf Type',
+            'DIVIDE_TYPE' => '划分类型',
             'REGION_R' => 'Region R',
             'REGION_RANGE' => 'Region Range',
-            'INITIAL_PRICE' => 'Qs Price',
-            'DELIVERY_PRICE' => 'Ps Price',
+            'INITIAL_PRICE' => '起送价',
+            'DELIVERY_PRICE' => '配送价',
             'WEEK' => 'Week',
             'IS_TYPE' => 'Is Type',
         ];

backend/models/v1/branch/ShopCityDistributionSetting.php

@@ -54,10 +54,9 @@ class ShopCityDistributionSetting extends BaseModel
     public function rules()
     {
         return [
-            [['BRANCH_GUID','REGION_TYPE','SETTING_TYPE',], 'required'],
+            [['ORG_GUID','GUID','BRANCH_GUID','REGION_TYPE','SETTING_TYPE',], 'required'],
             [['REGION_DISTR_DISTANCE', 'REGION_DISTR_PRICE','INCREASE_DISTANCE','INCREASE_PRICE'], 'double'],
             [['STATUS'], 'boolean'],
-            [['ORG_GUID','GUID'], 'safe','on'=>'update'],
             [['REGION_TYPE','SETTING_TYPE'], 'in', 'range' => [1, 2]],
             [['BRANCH_GUID'], 'exist', 'skipOnError' => true, 'targetClass' => ShopBranch::className(), 'targetAttribute' => ['BRANCH_GUID' => 'GUID']],
         ];