门店优化

backend/controllers/v1/branch/BranchController.php

@@ -83,7 +83,7 @@ class BranchController extends BaseController
      *   tags={"门店&DC"},
      *   description="门店详情",
      *   summary="门店详情(孙磊)",
-     *   @OA\Parameter(name="CODE",in="query",description="门店编码",@OA\Schema(type="string")),
+     *   @OA\Parameter(name="GUID",in="query",description="门店GUID",@OA\Schema(type="string")),
      *   @OA\Response(response="200",description="返回成功
      *   "),
      *   security={{"Authorization": {}}}
@@ -99,12 +99,12 @@ class BranchController extends BaseController
         
         if ($model->validate()) {
             //所有输入数据都有效 all inputs are valid
-            $info = $model->BranchDetail($params['CODE']);
+            $info = $model->BranchDetail($params['GUID']);
             if (!$list = $info->getModels()) {
                 throw new BadRequestHttpException('未找到符合的门店列表信息');
             }
             //获取门店服务类目信息
-            $branch_service_relation = $branch_service->BranchSeviceRelation($params['CODE']);
+            $branch_service_relation = $branch_service->BranchSeviceRelation($params['GUID']);
             if($bsr = $branch_service_relation->getModels()){
                 foreach($bsr as $k => $v){
                     $branch_s_type =  $branch_service_type->BranchServiceInfo('','',$v['SERVICE_TYPE_GUID']);
@@ -185,12 +185,13 @@ class BranchController extends BaseController
     {
         $param = Yii::$app->getRequest()->post();
         $ShopBranchService = new ShopBranchService();
+        //门店GUID 拼装
+        $branch_guid = Yii::$app->user->identity->ORG_GUID.'-'.$param['CODE'];
         //BRANCH_SERVICE_TYPE应传数组  值为服务类目GUID
         if(isset($param['BRANCH_SERVICE_TYPE']) && !empty($param['BRANCH_SERVICE_TYPE'])){
             $ShopBranchService->scenario = 'create';//创建的场景
             //删除门店原有服务类目
-            $code = $param['CODE'];
-            $ShopBranchService->BranchServiceDel($code);
+            $ShopBranchService->BranchServiceDel($branch_guid);
             $BST = $param['BRANCH_SERVICE_TYPE'];
             //判断门店服务类目类型
             if(is_string($BST)){
@@ -205,7 +206,7 @@ class BranchController extends BaseController
                     'GUID' => Func::create_guid(),
                     'STATE'=> 1,
                     'SERVICE_TYPE_GUID' => $v,
-                    'BRANCH_GUID' => $param['CODE'],
+                    'BRANCH_GUID' => $branch_guid,
                 );
                 $ShopBranchService->setAttributes($service_param);
                 //添加门店新的服务类目
@@ -230,7 +231,8 @@ class BranchController extends BaseController
         $model = new $this->modelClass();
         $model->scenario = 'create';//创建的场景
         $other_param = array(
-            'GUID'=>Func::create_guid(),
+            //'GUID'=>Func::create_guid(),
+            'GUID'=>$branch_guid,
             'ORG_GUID'=>Yii::$app->user->identity->ORG_GUID,
             'UPDATE_TIME'=>date('Y-m-d H:i:s',time()),
             'WORK_TIME'=>$WORK_TIME,
@@ -354,16 +356,17 @@ class BranchController extends BaseController
         $guid = $param['GUID'];
         $model = $this->modelClass::findOne($guid);
         $ShopBranchService = new ShopBranchService();
+        //门店GUID 拼装
+        $branch_guid = Yii::$app->user->identity->ORG_GUID.'-'.$param['CODE'];
         if(!$model){
             throw new BadRequestHttpException('没有找到要修改的记录');
         }
         //修改门店服务类目
         $BRANCH_SERVICE_TYPE = $param['BRANCH_SERVICE_TYPE'];
-        $CODE = $param['CODE'];
         if(isset($BRANCH_SERVICE_TYPE) && !empty($BRANCH_SERVICE_TYPE)){
             $ShopBranchService->scenario = 'create';//创建的场景
             //删除门店原有服务类目
-            $ShopBranchService->BranchServiceDel($CODE);
+            $ShopBranchService->BranchServiceDel($branch_guid);
             //判断门店服务类目类型
             if(is_string($BRANCH_SERVICE_TYPE)){
                 $BST_arr = explode(',',$BRANCH_SERVICE_TYPE);  
@@ -377,7 +380,7 @@ class BranchController extends BaseController
                     'GUID' => Func::create_guid(),
                     'STATE'=> 1,
                     'SERVICE_TYPE_GUID' => $v,
-                    'BRANCH_GUID' => $CODE,
+                    'BRANCH_GUID' => $branch_guid,
                 );
                 $ShopBranchService->setAttributes($service_param);
                 //添加门店新的服务类目
@@ -653,7 +656,7 @@ class BranchController extends BaseController
                             $string.='8,'; 
                         }
                         $string=substr($string,0,strlen($string)-1);
-                        $_branchModel->TRANSPORT_TYPE=$string;
+                        $_branchModel->TRANSPORT_TYPE=(string)$string;
                         $_servicModel =clone $servicModel;
                         $_servicModel->BranchServiceDel($_branchModel->GUID);
                         $serviceCode = explode(',',$_branchModel->SERVICE_TYPE_CODE);

backend/models/v1/branch/ShopBranch.php

@@ -109,17 +109,17 @@ class ShopBranch extends BaseModel
     {
         return [
             [['GUID', 'ORG_GUID', 'CODE', 'NAME'], 'required','on'=>['create','update']],
-            // [['ADDRESS', 'BRANCH_IMAGE_PATH', 'LICENCE_IMAGE_PATH', 'NOTICE_USER', 'CONTACTS_WXID', 'TRANSPORT_TYPE', 'RETURN_ADDRESS'], 'string'],
-            // [['IS_DELIVERY', 'IS_CARE', 'IS_RESERV', 'IS_O2O', 'IS_BOIL_MEDICINE', 'IS_POINTS_SHOP', 'IS_PICK_UP_STATION', 'IS_VIRTUAL_BRANCH', 'IS_SHELVE', 'BRANCH_TYPE', 'IS_DELIVERY_CODECHAIN_GOODS', 'SCORE', 'GOODS_TYPE', 'IS_B2C', 'TOTAL_VOLUME'], 'integer'],
-            // [['DELIVERY_LIMIT', 'PICKUP_LIMIT', 'TRANSFERS_RATE'], 'number'],
+            [['ADDRESS', 'BRANCH_IMAGE_PATH', 'LICENCE_IMAGE_PATH', 'NOTICE_USER', 'CONTACTS_WXID', 'TRANSPORT_TYPE', 'RETURN_ADDRESS'], 'string'],
+            [['IS_DELIVERY', 'IS_CARE', 'IS_RESERV', 'IS_O2O', 'IS_BOIL_MEDICINE', 'IS_POINTS_SHOP', 'IS_PICK_UP_STATION', 'IS_VIRTUAL_BRANCH', 'IS_SHELVE', 'BRANCH_TYPE', 'IS_DELIVERY_CODECHAIN_GOODS', 'SCORE', 'GOODS_TYPE', 'IS_B2C', 'TOTAL_VOLUME'], 'integer'],
+            [['DELIVERY_LIMIT', 'PICKUP_LIMIT', 'TRANSFERS_RATE'], 'number'],
             [['LICENCE_DATE', 'UPDATE_TIME'], 'safe'],
-            // [['GUID', 'ORG_GUID', 'CODE', 'PARENT_GUID', 'PHONE', 'CONTACT_NAME', 'LAT', 'LNG', 'RECIVER_PROVINCE', 'RECIVER_CITY', 'RECIVER_REGION', 'DELIVERY_TIME', 'WORK_TIME', 'PASSWORD', 'TRANSFERS_OPENID', 'SUPPROVINCE_GUID', 'OPERATING_AREA', 'DRUGS', 'HEALTH_PRODUCTS', 'CHINESE_MEDICINE', 'MEDICAL_APPARATUS', 'PANHEALTH', 'SMALL_SHOP', 'TOWNSHIP_SHOP', 'OUTSIDE_SHOP', 'PRESCRIPTION', 'SHOP_TYPE', 'THIRD_CODE', 'COMP_CODE', 'SALESDIST', 'ZCBZIRK'], 'string', 'max' => 50],
-            // [['NAME', 'DESCRIPTION'], 'string', 'max' => 100],
-            // [['PRIMARY_LAT', 'PRIMARY_LNG'], 'string', 'max' => 20],
-            // [['SUPPORT_SEND_PLATFORM'], 'string', 'max' => 10],
-            // [['HY_CODE', 'STATUS', 'BRANCH_NAME'], 'string', 'max' => 30],
-            // [['COMP_TEXT', 'SALESDIST_TEXT', 'ZCBZIRK_TEXT'], 'string', 'max' => 200],
-            // [['GUID'], 'unique'],
+            [['GUID', 'ORG_GUID', 'CODE', 'PARENT_GUID', 'PHONE', 'CONTACT_NAME', 'LAT', 'LNG', 'RECIVER_PROVINCE', 'RECIVER_CITY', 'RECIVER_REGION', 'DELIVERY_TIME', 'WORK_TIME', 'PASSWORD', 'TRANSFERS_OPENID', 'SUPPROVINCE_GUID', 'OPERATING_AREA', 'DRUGS', 'HEALTH_PRODUCTS', 'CHINESE_MEDICINE', 'MEDICAL_APPARATUS', 'PANHEALTH', 'SMALL_SHOP', 'TOWNSHIP_SHOP', 'OUTSIDE_SHOP', 'PRESCRIPTION', 'SHOP_TYPE', 'THIRD_CODE', 'COMP_CODE', 'SALESDIST', 'ZCBZIRK'], 'string', 'max' => 50],
+            [['NAME', 'DESCRIPTION'], 'string', 'max' => 100],
+            [['PRIMARY_LAT', 'PRIMARY_LNG'], 'string', 'max' => 20],
+            [['SUPPORT_SEND_PLATFORM'], 'string', 'max' => 10],
+            [['HY_CODE', 'STATUS', 'BRANCH_NAME'], 'string', 'max' => 30],
+            [['COMP_TEXT', 'SALESDIST_TEXT', 'ZCBZIRK_TEXT'], 'string', 'max' => 200],
+            [['GUID'], 'unique'],
 
             [['CODE','DESCRIPTION','CONTACT_NAME','PHONE','NAME','LAT','LNG','IS_DELIVERY','DELIVERY_TIME','WORK_TIME','IS_CARE','IS_RESERV',
                 'IS_O2O','IS_BOIL_MEDICINE','IS_POINTS_SHOP','IS_VIRTUAL_BRANCH','IS_DELIVERY_CODECHAIN_GOODS','IS_SHELVE',
@@ -323,13 +323,13 @@ class ShopBranch extends BaseModel
      * @params array $params 查询参数数组
      * @return array|null 返回查询结果
      */
-    public function BranchDetail($code)
+    public function BranchDetail($GUID)
     {
         $query = static::find()
             ->select('GUID,NAME,CODE,LICENCE_IMAGE_PATH,RECIVER_PROVINCE,RECIVER_CITY,RECIVER_REGION,ADDRESS,PARENT_GUID,
             LAT,LNG,IS_POINTS_SHOP,DESCRIPTION,BRANCH_NAME,BRANCH_IMAGE_PATH,PHONE,CONTACT_NAME,SCORE,IS_CARE,
             IS_O2O,IS_DELIVERY_CODECHAIN_GOODS,IS_SHELVE,WORK_TIME,DELIVERY_TIME,TRANSPORT_TYPE,RETURN_ADDRESS')
-            ->where(['CODE'=>$code]);
+            ->where(['GUID'=>$GUID]);
 
         return new ActiveDataProvider([
             'query' => $query->asArray(),

backend/models/v1/branch/ShopBranchService.php

@@ -53,18 +53,18 @@ class ShopBranchService extends BaseModel
         ];
     }
     //删除门店原有服务类目
-    public function BranchServiceDel($b_code)
+    public function BranchServiceDel($b_guid)
     {
-        $branch_service = static::deleteAll(['BRANCH_GUID'=>$b_code]);
+        $branch_service = static::deleteAll(['BRANCH_GUID'=>$b_guid]);
         return $branch_service;
     }
     //获取门店服务类目关系
-    public function BranchSeviceRelation($b_code)
+    public function BranchSeviceRelation($b_guid)
     {
         $branch_service = static::find()
             ->select('GUID,BRANCH_GUID,SERVICE_TYPE_GUID')
             ->where(['STATE'=>1])
-            ->andwhere(['BRANCH_GUID'=>$b_code]);
+            ->andwhere(['BRANCH_GUID'=>$b_guid]);
             
         return new ActiveDataProvider(
             [