Merge branch 'development' of http://gitlab-ebiz.yiyao365.cn/newshop/newshopback into development

backend/config/urlmanager.php

@@ -49,6 +49,8 @@ return [
                         'GET,OPTIONS export-branch' => 'export-branch',
                         'GET,OPTIONS dc-branch-list' => 'dc-branch-list',
                         'GET,OPTIONS dc-branch-export' => 'dc-branch-export',
+                        'GET,OPTIONS dc-branch-detail' => 'dc-branch-detail',
+                        'PUT,OPTIONS dc-branch-revise' => 'dc-branch-revise',
                     ],
                 ],
                 //门店评分
@@ -218,7 +220,7 @@ return [
                         'GET,OPTIONS template-file' => 'template-file',
                     ],
                 ],
-                //运费模板
+                //快递配送价格
                 [
                     'class'=>'yii\rest\UrlRule',
                     'controller'=>[
@@ -227,7 +229,10 @@ return [
                     'extraPatterns'=>[
                         'GET,OPTIONS transport-templates' => 'transport-templates',
                         'GET,OPTIONS transport-fee-details' => 'transport-fee-details',
+                        'GET,OPTIONS get-branches-packaging' => 'get-branches-packaging',
                         'PUT,OPTIONS transport-fee-update' => 'transport-fee-update',
+                        'DELETE,OPTIONS transport-fee-del' => 'transport-fee-del',
+                        'POST,OPTIONS transport-fee-add' => 'transport-fee-add',
                     ],
                 ],
                 //o2o起送价设置

backend/controllers/v1/branch/BranchController.php

@@ -886,4 +886,100 @@ class BranchController extends BaseController
         ->addRows($export_result)
         ->output("DC仓列表","Csv");
     }
+
+    /**
+     * @OA\Get(
+     *   path="/backend/web/v1/branch/branches/dc-branch-detail",
+     *   tags={"门店&DC"},
+     *   description="DC仓详情接口",
+     *   summary="DC仓详情(姚书侠)",
+     *   @OA\Parameter(name="guid",in="query",description="DC仓GUID",@OA\Schema(type="string")),
+     *   @OA\Response(response="200",description="success"),
+     *   security={{"Authorization": {}}}
+     * )
+     */
+    public function actionDcBranchDetail()
+    {
+        $model = new $this->modelClass();
+        $guid = Yii::$app->request->getQueryParam('guid');
+
+        $info = $model->BranchDetail($guid);
+        if (!$info) {
+            throw new BadRequestHttpException('未找到符合的DC信息');
+        }
+        return $info;
+    }
+
+     /**
+     * @OA\PUT(
+     *     path="/backend/web/v1/branch/branches/dc-branch-revise",
+     *     tags={"门店&DC"},
+     *     summary="修改DC接口(姚书侠)",
+     *     description="修改DC接口",
+     *     @OA\RequestBody(
+     *       required=true,
+     *       @OA\MediaType(
+     *           mediaType="application/x-www-form-urlencoded",
+     *           @OA\Schema(
+     *               type="object",
+     *               @OA\Property(property="GUID",description="要修改的DC的GUID",type="string"),
+     *               @OA\Property(property="NAME",description="DC名称，最长20字",type="string"),
+     *               @OA\Property(property="BRANCH_NAME",description="DC简称",type="string"),
+     *               @OA\Property(property="RECIVER_PROVINCE",description="省份编号",type="string"),
+     *               @OA\Property(property="RECIVER_CITY",description="城市编号",type="string"),
+     *               @OA\Property(property="RECIVER_REGION",description="区域编号",type="string"),
+     *               @OA\Property(property="ADDRESS",description="详细地址",type="string"),
+     *               @OA\Property(property="PHONE",description="电话/手机号",type="string"),
+     *               @OA\Property(property="CONTACT_NAME",description="联系人姓名",type="string"),     
+     *               @OA\Property(property="BRANCH_TYPE",description="DC仓类型 1分公司 2区域",type="string"),     
+     *               @OA\Property(property="LAT",description="坐标LAT",type="string"),
+     *               @OA\Property(property="LNG",description="坐标LNG",type="string"), 
+     *               @OA\Property(property="IS_SHELVE",description="是否营业",type="int"),
+     *               @OA\Property(property="WORK_TIME_START",description="开始营业时间",type="string"),
+     *               @OA\Property(property="WORK_TIME_END",description="结束营业时间",type="string"),
+     *               @OA\Property(property="DELIVERY_TIME_START",description="开始配送时间",type="string"),
+     *               @OA\Property(property="DELIVERY_TIME_END",description="结束配送时间",type="string"),
+     *               @OA\Property(property="RETURN_ADDRESS",description="退货地址",type="string"),
+     *               @OA\Property(property="DESCRIPTION",description="描述",type="string")
+     *           )
+     *       )
+     *     ),
+     *     @OA\Response(response=200,description="success"),
+     *     security={{"Authorization": {}}}    
+     * )
+     */
+    public function actionDcBranchRevise()
+    {
+        $param = Yii::$app->request->getBodyParams();
+        $guid = Yii::$app->request->getBodyParam('GUID');
+        $model = $this->modelClass::findOne($guid);
+        if(!$model){
+            throw new BadRequestHttpException('没有找到要修改的记录');
+        }
+        //营业时间
+        if(!empty($param['WORK_TIME_START']) && !empty($param['WORK_TIME_END'])){
+            $WORK_TIME = $param['WORK_TIME_START'].'-'.$param['WORK_TIME_END'];
+        }else{
+            $WORK_TIME = '';
+        }
+        //配送时间
+        if(!empty($param['DELIVERY_TIME_START']) && !empty($param['DELIVERY_TIME_END'])){
+            $DELIVERY_TIME = $param['DELIVERY_TIME_START'].'-'.$param['DELIVERY_TIME_END'];
+        }else{
+            $DELIVERY_TIME = '';
+        }
+        //门店信息修改
+        $model->scenario = 'dcUpdate';//创建的场景
+        $other_param = array(
+            'UPDATE_TIME'=>date('Y-m-d H:i:s',time()),
+            'WORK_TIME'=>$WORK_TIME,
+            'DELIVERY_TIME'=>$DELIVERY_TIME,
+        );
+        $model->setAttributes($other_param);
+        $model->setAttributes(Yii::$app->getRequest()->post());
+        if ($model->save() === false && !$model->hasErrors()) {
+            throw new ServerErrorHttpException('Failed to update the object for unknown reason.');
+        }
+        return $model;
+    }
 }

backend/controllers/v1/branch/BranchScoreController.php

@@ -189,7 +189,7 @@ class BranchScoreController extends BaseController
      *     @OA\Parameter(
      *         description="要删除的门店服务评价GUID",
      *         in="query",
-     *         name="guid",
+     *         name="GUID",
      *         required=true,
      *         @OA\Schema(
      *             type="string",
@@ -202,8 +202,9 @@ class BranchScoreController extends BaseController
      *     security={{"Authorization":{}}},
      * )
      */
-    public function actionScoreInfoDel($guid)
+    public function actionScoreInfoDel()
     {
+        $guid = Yii::$app->request->get('GUID');
         $model = ShopBranchScore::findOne($guid);
         if (!$model) {
             throw new BadRequestHttpException("Requested resource does not exist !");

backend/controllers/v1/transport/CompanyController.php

@@ -21,7 +21,15 @@ class CompanyController extends BaseController
      *     description="快递方式列表接口",
      *     @OA\Parameter(in = "query",name = "page",description = "分页页码",required = false,@OA\Schema(type="string")),
      *     @OA\Parameter(in = "query",name = "pageSize",description = "分页大小",required = false,@OA\Schema(type="string")),
-     *     @OA\Response(response = 200,description = "success"),
+     *     @OA\Response(response = 200,description = "
+     *           GUID:快递方式GUID,
+     *           CODE:快递方式CODE,
+     *           NAME:快递方式名称,
+     *           PHONE:手机号,
+     *           SORT:排序,
+     *           DESCRIPTION:描述,
+     *           IS_DEFAULT:是否默认 1是0否
+     *      "),
      *     security={{"Authorization": {}}}
      * )
      */
@@ -47,7 +55,15 @@ class CompanyController extends BaseController
      *     summary="快递方式详情接口(姚书侠)",
      *     description="快递方式详情接口",
      *     @OA\Parameter(name="guid",in="query",required=true,description="快递方式id",@OA\Schema(type="string")),
-     *     @OA\Response(response = 200,description = "success"),
+     *     @OA\Response(response = 200,description = "
+     *           GUID:快递方式GUID,
+     *           CODE:快递方式CODE,
+     *           NAME:快递方式名称,
+     *           PHONE:手机号,
+     *           SORT:排序,
+     *           DESCRIPTION:描述,
+     *           IS_DEFAULT:是否默认 1是0否
+     *      "),
      *     security={{"Authorization": {}}}
      * )
      */
@@ -123,7 +139,7 @@ class CompanyController extends BaseController
      *           )
      *       )
      *     ),
-     *     @OA\Response(response=200,description="成功时返回access-token"),
+     *     @OA\Response(response=200,description="success"),
      *     security={{"Authorization": {}}}    
      * )
      */
@@ -161,7 +177,7 @@ class CompanyController extends BaseController
      *           )
      *       )
      *     ),
-     *     @OA\Response(response=200,description="成功时返回access-token"),
+     *     @OA\Response(response=204,description="success"),
      *     security={{"Authorization": {}}}    
      * )
      */

backend/controllers/v1/transport/ShopTransportTypeController.php

-<?php
-
-namespace backend\controllers\v1\transport;
-
-use app\models\v1\branch\ShopBranch;
-use Yii;
-use backend\controllers\v1\BaseController;
-
-class ShopTransportTypeController extends BaseController
-{
-    public $modelClass = 'app\models\v1\transport\ShopTransportType';
-}

backend/controllers/v1/transport/TransportSettingController.php

@@ -92,7 +92,7 @@ class TransportSettingController extends BaseController
      *                      GUID：指定省级guid,
      *                      CODE：门店编码,
      *                      NAME：门店名称,
-     *                IS_PERMIT:是否准许保存编辑（1：准许保存编辑，0：不准许保存编辑）"),
+     *                IS_PERMIT:是否准许编辑（0：禁止保存编辑，1：准许保存编辑，2：只准编辑保存省级）"),
      *   security={{"Authorization":{}}}
      * )
      */
@@ -120,17 +120,16 @@ class TransportSettingController extends BaseController
 
         //权限
         $permit = 1;
-        $branchInfo = ShopBranch::find()->select(['BRANCH_TYPE', 'SUPPROVINCE_GUID'])->where(['GUID' => $info['GROUP_GUID']]);
         $userInfo = (new ShopRbacUser)->getRbacUserInfo(Yii::$app->user->identity->GUID);
         //总部权限管理员1,分部管理员权限2。非权限内不可保存编辑
         if (!in_array($userInfo['ROLE_ID'], [USER_ROLE_REGION_ADMIN, USER_ROLE_HEADQUARTERS_ADMIN])) {
             $permit = 0;
         }
-        //分部管理员权限2,分部管理员所属上级与运送模板创建所属上级不一致时不准保存编辑
-        if ($userInfo['ROLE_ID'] == USER_ROLE_REGION_ADMIN && $userInfo['SUPPROVINCE_GUID'] != $branchInfo['SUPPROVINCE_GUID']) {
-            $permit = 0;
+        //分部管理员权限2,
+        if ($userInfo['ROLE_ID'] == USER_ROLE_REGION_ADMIN && $userInfo['PARENT_BRANCH_GUID'] == $info['GROUP_GUID']) {
+            $permit = 2;
         }
-        $info['IS_PERMIT'] = $permit;  //是否准许编辑保存，1：准许保存编辑，0：禁止保存编辑
+        $info['IS_PERMIT'] = $permit;  //是否准许编辑保存，0：禁止保存编辑，1：准许保存编辑，2：只准编辑保存省级
         return $info;
     }
 
@@ -139,7 +138,7 @@ class TransportSettingController extends BaseController
      *     path="/backend/web/v1/transport/transport-settings/transport-fee-update",
      *     tags={"配送管理"},
      *     summary="更新运费模板信息详情(侯贺政)",
-     *     description="更新(运费模板信息详情",
+     *     description="更新运费模板信息详情",
      *     @OA\RequestBody(
      *         required=true,
      *         description="注：模板GUID、配送方式、是否启用必填，其他根据需要选填；限制人群、配送城市、指定省级多项使用英文逗号隔开。",
@@ -168,6 +167,10 @@ class TransportSettingController extends BaseController
      *         response=200,
      *         description="更新成功！"
      *     ),
+     *     @OA\Response(
+     *         response=422,
+     *         description="数据验证错误，错误信息（数组）。",
+     *     ),
      *     security={{"Authorization":{}}},
      * )
      */
@@ -203,10 +206,10 @@ class TransportSettingController extends BaseController
 
         //删除条件：总部权限删除所有，省级只能删除自己。
         switch ($userInfo['ROLE_ID']) {
-            case '1':
+            case USER_ROLE_HEADQUARTERS_ADMIN:
                 $where = ['ACTIVITY_GUID' => $params['GUID']];
                 break;
-            case '2':
+            case USER_ROLE_REGION_ADMIN:
                 $where = ['ACTIVITY_GUID' => $params['GUID'], 'BRANCH_GUID' => $userInfo['BRANCH_GUID']];
                 break;
             default:
@@ -250,4 +253,82 @@ class TransportSettingController extends BaseController
         }
         throw new HttpException(200, "更新成功！");
     }
+
+    /**
+     * @OA\GET(
+     *   path="/backend/web/v1/transport/transport-settings/get-branches-packaging",
+     *   tags={"配送管理"},
+     *   summary="获取指定省级列表(侯贺政)",
+     *   description="添加指定省级时，先获取的指定省级列表。",
+     *   @OA\Parameter(name="page",in="query",description="页码",@OA\schema(type="int")),
+     *   @OA\Parameter(name="search",in="query",description="门店名称或编码",@OA\schema(type="string")),
+     *   @OA\Response(response="200",description="
+     *                GUID:门店GUID,
+     *                NAME:门店名称,
+     *                CODE:门店编码,
+     *                RECIVER_PROVINCE:所在省,
+     *                RECIVER_CITY:所在市,
+     *                RECIVER_REGION:所在区"),
+     *   security={{"Authorization":{}}}
+     * )
+     */
+    public function actionGetBranchesPackaging()
+    {
+        $params = Yii::$app->request->queryParams;
+        $model = new ShopBranch();
+        $model->scenario = 'search';
+        $model->attributes = $params;
+        if (!$model->validate()) {
+            Yii::$app->response->statusCode = 422;
+            return $model->errors;
+        }
+        $list = $model->provinceBranches($model->search);
+        if (!$list->getModels()) {
+            throw new BadRequestHttpException('未找到符合条件的数据');
+        }
+        return $list;
+    }
+
+    /**
+     * @OA\Delete(
+     *     path="/backend/web/v1/transport/transport-settings/transport-fee-del",
+     *     tags={"配送管理"},
+     *     summary="删除运费模板信息(侯贺政)",
+     *     description="更新运费模板信息",
+     *     @OA\Parameter(
+     *         description="要删除的运费模板GUID",
+     *         in="query",
+     *         name="GUID",
+     *         required=true,
+     *         @OA\Schema(
+     *             type="string",
+     *         )
+     *     ),
+     *     @OA\Response(
+     *         response=200,
+     *         description="删除成功！"
+     *     ),
+     *     security={{"Authorization":{}}},
+     * )
+     */
+    public function actionTransportFeeDel()
+    {
+        $guid = Yii::$app->request->get('GUID');
+        $model = new $this->modelClass();
+        $_model = $model::findOne($guid);
+        if (!$_model) {
+            throw new BadRequestHttpException("Requested resource does not exist !");
+        }
+
+        $userInfo = (new ShopRbacUser)->getRbacUserInfo(Yii::$app->user->identity->GUID);
+        if ($userInfo['ROLE_ID'] == USER_ROLE_REGION_ADMIN && ($userInfo['BRANCH_GUID'] != $_model['GROUP_GUID']) && ($userInfo['PARENT_BRANCH_GUID'] != $_model['GROUP_GUID'])) {
+            throw new BadRequestHttpException('不能删除总部或其他省级的运费模板！');
+        }
+        
+        if (!$_model->delete()) {
+            throw new ServerErrorHttpException('删除失败！');
+        }
+
+        throw new HttpException(200, "删除成功！");
+    }
 }

backend/models/v1/transport/ShopPackagingcostsBranches.php

@@ -33,10 +33,10 @@ class ShopPackagingcostsBranches extends \app\models\v1\BaseModel
     public function rules()
     {
         return [
-            [['GUID'], 'required'],
+            [['GUID'], 'required', 'on' => ['creation']],
             [['CREATE_TIME'], 'safe'],
             [['GUID', 'ORG_GUID', 'ACTIVITY_GUID', 'BRANCH_GUID', 'ACTIVITY_TYPE', 'YGROUP_CODE'], 'string', 'max' => 50],
-            [['GUID'], 'unique'],
+            [['GUID'], 'unique', 'on' => ['creation']],
         ];
     }
 

backend/models/v1/transport/ShopTransportCompany.php

@@ -50,8 +50,8 @@ class ShopTransportCompany extends BaseModel
     public function rules()
     {
         return [
-            [['GUID', 'ORG_GUID', 'CODE', 'IS_DEFAULT','NAME'], 'required','message'=>'{attribute}为必填项','on'=>['create']],
-            [['CODE', 'IS_DEFAULT','NAME'], 'required','message'=>'{attribute}为必填项','on'=>['update']],
+            [['GUID', 'ORG_GUID', 'CODE', 'IS_DEFAULT','NAME'], 'required','message'=>'{attribute}为必填项','on'=>self::SCENARIO_CREATE],
+            [['CODE', 'IS_DEFAULT','NAME'], 'required','message'=>'{attribute}为必填项','on'=>self::SCENARIO_UPDATE],
             [['PHONE'], 'match','pattern' => '/^1\d{10}$/','message'=>'手机号格式不正确'],
             [['IS_DEFAULT'], 'boolean','message'=>'{attribute}传值错误'],
         ];

backend/models/v1/transport/TransportSetting.php

@@ -87,20 +87,25 @@ class TransportSetting extends \app\models\v1\BaseModel
     public function templates($platform_type)
     {
         $userInfo = (new ShopRbacUser)->getRbacUserInfo(Yii::$app->user->identity->GUID);
-        //省级权限，只展示省级所属的信息
-        $activityGUID = [];
-        if ($userInfo['ROLE_ID'] == USER_ROLE_REGION_ADMIN) {
-            $array = ShopPackagingcostsBranches::transportSetting($userInfo['BRANCH_GUID']);
-            foreach ($array as $key => $value) {
-                $activityGUID[] = $value['ACTIVITY_GUID'];
-            }
+        //权限
+        $where = [];
+        switch ($userInfo['ROLE_ID']) {
+            case USER_ROLE_HEADQUARTERS_ADMIN:
+                $where = [];
+                break;
+            case USER_ROLE_REGION_ADMIN:
+                $where = ['or', ['ts.GROUP_GUID' => $userInfo['PARENT_BRANCH_GUID']], ['ts.GROUP_GUID' => $userInfo['BRANCH_GUID']]];
+                break;
+            default:
+                $where = ['>',1,2];
+                break;
         }
 
         $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')
             ->where(['ts.PLATFORM_TYPE' => $platform_type])
-            ->andFilterWhere(['ts.GUID' => $activityGUID]);
+            ->andFilterWhere($where);
 
         $dataProvider = new ActiveDataProvider([
             'query' => $query->asArray(),