注释修改

backend/controllers/v1/transport/O2oDeliveryController.php

@@ -5,6 +5,9 @@ use backend\controllers\v1\BaseController;
 use Yii;
 use app\models\v1\rbacuser\ShopRbacUser;
 use yii\data\ActiveDataProvider;
+use app\models\v1\branch\ShopCityDistributionRegion;
+use yii\web\HttpException;
+
 class O2oDeliveryController extends BaseController
 {
     public $modelClass = 'app\models\v1\branch\ShopCityDistributionSetting';
@@ -12,14 +15,15 @@ class O2oDeliveryController extends BaseController
     
     /**
      * @OA\GET(
-     *   path="/backend/web/v1/transport/o2o-delivery/o2o-delivery-list",
+     *   path="/backend/web/v1/transport/o2o-deliveries/o2o-delivery-list",
      *   tags={"配送管理"},
      *   summary="O2O配送费(gyz)",
      *   description="O2O配送费",
      *   @OA\Parameter(name="page",in="query",description="分页页码",@OA\Schema(type="int")),
      *   @OA\Parameter(name="BRANCH_INFO",in="query",description="门店CODE或者名称",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="SCDS_GUID",in="query",description="电子围栏设置GUID,填写返回单条数据，列表返回的数据和详情返回数据一致，用一个接口即可",@OA\Schema(type="string")),
      *   @OA\Response(response="200",description="
-     *                GUID:电子围栏设置GUID,
+     *                SCDS_GUID:电子围栏设置GUID,
      *                BRANCH_NAME:门店名称
      *                BRANCH_CODE:门店编码,
      *                REGION_TYPE:收费方式,
@@ -27,7 +31,7 @@ class O2oDeliveryController extends BaseController
      *                REGION_DISTR_DISTANCE:基础公里数,
      *                REGION_DISTR_PRICE:基础运费,
      *                INCREASE_DISTANCE:不同配送费每增加X公里,
-     *                INCREASE_PRICE:不同配送费每增加X公里增加X元),
+     *                INCREASE_PRICE:不同配送费每增加X公里增加X元"),
      *   security={{"Authorization":{}}}
      * )
      */
@@ -36,6 +40,8 @@ class O2oDeliveryController extends BaseController
         $get = Yii::$app->request->get();
         $model = new $this->modelClass;
         $model->attributes = $get;
+        $model->scenario='search';
+        $model->GUID = isset($get['SCDS_GUID'])?$get['SCDS_GUID']:'';
         if ($model->validate()) {
             $rbacModel = new ShopRbacUser();
             $userGuid = Yii::$app->user->identity->GUID;
@@ -56,12 +62,13 @@ class O2oDeliveryController extends BaseController
             }
             $query = $model->find()
                     ->alias('scds')
-                    ->select('scds.GUID,sb.NAME as BRANCH_NAME,sb.CODE as BRANCH_CODE,scds.REGION_TYPE,scdr.DELIVERY_PRICE,scds.REGION_DISTR_DISTANCE,scds.REGION_DISTR_PRICE,scds.INCREASE_DISTANCE,scds.INCREASE_PRICE')
+                    ->select('scds.GUID as SCDS_GUID,sb.NAME as BRANCH_NAME,sb.CODE as BRANCH_CODE,scds.REGION_TYPE,scdr.DELIVERY_PRICE,scds.REGION_DISTR_DISTANCE,scds.REGION_DISTR_PRICE,scds.INCREASE_DISTANCE,scds.INCREASE_PRICE')
                     ->leftjoin('shop_branch sb','sb.GUID=scds.BRANCH_GUID')
                     ->leftjoin('shop_city_distribution_region scdr','scdr.CITY_DISTR_GUID=scds.GUID')
                     ->andFilterWhere(['scds.SETTING_TYPE'=>2])//设定为o2o配送
-                    ->andFilterWhere(['or',['sb.CODE'=>isset($get['BRANCH_INFO'])?$get['BRANCH_INFO']:''],['like','sb.NAME',isset($get['BRANCH_INFO'])?$get['BRANCH_INFO']:'']])
+                    ->andFilterWhere(['or',['sb.CODE'=>$model->BRANCH_INFO],['like','sb.NAME',$model->BRANCH_INFO]])
                     ->andFilterWhere(['sb.GUID'=>$branchGuid])
+                    ->andFilterWhere(['scds.GUID'=>$model->GUID])
                     ->orFilterWhere(['sb.PARENTGUID'=>$parentBranchGuid])
                     ->asArray();
             return new ActiveDataProvider(
@@ -77,5 +84,65 @@ class O2oDeliveryController extends BaseController
             return $model->errors;
         }
         
+    }
+    /**
+     * @OA\POST(
+     *     path="/backend/web/v1/transport/o2o-deliveries/o2o-delivery-update",
+     *     tags={"配送管理"},
+     *     summary="O2O配送费详情更新(gyz)",
+     *     description="O2O配送费详情更新",
+     *     @OA\RequestBody(
+     *       required=true,
+     *       @OA\MediaType(
+     *           mediaType="application/x-www-form-urlencoded",
+     *           @OA\Schema(
+     *               type="object",
+     *               @OA\Property(property="GUID",required="true",description="列表接口返回的电子围栏设置GUID",type="string"),
+     *               @OA\Property(property="REGION_TYPE",description="列表接口返回收费方式",type="int"),
+     *               @OA\Property(property="DELIVERY_PRICE",description="区域运费",type="float"),
+     *               @OA\Property(property="REGION_DISTR_DISTANCE",description="基础公里数",type="float"),
+     *               @OA\Property(property="REGION_DISTR_PRICE",description="基础运费",type="float"),
+     *               @OA\Property(property="INCREASE_DISTANCE",description="不同配送费每增加X公里",type="float"),
+     *               @OA\Property(property="INCREASE_PRICE",description="不同配送费每增加X公里增加X元",type="float"),
+     *           )
+     *       )
+     *     ),
+     *     @OA\Response(response=200,description="O2O配送费详情更新成功"),
+     *     security={{"Authorization": {}}}    
+     * )
+     * */
+    public function actionO2oDeliveryUpdate()
+    {
+        $post = Yii::$app->request->post();
+        $model = new $this->modelClass;
+        var_dump( $model->attributes);exit;
+        $model->attributes=$post;
+        
+
+        $scdrModel = new ShopCityDistributionRegion();
+
+        $model->scenario='o2o_update';
+        if ($model->validate()) {
+            if ($model->REGION_TYPE==1) {//按区域
+                $_scdrModel = $scdrModel->find()->where(['CITY_DISTR_GUID'=>$model->GUID]);
+                if (empty($_scdrModel)) {
+                    throw new HttpException("404", '此条数据不存在');
+                }else{
+                    $_scdrModel->attributes= $post;
+                    $_scdrModel->save(false);
+                }
+            }elseif($model->REGION_TYPE==2){//按距离
+                $_model=$model->findOne($post['GUID']);
+                if (empty($_model)) {
+                    throw new HttpException("404", '此条数据不存在');
+                }else{
+                    $_model->save(false);
+                }
+            }
+        }else{
+            return $model->errors;
+        }
+
+        
     }
 }