Skip to content

N
newShopBack
Commit 07f4652f authored by 孙磊's avatar 孙磊
Browse files
Options

格式化处理 

Signed-off-by: 孙磊's avatarsunlei <sunlei@romens.cn>
parent ee5e875f
Show whitespace changes
Inline Side-by-side
Showing with 516 additions and 521 deletions
backend/controllers/v1/branch/BranchController.php
View file @ 07f4652f
...@@ -63,13 +63,13 @@ class BranchController extends BaseController ...@@ -63,13 +63,13 @@ class BranchController extends BaseController
// print_r($userinfo);die(); // print_r($userinfo);die();
$where_branch = ''; $where_branch = '';
//是否是 分公司管理员 是的话只显示所管理门店的数据 //是否是 分公司管理员 是的话只显示所管理门店的数据
if($userinfo['ROLE_ID'] == USER_ROLE_REGION_ADMIN){ if ($userinfo['ROLE_ID'] == USER_ROLE_REGION_ADMIN) {
$branchguids_str = $userinfo['BRANCH_GUID']; $branchguids_str = $userinfo['BRANCH_GUID'];
$where_branch = empty($branchguids_str)?$userinfo['SUPPROVINCE_GUID']:"'".$userinfo['SUPPROVINCE_GUID']."',".$branchguids_str; $where_branch = empty($branchguids_str) ? $userinfo['SUPPROVINCE_GUID'] : "'" . $userinfo['SUPPROVINCE_GUID'] . "'," . $branchguids_str;
}elseif($userinfo['ROLE_ID'] == USER_ROLE_STORE_ADMIN){ } elseif ($userinfo['ROLE_ID'] == USER_ROLE_STORE_ADMIN) {
//门店 //门店
$branchguid = $userinfo['BRANCH_GUID']; $branchguid = $userinfo['BRANCH_GUID'];
$where_branch = !empty($branchguid) ? $branchguid :''; $where_branch = !empty($branchguid) ? $branchguid : '';
} }
$model = new $this->modelClass(); $model = new $this->modelClass();
$params = Yii::$app->request->queryParams; $params = Yii::$app->request->queryParams;
...@@ -83,8 +83,8 @@ class BranchController extends BaseController ...@@ -83,8 +83,8 @@ class BranchController extends BaseController
if (!$list = $info->getModels()) { if (!$list = $info->getModels()) {
throw new BadRequestHttpException('未找到符合的门店列表信息'); throw new BadRequestHttpException('未找到符合的门店列表信息');
} }
foreach($list as $key => $val){ foreach ($list as $key => $val) {
$list[$key]['DETAIL_ADDRESS'] = $val['PROVINCE'].$val['CITY'].$val['REGION'].$val['ADDRESS']; $list[$key]['DETAIL_ADDRESS'] = $val['PROVINCE'] . $val['CITY'] . $val['REGION'] . $val['ADDRESS'];
} }
$info->setModels($list); $info->setModels($list);
return $info; return $info;
...@@ -124,16 +124,16 @@ class BranchController extends BaseController ...@@ -124,16 +124,16 @@ class BranchController extends BaseController
//获取门店服务类目关系信息 //获取门店服务类目关系信息
$branch_service_relation = $branch_service->BranchSeviceRelation($params['GUID']); $branch_service_relation = $branch_service->BranchSeviceRelation($params['GUID']);
//获取门店服务类目名称 //获取门店服务类目名称
if($branch_service_relation){ if ($branch_service_relation) {
foreach($branch_service_relation as $k => $v){ foreach ($branch_service_relation as $k => $v) {
$branch_s_type = $branch_service_type->BranchServiceInfo('','',$v['SERVICE_TYPE_GUID']); $branch_s_type = $branch_service_type->BranchServiceInfo('', '', $v['SERVICE_TYPE_GUID']);
$branch_ser_type = $branch_s_type->getModels(); $branch_ser_type = $branch_s_type->getModels();
//获取服务类目信息 //获取服务类目信息
if($branch_ser_type){ if ($branch_ser_type) {
$branch_service_relation[$k]['BRANCH_SERVICE_TYPE_NAME'] = $branch_ser_type[0]['NAME']; $branch_service_relation[$k]['BRANCH_SERVICE_TYPE_NAME'] = $branch_ser_type[0]['NAME'];
// unset($branch_service_relation[$k]['GUID']); // unset($branch_service_relation[$k]['GUID']);
// unset($branch_service_relation[$k]['BRANCH_GUID']); // unset($branch_service_relation[$k]['BRANCH_GUID']);
}else{ } else {
$branch_service_relation[$k]['SERVICE_TYPE_GUID'] = ''; $branch_service_relation[$k]['SERVICE_TYPE_GUID'] = '';
$branch_service_relation[$k]['BRANCH_SERVICE_TYPE_NAME'] = ''; $branch_service_relation[$k]['BRANCH_SERVICE_TYPE_NAME'] = '';
} }
...@@ -202,57 +202,57 @@ class BranchController extends BaseController ...@@ -202,57 +202,57 @@ class BranchController extends BaseController
$param = Yii::$app->getRequest()->post(); $param = Yii::$app->getRequest()->post();
$ShopBranchService = new ShopBranchService(); $ShopBranchService = new ShopBranchService();
//门店GUID 拼装 //门店GUID 拼装
$branch_guid = Yii::$app->user->identity->ORG_GUID.'-'.$param['CODE']; $branch_guid = Yii::$app->user->identity->ORG_GUID . '-' . $param['CODE'];
//BRANCH_SERVICE_TYPE应传数组 值为服务类目GUID //BRANCH_SERVICE_TYPE应传数组 值为服务类目GUID
if(isset($param['BRANCH_SERVICE_TYPE']) && !empty($param['BRANCH_SERVICE_TYPE'])){ if (isset($param['BRANCH_SERVICE_TYPE']) && !empty($param['BRANCH_SERVICE_TYPE'])) {
$ShopBranchService->scenario = 'create';//创建的场景 $ShopBranchService->scenario = 'create'; //创建的场景
//删除门店原有服务类目 //删除门店原有服务类目
$ShopBranchService->BranchServiceDel($branch_guid); $ShopBranchService->BranchServiceDel($branch_guid);
$BST = $param['BRANCH_SERVICE_TYPE']; $BST = $param['BRANCH_SERVICE_TYPE'];
//判断门店服务类目类型 //判断门店服务类目类型
if(is_string($BST)){ if (is_string($BST)) {
$BST_arr = explode(',',$BST); $BST_arr = explode(',', $BST);
}else{ } else {
$BST_arr = $BST; $BST_arr = $BST;
} }
//添加门店服务类目 //添加门店服务类目
foreach($BST_arr as $k => $v){ foreach ($BST_arr as $k => $v) {
$ShopBranchService = new ShopBranchService(); $ShopBranchService = new ShopBranchService();
$service_param = array( $service_param = array(
'GUID' => Func::create_guid(), 'GUID' => Func::create_guid(),
'STATE'=> 1, 'STATE' => 1,
'SERVICE_TYPE_GUID' => $v, 'SERVICE_TYPE_GUID' => $v,
'BRANCH_GUID' => $branch_guid, 'BRANCH_GUID' => $branch_guid,
); );
$ShopBranchService->setAttributes($service_param); $ShopBranchService->setAttributes($service_param);
//添加门店新的服务类目 //添加门店新的服务类目
if(!$ShopBranchService->save()){ if (!$ShopBranchService->save()) {
return array('message'=>'门店服务类目添加失败！'); return array('message' => '门店服务类目添加失败！');
} }
} }
} }
//营业时间 //营业时间
if(!empty($param['WORK_TIME_START']) && !empty($param['WORK_TIME_END'])){ if (!empty($param['WORK_TIME_START']) && !empty($param['WORK_TIME_END'])) {
$WORK_TIME = $param['WORK_TIME_START'].'-'.$param['WORK_TIME_END']; $WORK_TIME = $param['WORK_TIME_START'] . '-' . $param['WORK_TIME_END'];
}else{ } else {
$WORK_TIME = ''; $WORK_TIME = '';
} }
//配送时间 //配送时间
if(!empty($param['DELIVERY_TIME_START']) && !empty($param['DELIVERY_TIME_END'])){ if (!empty($param['DELIVERY_TIME_START']) && !empty($param['DELIVERY_TIME_END'])) {
$DELIVERY_TIME = $param['DELIVERY_TIME_START'].'-'.$param['DELIVERY_TIME_END']; $DELIVERY_TIME = $param['DELIVERY_TIME_START'] . '-' . $param['DELIVERY_TIME_END'];
}else{ } else {
$DELIVERY_TIME = ''; $DELIVERY_TIME = '';
} }
//添加门店 //添加门店
$model = new $this->modelClass(); $model = new $this->modelClass();
$model->scenario = 'create';//创建的场景 $model->scenario = 'create'; //创建的场景
$other_param = array( $other_param = array(
//'GUID'=>Func::create_guid(), //'GUID'=>Func::create_guid(),
'GUID'=>$branch_guid, 'GUID' => $branch_guid,
'ORG_GUID'=>Yii::$app->user->identity->ORG_GUID, 'ORG_GUID' => Yii::$app->user->identity->ORG_GUID,
'UPDATE_TIME'=>date('Y-m-d H:i:s',time()), 'UPDATE_TIME' => date('Y-m-d H:i:s', time()),
'WORK_TIME'=>$WORK_TIME, 'WORK_TIME' => $WORK_TIME,
'DELIVERY_TIME'=>$DELIVERY_TIME, 'DELIVERY_TIME' => $DELIVERY_TIME,
); );
$model->setAttributes($other_param); $model->setAttributes($other_param);
$model->setAttributes(Yii::$app->getRequest()->post()); $model->setAttributes(Yii::$app->getRequest()->post());
...@@ -285,7 +285,7 @@ class BranchController extends BaseController ...@@ -285,7 +285,7 @@ class BranchController extends BaseController
*/ */
public function actionBranchServices() public function actionBranchServices()
{ {
$model=new BranchServiceType(); $model = new BranchServiceType();
$info = $model->BranchServiceInfoAll(); $info = $model->BranchServiceInfoAll();
if (!$info) { if (!$info) {
throw new BadRequestHttpException('未找到符合的门店服务类目信息'); throw new BadRequestHttpException('未找到符合的门店服务类目信息');
...@@ -402,7 +402,7 @@ class BranchController extends BaseController ...@@ -402,7 +402,7 @@ class BranchController extends BaseController
if ($model->validate()) { if ($model->validate()) {
//所有输入数据都有效 all inputs are valid //所有输入数据都有效 all inputs are valid
$info = $model->getBranchRegion($SUPPROVINCE_GUID,1); $info = $model->getBranchRegion($SUPPROVINCE_GUID, 1);
if (!$info) { if (!$info) {
throw new BadRequestHttpException('未找到符合的门店区域信息'); throw new BadRequestHttpException('未找到符合的门店区域信息');
} }
...@@ -470,56 +470,56 @@ class BranchController extends BaseController ...@@ -470,56 +470,56 @@ class BranchController extends BaseController
$model = $this->modelClass::findOne($guid); $model = $this->modelClass::findOne($guid);
$ShopBranchService = new ShopBranchService(); $ShopBranchService = new ShopBranchService();
//门店GUID 拼装 //门店GUID 拼装
$branch_guid = Yii::$app->user->identity->ORG_GUID.'-'.$param['CODE']; $branch_guid = Yii::$app->user->identity->ORG_GUID . '-' . $param['CODE'];
if(!$model){ if (!$model) {
throw new BadRequestHttpException('没有找到要修改的记录'); throw new BadRequestHttpException('没有找到要修改的记录');
} }
//修改门店服务类目 //修改门店服务类目
$BRANCH_SERVICE_TYPE = $param['BRANCH_SERVICE_TYPE']; $BRANCH_SERVICE_TYPE = $param['BRANCH_SERVICE_TYPE'];
if(isset($BRANCH_SERVICE_TYPE) && !empty($BRANCH_SERVICE_TYPE)){ if (isset($BRANCH_SERVICE_TYPE) && !empty($BRANCH_SERVICE_TYPE)) {
$ShopBranchService->scenario = 'create';//创建的场景 $ShopBranchService->scenario = 'create'; //创建的场景
//删除门店原有服务类目 //删除门店原有服务类目
$ShopBranchService->BranchServiceDel($branch_guid); $ShopBranchService->BranchServiceDel($branch_guid);
//判断门店服务类目类型 //判断门店服务类目类型
if(is_string($BRANCH_SERVICE_TYPE)){ if (is_string($BRANCH_SERVICE_TYPE)) {
$BST_arr = explode(',',$BRANCH_SERVICE_TYPE); $BST_arr = explode(',', $BRANCH_SERVICE_TYPE);
}else{ } else {
$BST_arr = $BRANCH_SERVICE_TYPE; $BST_arr = $BRANCH_SERVICE_TYPE;
} }
//添加门店服务类目 //添加门店服务类目
foreach($BST_arr as $k => $v){ foreach ($BST_arr as $k => $v) {
$ShopBranchService = new ShopBranchService(); $ShopBranchService = new ShopBranchService();
$service_param = array( $service_param = array(
'GUID' => Func::create_guid(), 'GUID' => Func::create_guid(),
'STATE'=> 1, 'STATE' => 1,
'SERVICE_TYPE_GUID' => $v, 'SERVICE_TYPE_GUID' => $v,
'BRANCH_GUID' => $branch_guid, 'BRANCH_GUID' => $branch_guid,
); );
$ShopBranchService->setAttributes($service_param); $ShopBranchService->setAttributes($service_param);
//添加门店新的服务类目 //添加门店新的服务类目
if(!$ShopBranchService->save()){ if (!$ShopBranchService->save()) {
return array('message'=>'门店服务类目添加失败！'); return array('message' => '门店服务类目添加失败！');
} }
} }
} }
//营业时间 //营业时间
if(!empty($param['WORK_TIME_START']) && !empty($param['WORK_TIME_END'])){ if (!empty($param['WORK_TIME_START']) && !empty($param['WORK_TIME_END'])) {
$WORK_TIME = $param['WORK_TIME_START'].'-'.$param['WORK_TIME_END']; $WORK_TIME = $param['WORK_TIME_START'] . '-' . $param['WORK_TIME_END'];
}else{ } else {
$WORK_TIME = ''; $WORK_TIME = '';
} }
//配送时间 //配送时间
if(!empty($param['DELIVERY_TIME_START']) && !empty($param['DELIVERY_TIME_END'])){ if (!empty($param['DELIVERY_TIME_START']) && !empty($param['DELIVERY_TIME_END'])) {
$DELIVERY_TIME = $param['DELIVERY_TIME_START'].'-'.$param['DELIVERY_TIME_END']; $DELIVERY_TIME = $param['DELIVERY_TIME_START'] . '-' . $param['DELIVERY_TIME_END'];
}else{ } else {
$DELIVERY_TIME = ''; $DELIVERY_TIME = '';
} }
//门店信息修改 //门店信息修改
$model->scenario = 'update';//创建的场景 $model->scenario = 'update'; //创建的场景
$other_param = array( $other_param = array(
'UPDATE_TIME'=>date('Y-m-d H:i:s',time()), 'UPDATE_TIME' => date('Y-m-d H:i:s', time()),
'WORK_TIME'=>$WORK_TIME, 'WORK_TIME' => $WORK_TIME,
'DELIVERY_TIME'=>$DELIVERY_TIME, 'DELIVERY_TIME' => $DELIVERY_TIME,
); );
$model->setAttributes($other_param); $model->setAttributes($other_param);
$model->setAttributes(Yii::$app->getRequest()->post()); $model->setAttributes(Yii::$app->getRequest()->post());
...@@ -555,9 +555,9 @@ class BranchController extends BaseController ...@@ -555,9 +555,9 @@ class BranchController extends BaseController
$guid = Yii::$app->getRequest()->post('GUID'); $guid = Yii::$app->getRequest()->post('GUID');
$model = new $this->modelClass(); $model = new $this->modelClass();
$branchservice = $model::findOne($guid); $branchservice = $model::findOne($guid);
if(!$branchservice){ if (!$branchservice) {
throw new BadRequestHttpException('没有找到要删除的记录'); throw new BadRequestHttpException('没有找到要删除的记录');
}else if ($branchservice->delete() === false) { } else if ($branchservice->delete() === false) {
throw new ServerErrorHttpException('Failed to delete the object for unknown reason.'); throw new ServerErrorHttpException('Failed to delete the object for unknown reason.');
} }
...@@ -593,25 +593,25 @@ class BranchController extends BaseController ...@@ -593,25 +593,25 @@ class BranchController extends BaseController
public function actionBranchImgUpload() public function actionBranchImgUpload()
{ {
//多文件时依赖注入参数参考UploadFiles类 //多文件时依赖注入参数参考UploadFiles类
$model = new UploadFiles(['png','jpg','jpeg']); $model = new UploadFiles(['png', 'jpg', 'jpeg']);
if (Yii::$app->request->isPost) { if (Yii::$app->request->isPost) {
//多文件用getInstances //多文件用getInstances
$model->uploadFiles = UploadedFile::getInstance($model,'uploadFile'); $model->uploadFiles = UploadedFile::getInstance($model, 'uploadFile');
$fileInfo = $model->upload(); $fileInfo = $model->upload();
if ($fileInfo['CODE']==200) { if ($fileInfo['CODE'] == 200) {
// 文件上传成功 // 文件上传成功
return [ return [
'CODE'=>200, 'CODE' => 200,
'imgUrl'=>$fileInfo['INFO'] 'imgUrl' => $fileInfo['INFO']
]; ];
}else{ } else {
throw new HttpException(422); throw new HttpException(422);
} }
} }
} }
/** /**
* @OA\Post( * @OA\Post(
* path="/backend/web/v1/branch/branches/upload", * path="/backend/web/v1/branch/branches/upload",
* tags={"上传文件事例"}, * tags={"上传文件事例"},
...@@ -644,18 +644,17 @@ class BranchController extends BaseController ...@@ -644,18 +644,17 @@ class BranchController extends BaseController
$model = new UploadFiles(); $model = new UploadFiles();
if (Yii::$app->request->isPost) { if (Yii::$app->request->isPost) {
//多文件用getInstances //多文件用getInstances
$model->uploadFiles = UploadedFile::getInstance($model,'uploadFile'); $model->uploadFiles = UploadedFile::getInstance($model, 'uploadFile');
$fileInfo = $model->upload(); $fileInfo = $model->upload();
if ($fileInfo['CODE']==200) { if ($fileInfo['CODE'] == 200) {
// 文件上传成功 // 文件上传成功
return $fileInfo['INFO']; return $fileInfo['INFO'];
// throw new HttpException(200); // throw new HttpException(200);
}else{ } else {
throw new HttpException(422); throw new HttpException(422);
} }
} }
} }
/** /**
...@@ -682,106 +681,106 @@ class BranchController extends BaseController ...@@ -682,106 +681,106 @@ class BranchController extends BaseController
$model = new UploadFiles(); $model = new UploadFiles();
if (Yii::$app->request->isPost) { if (Yii::$app->request->isPost) {
//多文件用getInstances //多文件用getInstances
$model->uploadFiles = UploadedFile::getInstance($model,'uploadFile'); $model->uploadFiles = UploadedFile::getInstance($model, 'uploadFile');
$fileInfo = $model->upload(); $fileInfo = $model->upload();
if ($fileInfo['CODE']==200) { if ($fileInfo['CODE'] == 200) {
// 文件上传成功 // 文件上传成功
$rows = Helper::newSpreadsheet($fileInfo['INFO'][0])->getRows(); $rows = Helper::newSpreadsheet($fileInfo['INFO'][0])->getRows();
$tempArr=array_slice($rows,2); $tempArr = array_slice($rows, 2);
$branchModel = new $this->modelClass(); $branchModel = new $this->modelClass();
$branchModel->scenario = 'import'; $branchModel->scenario = 'import';
$transaction=$branchModel->getDb()->beginTransaction(); $transaction = $branchModel->getDb()->beginTransaction();
$servicModel = new ShopBranchService(); $servicModel = new ShopBranchService();
try { try {
foreach ($tempArr as $key => $value) { foreach ($tempArr as $key => $value) {
$_branchModel = $branchModel::findOne(Yii::$app->user->identity->ORG_GUID.'-'.$value[0]); $_branchModel = $branchModel::findOne(Yii::$app->user->identity->ORG_GUID . '-' . $value[0]);
if ($_branchModel===null) { if ($_branchModel === null) {
$_branchModel = clone $branchModel; $_branchModel = clone $branchModel;
} }
$_branchModel->GUID=Yii::$app->user->identity->ORG_GUID.'-'.$value[0]; $_branchModel->GUID = Yii::$app->user->identity->ORG_GUID . '-' . $value[0];
$_branchModel->CODE=$value[0]; $_branchModel->CODE = $value[0];
$_branchModel->ORG_GUID=Yii::$app->user->identity->ORG_GUID; $_branchModel->ORG_GUID = Yii::$app->user->identity->ORG_GUID;
$_branchModel->DESCRIPTION=$value[1]; $_branchModel->DESCRIPTION = $value[1];
$_branchModel->CONTACT_NAME=$value[2]; $_branchModel->CONTACT_NAME = $value[2];
$_branchModel->PHONE=$value[3]; $_branchModel->PHONE = $value[3];
$_branchModel->DELIVERY_TIME=$value[4]; $_branchModel->DELIVERY_TIME = $value[4];
$_branchModel->WORK_TIME=$value[5]; $_branchModel->WORK_TIME = $value[5];
$_branchModel->NAME=$value[6]; $_branchModel->NAME = $value[6];
$_branchModel->LAT=$value[7]; $_branchModel->LAT = $value[7];
$_branchModel->LNG=$value[8]; $_branchModel->LNG = $value[8];
$_branchModel->IS_DELIVERY=$value[9]; $_branchModel->IS_DELIVERY = $value[9];
$_branchModel->IS_CARE=$value[10]; $_branchModel->IS_CARE = $value[10];
$_branchModel->IS_RESERV=$value[11]; $_branchModel->IS_RESERV = $value[11];
$_branchModel->IS_O2O=$value[12]; $_branchModel->IS_O2O = $value[12];
$_branchModel->IS_BOIL_MEDICINE=$value[13]; $_branchModel->IS_BOIL_MEDICINE = $value[13];
$_branchModel->IS_POINTS_SHOP=$value[14]; $_branchModel->IS_POINTS_SHOP = $value[14];
$_branchModel->IS_VIRTUAL_BRANCH=$value[15]; $_branchModel->IS_VIRTUAL_BRANCH = $value[15];
$_branchModel->IS_DELIVERY_CODECHAIN_GOODS=$value[16]; $_branchModel->IS_DELIVERY_CODECHAIN_GOODS = $value[16];
$_branchModel->IS_SHELVE=$value[17]; $_branchModel->IS_SHELVE = $value[17];
$_branchModel->SERVICE_TYPE_CODE=$value[18]; $_branchModel->SERVICE_TYPE_CODE = $value[18];
$_branchModel->IS_BRANCH_SELF_MENTION=$value[19]; $_branchModel->IS_BRANCH_SELF_MENTION = $value[19];
$_branchModel->IS_BRANCH_EXPRESS_DELIVERY=$value[20]; $_branchModel->IS_BRANCH_EXPRESS_DELIVERY = $value[20];
$_branchModel->IS_DELIVERS_GOODS=$value[21]; $_branchModel->IS_DELIVERS_GOODS = $value[21];
$_branchModel->IS_EXPRESS_DELIVERY=$value[22]; $_branchModel->IS_EXPRESS_DELIVERY = $value[22];
$_branchModel->IS_BRANCH_SELF_DELIVERY=$value[23]; $_branchModel->IS_BRANCH_SELF_DELIVERY = $value[23];
$_branchModel->IS_HAFL_HOUR_DELIVERY=$value[24]; $_branchModel->IS_HAFL_HOUR_DELIVERY = $value[24];
$_branchModel->IS_ONE_HOUR_DELIVERY=$value[25]; $_branchModel->IS_ONE_HOUR_DELIVERY = $value[25];
$_branchModel->IS_TWO_HOUR_DELIVERY=$value[26]; $_branchModel->IS_TWO_HOUR_DELIVERY = $value[26];
$_branchModel->IS_DAY_DELIVERY=$value[27]; $_branchModel->IS_DAY_DELIVERY = $value[27];
//门店自提 //门店自提
$string=''; $string = '';
if(isset($value[19]) && !empty($value[19])){ if (isset($value[19]) && !empty($value[19])) {
$string.='23B70F47-45D6-4ECE-8A3A-13CC92DEA4B1,'; $string .= '23B70F47-45D6-4ECE-8A3A-13CC92DEA4B1,';
} }
//门店快递配送 //门店快递配送
if(isset($value[20]) && !empty($value[20])){ if (isset($value[20]) && !empty($value[20])) {
$string.='1,'; $string .= '1,';
} }
//送货上门 //送货上门
if(isset($value[21]) && !empty($value[21])){ if (isset($value[21]) && !empty($value[21])) {
$string.='2,'; $string .= '2,';
} }
//快递配送 //快递配送
if(isset($value[22]) && !empty($value[22])){ if (isset($value[22]) && !empty($value[22])) {
$string.='3,'; $string .= '3,';
} }
//门店自配送 //门店自配送
if(isset($value[23]) && !empty($value[23])){ if (isset($value[23]) && !empty($value[23])) {
$string.='4,'; $string .= '4,';
} }
//半小时达 //半小时达
if(isset($value[24]) && !empty($value[24])){ if (isset($value[24]) && !empty($value[24])) {
$string.='5,'; $string .= '5,';
} }
//1小时达 //1小时达
if(isset($value[25]) && !empty($value[25])){ if (isset($value[25]) && !empty($value[25])) {
$string.='6,'; $string .= '6,';
} }
//2小时达 //2小时达
if(isset($value[26]) && !empty($value[26])){ if (isset($value[26]) && !empty($value[26])) {
$string.='7,'; $string .= '7,';
} }
//当日定时达 //当日定时达
if(isset($value[27]) && !empty($value[27])){ if (isset($value[27]) && !empty($value[27])) {
$string.='8,'; $string .= '8,';
} }
$string=substr($string,0,strlen($string)-1); $string = substr($string, 0, strlen($string) - 1);
$_branchModel->TRANSPORT_TYPE=(string)$string; $_branchModel->TRANSPORT_TYPE = (string) $string;
$_servicModel =clone $servicModel; $_servicModel = clone $servicModel;
$_servicModel->BranchServiceDel($_branchModel->GUID); $_servicModel->BranchServiceDel($_branchModel->GUID);
$serviceCode = explode(',',$_branchModel->SERVICE_TYPE_CODE); $serviceCode = explode(',', $_branchModel->SERVICE_TYPE_CODE);
$serviceArr = []; $serviceArr = [];
foreach ($serviceCode as $servValue) { foreach ($serviceCode as $servValue) {
$serviceArr[]=[Func::create_guid(),$_branchModel->GUID,$servValue,1]; $serviceArr[] = [Func::create_guid(), $_branchModel->GUID, $servValue, 1];
} }
$_servicModel->getDb()->createCommand()->batchInsert('shop_branch_service', ['GUID', 'BRANCH_GUID','SERVICE_TYPE_GUID','STATE'], $serviceArr)->execute(); $_servicModel->getDb()->createCommand()->batchInsert('shop_branch_service', ['GUID', 'BRANCH_GUID', 'SERVICE_TYPE_GUID', 'STATE'], $serviceArr)->execute();
if (!$_branchModel->save()) { if (!$_branchModel->save()) {
$transaction->rollBack(); $transaction->rollBack();
$returnInfo = [ $returnInfo = [
($key+1) => $_branchModel->errors ($key + 1) => $_branchModel->errors
]; ];
@unlink($fileInfo['INFO'][0]); @unlink($fileInfo['INFO'][0]);
Yii::$app->response->statusCode = 422; Yii::$app->response->statusCode = 422;
...@@ -791,17 +790,17 @@ class BranchController extends BaseController ...@@ -791,17 +790,17 @@ class BranchController extends BaseController
$transaction->commit(); $transaction->commit();
@unlink($fileInfo['INFO'][0]); @unlink($fileInfo['INFO'][0]);
throw new HttpException("200", '导入成功'); throw new HttpException("200", '导入成功');
}catch(\Throwable $e) { } catch (\Throwable $e) {
$transaction->rollBack(); $transaction->rollBack();
@unlink($fileInfo['INFO'][0]); @unlink($fileInfo['INFO'][0]);
throw $e; throw $e;
} }
}else{ } else {
return $fileInfo['INFO']; return $fileInfo['INFO'];
} }
} }
} }
/** /**
* @OA\Get( * @OA\Get(
* path="/backend/web/v1/branch/branches/export-branch", * path="/backend/web/v1/branch/branches/export-branch",
* tags={"门店&DC"}, * tags={"门店&DC"},
...@@ -844,47 +843,46 @@ class BranchController extends BaseController ...@@ -844,47 +843,46 @@ class BranchController extends BaseController
IS_DELIVERY_CODECHAIN_GOODS,IS_SHELVE,TRANSPORT_TYPE') IS_DELIVERY_CODECHAIN_GOODS,IS_SHELVE,TRANSPORT_TYPE')
->filterWhere( ->filterWhere(
[ [
'RECIVER_PROVINCE' => isset($get['RECIVER_PROVINCE'])?$get['RECIVER_PROVINCE']:'', 'RECIVER_PROVINCE' => isset($get['RECIVER_PROVINCE']) ? $get['RECIVER_PROVINCE'] : '',
'RECIVER_CITY' => isset($get['RECIVER_CITY'])?$get['RECIVER_CITY']:'', 'RECIVER_CITY' => isset($get['RECIVER_CITY']) ? $get['RECIVER_CITY'] : '',
'RECIVER_REGION' => isset($get['RECIVER_REGION'])?$get['RECIVER_REGION']:'', 'RECIVER_REGION' => isset($get['RECIVER_REGION']) ? $get['RECIVER_REGION'] : '',
'IS_CARE' => isset($get['IS_CARE'])?$get['IS_CARE']:'', 'IS_CARE' => isset($get['IS_CARE']) ? $get['IS_CARE'] : '',
'IS_POINTS_SHOP' => isset($get['IS_POINTS_SHOP'])?$get['IS_POINTS_SHOP']:'', 'IS_POINTS_SHOP' => isset($get['IS_POINTS_SHOP']) ? $get['IS_POINTS_SHOP'] : '',
'IS_SHELVE' => isset($get['IS_SHELVE'])?$get['IS_SHELVE']:'', 'IS_SHELVE' => isset($get['IS_SHELVE']) ? $get['IS_SHELVE'] : '',
'SUPPROVINCE_GUID' => isset($get['SUPPROVINCE_GUID'])?$get['SUPPROVINCE_GUID']:'', 'SUPPROVINCE_GUID' => isset($get['SUPPROVINCE_GUID']) ? $get['SUPPROVINCE_GUID'] : '',
'IS_DELIVERY_CODECHAIN_GOODS' => isset($get['IS_DELIVERY_CODECHAIN_GOODS'])?$get['IS_DELIVERY_CODECHAIN_GOODS']:'', 'IS_DELIVERY_CODECHAIN_GOODS' => isset($get['IS_DELIVERY_CODECHAIN_GOODS']) ? $get['IS_DELIVERY_CODECHAIN_GOODS'] : '',
'IS_O2O' => isset($get['IS_O2O'])?$get['IS_O2O']:'', 'IS_O2O' => isset($get['IS_O2O']) ? $get['IS_O2O'] : '',
'CODE' => isset($get['CODE'])?$get['CODE']:'' 'CODE' => isset($get['CODE']) ? $get['CODE'] : ''
] ]
) )
->asArray() ->asArray()
->all(); ->all();
$_transportArr=[]; $_transportArr = [];
foreach ($transportArr as $tKey => $tValue) { foreach ($transportArr as $tKey => $tValue) {
$_transportArr[$tValue['GUID']]=$tValue['NAME']; $_transportArr[$tValue['GUID']] = $tValue['NAME'];
} }
$_branchArr=[]; $_branchArr = [];
foreach ($branchArr as $bKey => $bValue) { foreach ($branchArr as $bKey => $bValue) {
if (!empty($bValue['TRANSPORT_TYPE'])) { if (!empty($bValue['TRANSPORT_TYPE'])) {
$transportType = explode(',', $bValue['TRANSPORT_TYPE']); $transportType = explode(',', $bValue['TRANSPORT_TYPE']);
$bValue['TRANSPORT_TYPE']=''; $bValue['TRANSPORT_TYPE'] = '';
foreach($transportType as $tempKey => $tempValue){ foreach ($transportType as $tempKey => $tempValue) {
$bValue['TRANSPORT_TYPE'] .=$_transportArr[$tempValue].","; $bValue['TRANSPORT_TYPE'] .= $_transportArr[$tempValue] . ",";
} }
$bValue['TRANSPORT_TYPE']=substr($bValue['TRANSPORT_TYPE'],0,strlen($bValue['TRANSPORT_TYPE'])-1); $bValue['TRANSPORT_TYPE'] = substr($bValue['TRANSPORT_TYPE'], 0, strlen($bValue['TRANSPORT_TYPE']) - 1);
$_branchArr[] = $bValue; $_branchArr[] = $bValue;
} }
} }
// var_dump($_branchArr);exit; // var_dump($_branchArr);exit;
Helper::newSpreadsheet() Helper::newSpreadsheet()
->addRow(['门店编号', '门店名称', '上级部门编号','描述','联系人姓名','手机号','省','市','区','详细地址' ->addRow([
,'lat坐标','lng坐标','是否支持配送','配送时间','配送距离','营业时间','是否医保','是否预约门店','是否自提门店' '门店编号', '门店名称', '上级部门编号', '描述', '联系人姓名', '手机号', '省', '市', '区', '详细地址', 'lat坐标', 'lng坐标', '是否支持配送', '配送时间', '配送距离', '营业时间', '是否医保', '是否预约门店', '是否自提门店', '自提范围', '转账手续费', '收款人openid', '是否O2O', '是否中药熬送', '是否积分兑换', '是否虚拟门店', '是否支持冷链配送', '是否营业', '配送方式'
,'自提范围','转账手续费','收款人openid','是否O2O','是否中药熬送','是否积分兑换','是否虚拟门店' ])
,'是否支持冷链配送','是否营业','配送方式'])
->addRows( ->addRows(
$_branchArr $_branchArr
) )
->output('门店导入','Csv'); ->output('门店导入', 'Csv');
} else { } else {
return $model->errors; return $model->errors;
} }
...@@ -929,7 +927,7 @@ class BranchController extends BaseController ...@@ -929,7 +927,7 @@ class BranchController extends BaseController
[ [
'query' => $query, 'query' => $query,
'pagination' => [ 'pagination' => [
'pageSize'=>$params['pageSize']??20, 'pageSize' => $params['pageSize'] ?? 20,
] ]
] ]
); );
...@@ -971,7 +969,7 @@ class BranchController extends BaseController ...@@ -971,7 +969,7 @@ class BranchController extends BaseController
$result = $query->all(); $result = $query->all();
$export_result = []; $export_result = [];
foreach($result as $key=>&$value){ foreach ($result as $key => &$value) {
$export = array( $export = array(
$value['NAME'], $value['NAME'],
$value['CODE'], $value['CODE'],
...@@ -980,13 +978,13 @@ class BranchController extends BaseController ...@@ -980,13 +978,13 @@ class BranchController extends BaseController
$value['LAT'], $value['LAT'],
$value['LNG'], $value['LNG'],
); );
array_push($export_result,$export); array_push($export_result, $export);
} }
unset($result); unset($result);
Helper::newSpreadsheet() Helper::newSpreadsheet()
->addRow(['门店名称','门店编号','门店电话','联系人姓名','门店地址','LAT','LNG']) ->addRow(['门店名称', '门店编号', '门店电话', '联系人姓名', '门店地址', 'LAT', 'LNG'])
->addRows($export_result) ->addRows($export_result)
->output("DC仓列表","Csv"); ->output("DC仓列表", "Csv");
} }
/** /**
...@@ -1055,27 +1053,27 @@ class BranchController extends BaseController ...@@ -1055,27 +1053,27 @@ class BranchController extends BaseController
$param = Yii::$app->request->getBodyParams(); $param = Yii::$app->request->getBodyParams();
$guid = Yii::$app->request->getBodyParam('GUID'); $guid = Yii::$app->request->getBodyParam('GUID');
$model = $this->modelClass::findOne($guid); $model = $this->modelClass::findOne($guid);
if(!$model){ if (!$model) {
throw new BadRequestHttpException('没有找到要修改的记录'); throw new BadRequestHttpException('没有找到要修改的记录');
} }
//营业时间 //营业时间
if(!empty($param['WORK_TIME_START']) && !empty($param['WORK_TIME_END'])){ if (!empty($param['WORK_TIME_START']) && !empty($param['WORK_TIME_END'])) {
$WORK_TIME = $param['WORK_TIME_START'].'-'.$param['WORK_TIME_END']; $WORK_TIME = $param['WORK_TIME_START'] . '-' . $param['WORK_TIME_END'];
}else{ } else {
$WORK_TIME = ''; $WORK_TIME = '';
} }
//配送时间 //配送时间
if(!empty($param['DELIVERY_TIME_START']) && !empty($param['DELIVERY_TIME_END'])){ if (!empty($param['DELIVERY_TIME_START']) && !empty($param['DELIVERY_TIME_END'])) {
$DELIVERY_TIME = $param['DELIVERY_TIME_START'].'-'.$param['DELIVERY_TIME_END']; $DELIVERY_TIME = $param['DELIVERY_TIME_START'] . '-' . $param['DELIVERY_TIME_END'];
}else{ } else {
$DELIVERY_TIME = ''; $DELIVERY_TIME = '';
} }
//门店信息修改 //门店信息修改
$model->scenario = 'dcUpdate';//创建的场景 $model->scenario = 'dcUpdate'; //创建的场景
$other_param = array( $other_param = array(
'UPDATE_TIME'=>date('Y-m-d H:i:s',time()), 'UPDATE_TIME' => date('Y-m-d H:i:s', time()),
'WORK_TIME'=>$WORK_TIME, 'WORK_TIME' => $WORK_TIME,
'DELIVERY_TIME'=>$DELIVERY_TIME, 'DELIVERY_TIME' => $DELIVERY_TIME,
); );
$model->setAttributes($other_param); $model->setAttributes($other_param);
$model->setAttributes(Yii::$app->getRequest()->post()); $model->setAttributes(Yii::$app->getRequest()->post());
......
backend/controllers/v1/branch/BranchServiceTypeController.php
View file @ 07f4652f
...@@ -17,7 +17,7 @@ use app\models\v1\rbacuser\ShopRbacUser; ...@@ -17,7 +17,7 @@ use app\models\v1\rbacuser\ShopRbacUser;
class BranchServiceTypeController extends BaseController class BranchServiceTypeController extends BaseController
{ {
public $modelClass='app\models\v1\branch\BranchServiceType'; public $modelClass = 'app\models\v1\branch\BranchServiceType';
/** /**
* @OA\Get( * @OA\Get(
...@@ -47,11 +47,11 @@ class BranchServiceTypeController extends BaseController ...@@ -47,11 +47,11 @@ class BranchServiceTypeController extends BaseController
$rbac = new ShopRbacUser(); $rbac = new ShopRbacUser();
$userGuid = Yii::$app->user->identity->GUID; $userGuid = Yii::$app->user->identity->GUID;
$userinfo = $rbac->getRbacUserInfo($userGuid); $userinfo = $rbac->getRbacUserInfo($userGuid);
if($userinfo['ROLE_ID'] != USER_ROLE_HEADQUARTERS_ADMIN){ if ($userinfo['ROLE_ID'] != USER_ROLE_HEADQUARTERS_ADMIN) {
throw new BadRequestHttpException('您没有查看门店服务类目列表的权限，请联系管理员'); throw new BadRequestHttpException('您没有查看门店服务类目列表的权限，请联系管理员');
} }
$model=new $this->modelClass(); $model = new $this->modelClass();
//用户输入数据赋值到模型属性 //用户输入数据赋值到模型属性
$model->CODE = Yii::$app->request->get('code'); $model->CODE = Yii::$app->request->get('code');
$model->NAME = Yii::$app->request->get('name'); $model->NAME = Yii::$app->request->get('name');
...@@ -60,7 +60,7 @@ class BranchServiceTypeController extends BaseController ...@@ -60,7 +60,7 @@ class BranchServiceTypeController extends BaseController
//所有输入数据都有效 all inputs are valid //所有输入数据都有效 all inputs are valid
$code = $model->CODE; $code = $model->CODE;
$name = $model->NAME; $name = $model->NAME;
$info = $model->BranchServiceInfo($code,$name); $info = $model->BranchServiceInfo($code, $name);
if (!$info->getModels()) { if (!$info->getModels()) {
throw new BadRequestHttpException('未找到符合的门店服务类目信息'); throw new BadRequestHttpException('未找到符合的门店服务类目信息');
} }
...@@ -92,14 +92,14 @@ class BranchServiceTypeController extends BaseController ...@@ -92,14 +92,14 @@ class BranchServiceTypeController extends BaseController
*/ */
public function actionBranchServiceInfo() public function actionBranchServiceInfo()
{ {
$model=new $this->modelClass(); $model = new $this->modelClass();
//用户输入数据赋值到模型属性 //用户输入数据赋值到模型属性
$model->CODE = Yii::$app->request->get('code'); $model->CODE = Yii::$app->request->get('code');
if ($model->validate()) { if ($model->validate()) {
//所有输入数据都有效 all inputs are valid //所有输入数据都有效 all inputs are valid
$code = $model->CODE; $code = $model->CODE;
$info = $model->BranchServiceInfo($code,''); $info = $model->BranchServiceInfo($code, '');
if (!$info->getModels()) { if (!$info->getModels()) {
throw new BadRequestHttpException('未找到符合的门店服务类目信息'); throw new BadRequestHttpException('未找到符合的门店服务类目信息');
} }
...@@ -136,14 +136,14 @@ class BranchServiceTypeController extends BaseController ...@@ -136,14 +136,14 @@ class BranchServiceTypeController extends BaseController
public function actionAddBranchService() public function actionAddBranchService()
{ {
$model = new $this->modelClass(); $model = new $this->modelClass();
$model->scenario = 'create';//创建的场景 $model->scenario = 'create'; //创建的场景
// $datetime = new \DateTime; // $datetime = new \DateTime;
// $create_time = $datetime->format('Y-m-d H:i:s'); // $create_time = $datetime->format('Y-m-d H:i:s');
$create_time = date('Y-m-d H:i:s',time()); $create_time = date('Y-m-d H:i:s', time());
$other_param = array( $other_param = array(
'GUID'=>Func::create_guid(), 'GUID' => Func::create_guid(),
'ORG_GUID'=>Yii::$app->user->identity->ORG_GUID, 'ORG_GUID' => Yii::$app->user->identity->ORG_GUID,
'CREATE_TIME'=>$create_time, 'CREATE_TIME' => $create_time,
); );
$model->setAttributes($other_param); $model->setAttributes($other_param);
...@@ -184,10 +184,10 @@ class BranchServiceTypeController extends BaseController ...@@ -184,10 +184,10 @@ class BranchServiceTypeController extends BaseController
{ {
$guid = Yii::$app->getRequest()->post('GUID'); $guid = Yii::$app->getRequest()->post('GUID');
$model = $this->modelClass::findOne($guid); $model = $this->modelClass::findOne($guid);
if(!$model){ if (!$model) {
throw new BadRequestHttpException('没有找到要修改的记录'); throw new BadRequestHttpException('没有找到要修改的记录');
} }
$model->scenario = 'update';//创建的场景 $model->scenario = 'update'; //创建的场景
$model->setAttributes(Yii::$app->getRequest()->post()); $model->setAttributes(Yii::$app->getRequest()->post());
if ($model->save() === false && !$model->hasErrors()) { if ($model->save() === false && !$model->hasErrors()) {
...@@ -221,9 +221,9 @@ class BranchServiceTypeController extends BaseController ...@@ -221,9 +221,9 @@ class BranchServiceTypeController extends BaseController
$guid = Yii::$app->getRequest()->post('GUID'); $guid = Yii::$app->getRequest()->post('GUID');
$model = new $this->modelClass(); $model = new $this->modelClass();
$branchservice = $model::findOne($guid); $branchservice = $model::findOne($guid);
if(!$branchservice){ if (!$branchservice) {
throw new BadRequestHttpException('没有找到要删除的记录'); throw new BadRequestHttpException('没有找到要删除的记录');
}else if ($branchservice->delete() === false) { } else if ($branchservice->delete() === false) {
throw new ServerErrorHttpException('Failed to delete the object for unknown reason.'); throw new ServerErrorHttpException('Failed to delete the object for unknown reason.');
} }
...@@ -263,44 +263,44 @@ class BranchServiceTypeController extends BaseController ...@@ -263,44 +263,44 @@ class BranchServiceTypeController extends BaseController
$rbac = new ShopRbacUser(); $rbac = new ShopRbacUser();
$userGuid = Yii::$app->user->identity->GUID; $userGuid = Yii::$app->user->identity->GUID;
$userinfo = $rbac->getRbacUserInfo($userGuid); $userinfo = $rbac->getRbacUserInfo($userGuid);
if($userinfo['ROLE_ID'] != USER_ROLE_HEADQUARTERS_ADMIN){ if ($userinfo['ROLE_ID'] != USER_ROLE_HEADQUARTERS_ADMIN) {
throw new BadRequestHttpException('您没有导入门店服务类目的权限，请联系管理员'); throw new BadRequestHttpException('您没有导入门店服务类目的权限，请联系管理员');
} }
$model = new UploadFiles(); $model = new UploadFiles();
if (Yii::$app->request->isPost) { if (Yii::$app->request->isPost) {
//多文件用getInstances //多文件用getInstances
$model->uploadFiles = UploadedFile::getInstance($model,'uploadFile'); $model->uploadFiles = UploadedFile::getInstance($model, 'uploadFile');
$fileInfo = $model->upload(); $fileInfo = $model->upload();
if ($fileInfo['CODE']==200) { if ($fileInfo['CODE'] == 200) {
// 文件上传成功 // 文件上传成功
$rows = Helper::newSpreadsheet($fileInfo['INFO'][0])->getRows(); $rows = Helper::newSpreadsheet($fileInfo['INFO'][0])->getRows();
$tempArr=array_slice($rows,2); $tempArr = array_slice($rows, 2);
$branchServiceModel = new $this->modelClass(); $branchServiceModel = new $this->modelClass();
$branchServiceModel->scenario = 'import'; $branchServiceModel->scenario = 'import';
$transaction=$branchServiceModel->getDb()->beginTransaction(); $transaction = $branchServiceModel->getDb()->beginTransaction();
try { try {
foreach ($tempArr as $key => $value) { foreach ($tempArr as $key => $value) {
$_servicModel = $branchServiceModel::findOne(['CODE' => $value[0]]); $_servicModel = $branchServiceModel::findOne(['CODE' => $value[0]]);
if ($_servicModel===null) { if ($_servicModel === null) {
$_servicModel = clone $branchServiceModel; $_servicModel = clone $branchServiceModel;
$_servicModel->GUID=Func::create_guid(); $_servicModel->GUID = Func::create_guid();
$_servicModel->ORG_GUID=Yii::$app->user->identity->ORG_GUID; $_servicModel->ORG_GUID = Yii::$app->user->identity->ORG_GUID;
$_servicModel->CREATE_TIME=date('Y-m-d H:i:s',time()); $_servicModel->CREATE_TIME = date('Y-m-d H:i:s', time());
} }
$_servicModel->CODE=$value[0]; $_servicModel->CODE = $value[0];
$_servicModel->NAME=$value[1]; $_servicModel->NAME = $value[1];
$_servicModel->THEME_COLOR=$value[2]; $_servicModel->THEME_COLOR = $value[2];
$_servicModel->DESCRIPTION=$value[3]; $_servicModel->DESCRIPTION = $value[3];
if (!$_servicModel->save()) { if (!$_servicModel->save()) {
$transaction->rollBack(); $transaction->rollBack();
$returnInfo = [ $returnInfo = [
($key+1) => $_servicModel->errors ($key + 1) => $_servicModel->errors
]; ];
return $returnInfo; return $returnInfo;
} }
...@@ -308,12 +308,12 @@ class BranchServiceTypeController extends BaseController ...@@ -308,12 +308,12 @@ class BranchServiceTypeController extends BaseController
$transaction->commit(); $transaction->commit();
@unlink($fileInfo['INFO'][0]); @unlink($fileInfo['INFO'][0]);
throw new HttpException("200", '导入成功'); throw new HttpException("200", '导入成功');
}catch(\Throwable $e) { } catch (\Throwable $e) {
$transaction->rollBack(); $transaction->rollBack();
@unlink($fileInfo['INFO'][0]); @unlink($fileInfo['INFO'][0]);
throw $e; throw $e;
} }
}else{ } else {
return $fileInfo['INFO']; return $fileInfo['INFO'];
} }
} }
...@@ -336,19 +336,19 @@ class BranchServiceTypeController extends BaseController ...@@ -336,19 +336,19 @@ class BranchServiceTypeController extends BaseController
$params = Yii::$app->request->queryParams; $params = Yii::$app->request->queryParams;
$model->attributes = $params; $model->attributes = $params;
if(!$model->validate()){ if (!$model->validate()) {
throw new HttpException(422,json_encode($model->errors)); throw new HttpException(422, json_encode($model->errors));
} }
$list = $model->BranchServiceExport($params); $list = $model->BranchServiceExport($params);
if(!$list){ if (!$list) {
throw new BadRequestHttpException('未找到符合条件的数据'); throw new BadRequestHttpException('未找到符合条件的数据');
} }
$name = '门店服务类目'.date('Y-m-d',time()); $name = '门店服务类目' . date('Y-m-d', time());
return Helper::newSpreadsheet() return Helper::newSpreadsheet()
->addRow(['服务类目名称','服务类目编号','服务类目描述','主体颜色','创建时间']) ->addRow(['服务类目名称', '服务类目编号', '服务类目描述', '主体颜色', '创建时间'])
->addRows($list) ->addRows($list)
->output($name,'Csv'); ->output($name, 'Csv');
} }
} }
backend/controllers/v1/shopuser/UserComplainController.php
View file @ 07f4652f
...@@ -9,27 +9,24 @@ use yii\web\BadRequestHttpException; ...@@ -9,27 +9,24 @@ use yii\web\BadRequestHttpException;
class UserComplainController extends BaseController class UserComplainController extends BaseController
{ {
public $modelClass='app\models\v1\shopuser\UserComplain'; public $modelClass = 'app\models\v1\shopuser\UserComplain';
// public $serializer = [
// 'class' => 'yii\rest\Serializer', /**
// 'collectionEnvelope' => 'usercomplain', * @OA\Get(
// ]; * path="/backend/web/v1/shopuser/user-complains/user-complain",
/** * tags={"用户&员工接口"},
* @OA\Get( * description="留言信息列表",
* path="/backend/web/v1/shopuser/user-complains/user-complain", * summary="留言信息列表(孙磊)",
* tags={"用户&员工接口"}, * operationId="UserComplain",
* description="留言信息列表", * @OA\Parameter(name="page",in="query",description="分页页码",@OA\Schema(type="int")),
* summary="留言信息列表(孙磊)", * @OA\Parameter(name="phone",in="query",description="用户电话",@OA\Schema(type="string")),
* operationId="UserComplain", * @OA\Response(response="200",description="OK。一切正常"),
* @OA\Parameter(name="page",in="query",description="分页页码",@OA\Schema(type="int")), * security={{"Authorization": {}}}
* @OA\Parameter(name="phone",in="query",description="用户电话",@OA\Schema(type="string")), * )
* @OA\Response(response="200",description="OK。一切正常"), */
* security={{"Authorization": {}}}
* )
*/
public function actionUserComplain() public function actionUserComplain()
{ {
$model=new UserComplain(); $model = new UserComplain();
//用户输入数据赋值到模型属性 //用户输入数据赋值到模型属性
$model->TS_PHONE = Yii::$app->request->get('phone'); $model->TS_PHONE = Yii::$app->request->get('phone');
...@@ -47,5 +44,4 @@ class UserComplainController extends BaseController ...@@ -47,5 +44,4 @@ class UserComplainController extends BaseController
return $errors; return $errors;
} }
} }
} }
backend/controllers/v1/shopuser/UserDepartmentController.php
View file @ 07f4652f
...@@ -9,12 +9,9 @@ use yii\web\BadRequestHttpException; ...@@ -9,12 +9,9 @@ use yii\web\BadRequestHttpException;
class UserDepartmentController extends BaseController class UserDepartmentController extends BaseController
{ {
public $modelClass='app\models\v1\shopuser\UserDepartment'; public $modelClass = 'app\models\v1\shopuser\UserDepartment';
// public $serializer = [
// 'class' => 'yii\rest\Serializer', /**
// 'collectionEnvelope' => 'userdepartment',
// ];
/**
* @OA\Get( * @OA\Get(
* path="/backend/web/v1/shopuser/user-departments/department", * path="/backend/web/v1/shopuser/user-departments/department",
* tags={"用户&员工接口"}, * tags={"用户&员工接口"},
...@@ -30,7 +27,7 @@ class UserDepartmentController extends BaseController ...@@ -30,7 +27,7 @@ class UserDepartmentController extends BaseController
*/ */
public function actionDepartment() public function actionDepartment()
{ {
$model=new UserDepartment(); $model = new UserDepartment();
//用户输入数据赋值到模型属性 //用户输入数据赋值到模型属性
$model->CODE = Yii::$app->request->get('code'); $model->CODE = Yii::$app->request->get('code');
$model->NAME = Yii::$app->request->get('name'); $model->NAME = Yii::$app->request->get('name');
...@@ -39,7 +36,7 @@ class UserDepartmentController extends BaseController ...@@ -39,7 +36,7 @@ class UserDepartmentController extends BaseController
//所有输入数据都有效 all inputs are valid //所有输入数据都有效 all inputs are valid
$code = $model->CODE; $code = $model->CODE;
$name = $model->NAME; $name = $model->NAME;
$info = $model->DepartmentInfo($code,$name); $info = $model->DepartmentInfo($code, $name);
if (!$info->getModels()) { if (!$info->getModels()) {
throw new BadRequestHttpException('未找到符合的部门信息'); throw new BadRequestHttpException('未找到符合的部门信息');
} }
......
backend/controllers/v1/transport/TransportInitialPriceController.php
View file @ 07f4652f
...@@ -52,9 +52,9 @@ class TransportInitialPriceController extends BaseController ...@@ -52,9 +52,9 @@ class TransportInitialPriceController extends BaseController
$rbac = new ShopRbacUser(); $rbac = new ShopRbacUser();
$userGuid = Yii::$app->user->identity->GUID; $userGuid = Yii::$app->user->identity->GUID;
$userinfo = $rbac->getRbacUserInfo($userGuid); $userinfo = $rbac->getRbacUserInfo($userGuid);
if($userinfo){ if ($userinfo) {
$params['BRANCH_GUID'] = $userinfo['BRANCH_GUID']; $params['BRANCH_GUID'] = $userinfo['BRANCH_GUID'];
}else{ } else {
$params['BRANCH_GUID'] = ''; $params['BRANCH_GUID'] = '';
} }
$params['BRANCH_GUID'] = 003; $params['BRANCH_GUID'] = 003;
...@@ -99,11 +99,11 @@ class TransportInitialPriceController extends BaseController ...@@ -99,11 +99,11 @@ class TransportInitialPriceController extends BaseController
$guid = $param['GUID']; $guid = $param['GUID'];
$model = $this->modelClass::findOne($guid); $model = $this->modelClass::findOne($guid);
if(!$model){ if (!$model) {
throw new BadRequestHttpException('没有找到要修改的记录'); throw new BadRequestHttpException('没有找到要修改的记录');
} }
//门店起送价修改 //门店起送价修改
$model->scenario = 'update';//创建的场景 $model->scenario = 'update'; //创建的场景
$model->setAttributes($param); $model->setAttributes($param);
if ($model->save() === false && !$model->hasErrors()) { if ($model->save() === false && !$model->hasErrors()) {
...@@ -144,22 +144,22 @@ class TransportInitialPriceController extends BaseController ...@@ -144,22 +144,22 @@ class TransportInitialPriceController extends BaseController
$model = new UploadFiles(); $model = new UploadFiles();
if (Yii::$app->request->isPost) { if (Yii::$app->request->isPost) {
//多文件用getInstances //多文件用getInstances
$model->uploadFiles = UploadedFile::getInstance($model,'uploadFile'); $model->uploadFiles = UploadedFile::getInstance($model, 'uploadFile');
$fileInfo = $model->upload(); $fileInfo = $model->upload();
if ($fileInfo['CODE']==200) { if ($fileInfo['CODE'] == 200) {
// 文件上传成功 // 文件上传成功
$rows = Helper::newSpreadsheet($fileInfo['INFO'][0])->getRows(); $rows = Helper::newSpreadsheet($fileInfo['INFO'][0])->getRows();
$tempArr=array_slice($rows,2); $tempArr = array_slice($rows, 2);
$citydisregion = new $this->modelClass(); $citydisregion = new $this->modelClass();
$citydisregion->scenario = 'import'; $citydisregion->scenario = 'import';
$transaction=$citydisregion->getDb()->beginTransaction(); $transaction = $citydisregion->getDb()->beginTransaction();
try { try {
foreach ($tempArr as $key => $value) { foreach ($tempArr as $key => $value) {
$CS_BRANCH_GUID = Yii::$app->user->identity->ORG_GUID.'-'.$value[0]; $CS_BRANCH_GUID = Yii::$app->user->identity->ORG_GUID . '-' . $value[0];
$_citydisregion = $citydisregion->getBranchInitialPrice('',$CS_BRANCH_GUID); $_citydisregion = $citydisregion->getBranchInitialPrice('', $CS_BRANCH_GUID);
// $_citydisregion = $citydisregion->getBranchInitialPrice('',003); // $_citydisregion = $citydisregion->getBranchInitialPrice('',003);
//权限信息 //权限信息
$rbac = new ShopRbacUser(); $rbac = new ShopRbacUser();
...@@ -167,36 +167,36 @@ class TransportInitialPriceController extends BaseController ...@@ -167,36 +167,36 @@ class TransportInitialPriceController extends BaseController
$userinfo = $rbac->getRbacUserInfo($userGuid); $userinfo = $rbac->getRbacUserInfo($userGuid);
//return $userinfo; //return $userinfo;
//判断当前账号是省级还是门店还是总部 //判断当前账号是省级还是门店还是总部
if($userinfo['ROLE_ID'] == USER_ROLE_HEADQUARTERS_ADMIN || $userinfo['ROLE_ID'] == USER_ROLE_REGION_ADMIN){ if ($userinfo['ROLE_ID'] == USER_ROLE_HEADQUARTERS_ADMIN || $userinfo['ROLE_ID'] == USER_ROLE_REGION_ADMIN) {
//如果是省级,查询出该门店是否是该省级下的 //如果是省级,查询出该门店是否是该省级下的
$branchModel = new ShopBranch(); $branchModel = new ShopBranch();
// $userinfo['BRANCH_GUID'] = 003; // $userinfo['BRANCH_GUID'] = 003;
$isbrancharr = $branchModel->GetBranch($CS_BRANCH_GUID,$userinfo['BRANCH_GUID']); $isbrancharr = $branchModel->GetBranch($CS_BRANCH_GUID, $userinfo['BRANCH_GUID']);
if(!$isbrancharr){ if (!$isbrancharr) {
continue; continue;
} }
}else if($userinfo['ROLE_ID'] == USER_ROLE_STORE_ADMIN){//如果是门店 } else if ($userinfo['ROLE_ID'] == USER_ROLE_STORE_ADMIN) { //如果是门店
if($userinfo['BRANCH_GUID'] != $CS_BRANCH_GUID){ if ($userinfo['BRANCH_GUID'] != $CS_BRANCH_GUID) {
continue; continue;
} }
} }
//修改已有的起送价设置 //修改已有的起送价设置
if(!$list = $_citydisregion->getModels()){ if (!$list = $_citydisregion->getModels()) {
continue; continue;
}else{ } else {
//更新起送价 //更新起送价
$GUID = $list[0]['GUID']; $GUID = $list[0]['GUID'];
$_cdrModel = $citydisregion::findOne(['GUID' => $GUID]); $_cdrModel = $citydisregion::findOne(['GUID' => $GUID]);
if(empty($value[1])){ if (empty($value[1])) {
$value[1]=0; $value[1] = 0;
} }
$_cdrModel->INITIAL_PRICE=$value[1]; $_cdrModel->INITIAL_PRICE = $value[1];
if (!$_cdrModel->save()) { if (!$_cdrModel->save()) {
$transaction->rollBack(); $transaction->rollBack();
$returnInfo = [ $returnInfo = [
($key+1) => $_cdrModel->errors ($key + 1) => $_cdrModel->errors
]; ];
return $returnInfo; return $returnInfo;
} }
...@@ -205,12 +205,12 @@ class TransportInitialPriceController extends BaseController ...@@ -205,12 +205,12 @@ class TransportInitialPriceController extends BaseController
$transaction->commit(); $transaction->commit();
@unlink($fileInfo['INFO'][0]); @unlink($fileInfo['INFO'][0]);
throw new HttpException("200", '导入成功'); throw new HttpException("200", '导入成功');
}catch(\Throwable $e) { } catch (\Throwable $e) {
$transaction->rollBack(); $transaction->rollBack();
@unlink($fileInfo['INFO'][0]); @unlink($fileInfo['INFO'][0]);
throw $e; throw $e;
} }
}else{ } else {
return $fileInfo['INFO']; return $fileInfo['INFO'];
} }
} }
......
backend/models/v1/branch/BranchServiceType.php
View file @ 07f4652f
...@@ -5,6 +5,7 @@ namespace app\models\v1\branch; ...@@ -5,6 +5,7 @@ namespace app\models\v1\branch;
use Yii; use Yii;
use app\models\v1\BaseModel; use app\models\v1\BaseModel;
use yii\data\ActiveDataProvider; use yii\data\ActiveDataProvider;
/** /**
* This is the model class for table "shop_branch_service_type". * This is the model class for table "shop_branch_service_type".
* *
...@@ -32,15 +33,15 @@ class BranchServiceType extends BaseModel ...@@ -32,15 +33,15 @@ class BranchServiceType extends BaseModel
public function rules() public function rules()
{ {
return [ return [
[['GUID'], 'required','on'=>['create','update']], [['GUID'], 'required', 'on' => ['create', 'update']],
[['CREATE_TIME'], 'safe'], [['CREATE_TIME'], 'safe'],
[['GUID', 'ORG_GUID', 'CODE', 'NAME'], 'string', 'max' => 50], [['GUID', 'ORG_GUID', 'CODE', 'NAME'], 'string', 'max' => 50],
[['THEME_COLOR', 'DESCRIPTION'], 'string', 'max' => 255], [['THEME_COLOR', 'DESCRIPTION'], 'string', 'max' => 255],
[['GUID'], 'unique'], [['GUID'], 'unique'],
[['CODE','NAME'], 'required','on'=>['import'] ,'message' => '{attribute}不能为空'], [['CODE', 'NAME'], 'required', 'on' => ['import'], 'message' => '{attribute}不能为空'],
[['DESCRIPTION'],'string', 'max' => 100,'on'=>['import'],'tooLong'=>'最大长度不能超过100'], [['DESCRIPTION'], 'string', 'max' => 100, 'on' => ['import'], 'tooLong' => '最大长度不能超过100'],
[['NAME'],'string', 'max' => 50,'on'=>['import'],'tooLong'=>'{attribute}最大长度不能超过50'], [['NAME'], 'string', 'max' => 50, 'on' => ['import'], 'tooLong' => '{attribute}最大长度不能超过50'],
]; ];
} }
...@@ -60,7 +61,7 @@ class BranchServiceType extends BaseModel ...@@ -60,7 +61,7 @@ class BranchServiceType extends BaseModel
]; ];
} }
//门店-门店服务类目信息 //门店-门店服务类目信息
public function BranchServiceInfo($code,$name,$guid='') public function BranchServiceInfo($code, $name, $guid = '')
{ {
$query = static::find()->select('GUID,NAME,CODE,THEME_COLOR,DESCRIPTION,CREATE_TIME'); $query = static::find()->select('GUID,NAME,CODE,THEME_COLOR,DESCRIPTION,CREATE_TIME');
...@@ -107,11 +108,11 @@ class BranchServiceType extends BaseModel ...@@ -107,11 +108,11 @@ class BranchServiceType extends BaseModel
} }
$list = []; $list = [];
foreach($query->all() as $request){ foreach ($query->all() as $request) {
$list[] = $request->toArray(); $list[] = $request->toArray();
} }
foreach($list as $key => $value){ foreach ($list as $key => $value) {
$row_list[] = [ $row_list[] = [
$value['NAME'], //服务类目名称 $value['NAME'], //服务类目名称
$value['CODE'], //服务类目编号 $value['CODE'], //服务类目编号
......
backend/models/v1/branch/ShopBranch.php
View file @ 07f4652f
...@@ -96,16 +96,16 @@ class ShopBranch extends BaseModel ...@@ -96,16 +96,16 @@ class ShopBranch extends BaseModel
} }
const SCENARIO_DCUPDATE = 'dcUpdate'; const SCENARIO_DCUPDATE = 'dcUpdate';
public $IS_BRANCH_SELF_MENTION;//是否门店自提 public $IS_BRANCH_SELF_MENTION; //是否门店自提
public $IS_BRANCH_EXPRESS_DELIVERY;//是否门店快递配送 public $IS_BRANCH_EXPRESS_DELIVERY; //是否门店快递配送
public $IS_DELIVERS_GOODS;//是否送货上门 public $IS_DELIVERS_GOODS; //是否送货上门
public $IS_EXPRESS_DELIVERY;//是否快递配送 public $IS_EXPRESS_DELIVERY; //是否快递配送
public $IS_BRANCH_SELF_DELIVERY;//是否门店自配送 public $IS_BRANCH_SELF_DELIVERY; //是否门店自配送
public $IS_HAFL_HOUR_DELIVERY;//是否半小时达 public $IS_HAFL_HOUR_DELIVERY; //是否半小时达
public $IS_ONE_HOUR_DELIVERY;//是否1小时达 public $IS_ONE_HOUR_DELIVERY; //是否1小时达
public $IS_TWO_HOUR_DELIVERY;//是否2小时达 public $IS_TWO_HOUR_DELIVERY; //是否2小时达
public $IS_DAY_DELIVERY;//是否当日定时达 public $IS_DAY_DELIVERY; //是否当日定时达
public $SERVICE_TYPE_CODE;//服务门店CODE public $SERVICE_TYPE_CODE; //服务门店CODE
public $search; //门店编码或名称搜索 public $search; //门店编码或名称搜索
/** /**
...@@ -115,9 +115,11 @@ class ShopBranch extends BaseModel ...@@ -115,9 +115,11 @@ class ShopBranch extends BaseModel
public function scenarios() public function scenarios()
{ {
$scenarios = parent::scenarios(); $scenarios = parent::scenarios();
$scenarios[self::SCENARIO_DCUPDATE] = ['NAME','BRANCH_NAME', 'RECIVER_PROVINCE', 'RECIVER_CITY','RECIVER_REGION','ADDRESS','PHONE', $scenarios[self::SCENARIO_DCUPDATE] = [
'CONTACT_NAME','BRANCH_TYPE','LAT','LNG','IS_SHELVE','WORK_TIME','DELIVERY_TIME','RETURN_ADDRESS','DESCRIPTION', 'NAME', 'BRANCH_NAME', 'RECIVER_PROVINCE', 'RECIVER_CITY', 'RECIVER_REGION', 'ADDRESS', 'PHONE',
'UPDATE_TIME']; 'CONTACT_NAME', 'BRANCH_TYPE', 'LAT', 'LNG', 'IS_SHELVE', 'WORK_TIME', 'DELIVERY_TIME', 'RETURN_ADDRESS', 'DESCRIPTION',
'UPDATE_TIME'
];
return $scenarios; return $scenarios;
} }
/** /**
...@@ -158,9 +160,9 @@ class ShopBranch extends BaseModel ...@@ -158,9 +160,9 @@ class ShopBranch extends BaseModel
'IS_DAY_DELIVERY' 'IS_DAY_DELIVERY'
], 'in', 'range' => [0, 1], 'on' => ['import'], 'message' => '{attribute}只能为0或1'], ], 'in', 'range' => [0, 1], 'on' => ['import'], 'message' => '{attribute}只能为0或1'],
[['SERVICE_TYPE_CODE'], 'validateEffective'],//如果影响性能就注释掉 [['SERVICE_TYPE_CODE'], 'validateEffective'], //如果影响性能就注释掉
[['BRANCH_NAME', 'NAME','BRANCH_TYPE'], 'required','on'=>[self::SCENARIO_DCUPDATE]], [['BRANCH_NAME', 'NAME', 'BRANCH_TYPE'], 'required', 'on' => [self::SCENARIO_DCUPDATE]],
[['BRANCH_TYPE'], 'in', 'range' => [1, 2],'on'=>[self::SCENARIO_DCUPDATE]], [['BRANCH_TYPE'], 'in', 'range' => [1, 2], 'on' => [self::SCENARIO_DCUPDATE]],
[['search'], 'string', 'on' => 'search'], [['search'], 'string', 'on' => 'search'],
]; ];
} }
...@@ -376,24 +378,24 @@ class ShopBranch extends BaseModel ...@@ -376,24 +378,24 @@ class ShopBranch extends BaseModel
{ {
return $query = static::find() return $query = static::find()
->select('GUID,NAME') ->select('GUID,NAME')
->where(['BRANCH_TYPE'=>1]) ->where(['BRANCH_TYPE' => 1])
->all(); ->all();
} }
//获取门店区域信息或分公司下区域信息 //获取门店区域信息或分公司下区域信息
public function getBranchRegion($SUPPROVINCE_GUID,$flag='') public function getBranchRegion($SUPPROVINCE_GUID, $flag = '')
{ {
if(empty($flag) && !empty($SUPPROVINCE_GUID)){ if (empty($flag) && !empty($SUPPROVINCE_GUID)) {
return $query = static::find() return $query = static::find()
->select('GUID,NAME') ->select('GUID,NAME')
->where(['BRANCH_TYPE'=>2]) ->where(['BRANCH_TYPE' => 2])
->andWhere(['PARENT_GUID'=>$SUPPROVINCE_GUID]) ->andWhere(['PARENT_GUID' => $SUPPROVINCE_GUID])
->asArray() ->asArray()
->all(); ->all();
} }
if(!empty($flag) && !empty($SUPPROVINCE_GUID)){ if (!empty($flag) && !empty($SUPPROVINCE_GUID)) {
return $query = static::find() return $query = static::find()
->select('GUID,NAME') ->select('GUID,NAME')
->andWhere(['PARENT_GUID'=>$SUPPROVINCE_GUID]) ->andWhere(['PARENT_GUID' => $SUPPROVINCE_GUID])
->asArray() ->asArray()
->all(); ->all();
} }
......
backend/models/v1/branch/ShopBranchService.php
View file @ 07f4652f
...@@ -31,11 +31,11 @@ class ShopBranchService extends BaseModel ...@@ -31,11 +31,11 @@ class ShopBranchService extends BaseModel
public function rules() public function rules()
{ {
return [ return [
[['GUID'], 'required','on'=>['create','update']], [['GUID'], 'required', 'on' => ['create', 'update']],
[['STATE'], 'integer'], [['STATE'], 'integer'],
[['GUID', 'BRANCH_GUID', 'SERVICE_TYPE_GUID'], 'string', 'max' => 50], [['GUID', 'BRANCH_GUID', 'SERVICE_TYPE_GUID'], 'string', 'max' => 50],
[['ORDER_INDEX'], 'string', 'max' => 5], [['ORDER_INDEX'], 'string', 'max' => 5],
[['GUID'], 'unique','on'=>['create']], [['GUID'], 'unique', 'on' => ['create']],
]; ];
} }
...@@ -55,7 +55,7 @@ class ShopBranchService extends BaseModel ...@@ -55,7 +55,7 @@ class ShopBranchService extends BaseModel
//删除门店原有服务类目 //删除门店原有服务类目
public function BranchServiceDel($b_guid) public function BranchServiceDel($b_guid)
{ {
$branch_service = static::deleteAll(['BRANCH_GUID'=>$b_guid]); $branch_service = static::deleteAll(['BRANCH_GUID' => $b_guid]);
return $branch_service; return $branch_service;
} }
//获取门店服务类目关系 //获取门店服务类目关系
...@@ -63,12 +63,11 @@ class ShopBranchService extends BaseModel ...@@ -63,12 +63,11 @@ class ShopBranchService extends BaseModel
{ {
$branch_service = static::find() $branch_service = static::find()
->select('GUID,BRANCH_GUID,SERVICE_TYPE_GUID') ->select('GUID,BRANCH_GUID,SERVICE_TYPE_GUID')
->where(['STATE'=>1]) ->where(['STATE' => 1])
->andwhere(['BRANCH_GUID'=>$b_guid]) ->andwhere(['BRANCH_GUID' => $b_guid])
->asArray() ->asArray()
->all(); ->all();
return $branch_service; return $branch_service;
} }
} }
backend/models/v1/branch/ShopCityDistributionRegion.php
View file @ 07f4652f
<?php <?php
namespace app\models\v1\branch; namespace app\models\v1\branch;
use Yii; use Yii;
...@@ -40,17 +41,17 @@ class ShopCityDistributionRegion extends BaseModel ...@@ -40,17 +41,17 @@ class ShopCityDistributionRegion extends BaseModel
public function rules() public function rules()
{ {
return [ return [
[['GUID','SORT','COLORS','DIVIDE_TYPE','REGION_R','REGION_RANGE','INITIAL_PRICE','DELIVERY_PRICE'], 'required','on'=>"save"], [['GUID', 'SORT', 'COLORS', 'DIVIDE_TYPE', 'REGION_R', 'REGION_RANGE', 'INITIAL_PRICE', 'DELIVERY_PRICE'], 'required', 'on' => "save"],
[['DIVIDE_TYPE'], 'in', 'range' => [1, 2],'on'=>"save"], [['DIVIDE_TYPE'], 'in', 'range' => [1, 2], 'on' => "save"],
[['SORT'], 'integer'], [['SORT'], 'integer'],
[['REGION_RANGE','COLORS'], 'string'], [['REGION_RANGE', 'COLORS'], 'string'],
[['INITIAL_PRICE', 'DELIVERY_PRICE','REGION_R'], 'double'], [['INITIAL_PRICE', 'DELIVERY_PRICE', 'REGION_R'], 'double'],
[['GUID', 'REGION_RANGE'], 'required','on'=>['create']], [['GUID', 'REGION_RANGE'], 'required', 'on' => ['create']],
[['GUID'],'required','on'=>['update']], [['GUID'], 'required', 'on' => ['update']],
[['GUID', 'ORG_GUID', 'CITY_DISTR_GUID', 'ORDEX', 'COLORS', 'WEEK', 'IS_TYPE'], 'string', 'max' => 50,'on'=>['create']], [['GUID', 'ORG_GUID', 'CITY_DISTR_GUID', 'ORDEX', 'COLORS', 'WEEK', 'IS_TYPE'], 'string', 'max' => 50, 'on' => ['create']],
[['GUID'], 'unique','on'=>['create']], [['GUID'], 'unique', 'on' => ['create']],
[['INITIAL_PRICE'], 'required','on'=>['import'] ,'message' => '{attribute}不能为空'], [['INITIAL_PRICE'], 'required', 'on' => ['import'], 'message' => '{attribute}不能为空'],
]; ];
} }
...@@ -83,29 +84,29 @@ class ShopCityDistributionRegion extends BaseModel ...@@ -83,29 +84,29 @@ class ShopCityDistributionRegion extends BaseModel
return $this->hasOne(ShopCityDistributionSetting::className(), ['GUID' => 'CITY_DISTR_GUID']); return $this->hasOne(ShopCityDistributionSetting::className(), ['GUID' => 'CITY_DISTR_GUID']);
} }
//获取门店起送价 //获取门店起送价
public function getBranchInitialPrice($params,$guid='') public function getBranchInitialPrice($params, $guid = '')
{ {
$query = static::find()->alias('sg') $query = static::find()->alias('sg')
->select("sg.GUID,cs.REGION_TYPE,cs.REGION_DISTR_DISTANCE,cs.REGION_DISTR_PRICE,cs.INCREASE_DISTANCE, ->select("sg.GUID,cs.REGION_TYPE,cs.REGION_DISTR_DISTANCE,cs.REGION_DISTR_PRICE,cs.INCREASE_DISTANCE,
cs.INCREASE_PRICE,sg.DELIVERY_PRICE,cs.STATUS,sb.CODE,sb.NAME,sg.INITIAL_PRICE,cs.SETTING_TYPE" ) cs.INCREASE_PRICE,sg.DELIVERY_PRICE,cs.STATUS,sb.CODE,sb.NAME,sg.INITIAL_PRICE,cs.SETTING_TYPE")
->leftJoin('SHOP_CITY_DISTRIBUTION_SETTING cs', 'cs.GUID=sg.CITY_DISTR_GUID') ->leftJoin('SHOP_CITY_DISTRIBUTION_SETTING cs', 'cs.GUID=sg.CITY_DISTR_GUID')
->leftJoin('SHOP_BRANCH sb','sb.GUID=cs.BRANCH_GUID') ->leftJoin('SHOP_BRANCH sb', 'sb.GUID=cs.BRANCH_GUID')
->where(['cs.SETTING_TYPE' => 2]); ->where(['cs.SETTING_TYPE' => 2]);
//门店名称或编码 //门店名称或编码
if (isset($params['CODE']) && !empty($params['CODE'])) { if (isset($params['CODE']) && !empty($params['CODE'])) {
$query->andfilterWhere(['or', ['like','sb.CODE', $params['CODE']],['like', 'sb.NAME', $params['CODE']]]); $query->andfilterWhere(['or', ['like', 'sb.CODE', $params['CODE']], ['like', 'sb.NAME', $params['CODE']]]);
} }
//当前权限允许的门店 //当前权限允许的门店
if (isset($params['BRANCH_GUID']) && !empty($params['BRANCH_GUID'])) { if (isset($params['BRANCH_GUID']) && !empty($params['BRANCH_GUID'])) {
$query->andFilterWhere(['or',['=','ifnull(sb.SUPPROVINCE_GUID,cs.BRANCH_GUID)',$params['BRANCH_GUID']],['=',"ifnull(sb.PARENT_GUID,'')",$params['BRANCH_GUID']]]); $query->andFilterWhere(['or', ['=', 'ifnull(sb.SUPPROVINCE_GUID,cs.BRANCH_GUID)', $params['BRANCH_GUID']], ['=', "ifnull(sb.PARENT_GUID,'')", $params['BRANCH_GUID']]]);
//$query->andWhere(['not', ['sg.GUID' => '']]); //$query->andWhere(['not', ['sg.GUID' => '']]);
$query->andWhere(['!=','sg.GUID','']); $query->andWhere(['!=', 'sg.GUID', '']);
} }
//批量修改 条件 //批量修改 条件
if(isset($guid) && !empty($guid)){ if (isset($guid) && !empty($guid)) {
$query->andFilterWhere(['=','cs.BRANCH_GUID',$guid]); $query->andFilterWhere(['=', 'cs.BRANCH_GUID', $guid]);
$query->andWhere(['!=','sg.GUID','']); $query->andWhere(['!=', 'sg.GUID', '']);
} }
return new ActiveDataProvider([ return new ActiveDataProvider([
......
backend/models/v1/branch/ShopCityDistributionSetting.php
View file @ 07f4652f
<?php <?php
namespace app\models\v1\branch; namespace app\models\v1\branch;
use Yii; use Yii;
...@@ -58,20 +59,20 @@ class ShopCityDistributionSetting extends BaseModel ...@@ -58,20 +59,20 @@ class ShopCityDistributionSetting extends BaseModel
public function rules() public function rules()
{ {
return [ return [
[['ORG_GUID','GUID','BRANCH_GUID','REGION_TYPE','SETTING_TYPE'], 'required','on'=>['insert','update']], [['ORG_GUID', 'GUID', 'BRANCH_GUID', 'REGION_TYPE', 'SETTING_TYPE'], 'required', 'on' => ['insert', 'update']],
[['STATUS'], 'boolean'], [['STATUS'], 'boolean'],
[['REGION_TYPE','SETTING_TYPE'], 'in', 'range' => [1, 2],'on'=>['insert','update']], [['REGION_TYPE', 'SETTING_TYPE'], 'in', 'range' => [1, 2], 'on' => ['insert', 'update']],
[['BRANCH_GUID'], 'exist', 'skipOnError' => true, 'targetClass' => ShopBranch::className(), 'targetAttribute' => ['BRANCH_GUID' => 'GUID']], [['BRANCH_GUID'], 'exist', 'skipOnError' => true, 'targetClass' => ShopBranch::className(), 'targetAttribute' => ['BRANCH_GUID' => 'GUID']],
[['BRANCH_INFO'],'match', 'pattern' => '/^[\x{4e00}-\x{9fa5}A-Za-z0-9_]+$/u','message'=>'只能包含中文汉字，字母，数字','on' => 'search'], [['BRANCH_INFO'], 'match', 'pattern' => '/^[\x{4e00}-\x{9fa5}A-Za-z0-9_]+$/u', 'message' => '只能包含中文汉字，字母，数字', 'on' => 'search'],
[['GUID','REGION_TYPE'], 'required','on'=>['o2o_update'],'message'=>'{attribute}不能为空'], [['GUID', 'REGION_TYPE'], 'required', 'on' => ['o2o_update'], 'message' => '{attribute}不能为空'],
[['REGION_DISTR_DISTANCE', 'REGION_DISTR_PRICE','INCREASE_DISTANCE','INCREASE_PRICE','DELIVERY_PRICE'], 'double','on'=>['o2o_update']], [['REGION_DISTR_DISTANCE', 'REGION_DISTR_PRICE', 'INCREASE_DISTANCE', 'INCREASE_PRICE', 'DELIVERY_PRICE'], 'double', 'on' => ['o2o_update']],
[['REGION_DISTR_DISTANCE', 'REGION_DISTR_PRICE','INCREASE_DISTANCE','INCREASE_PRICE'], 'required','when' => function($model) { [['REGION_DISTR_DISTANCE', 'REGION_DISTR_PRICE', 'INCREASE_DISTANCE', 'INCREASE_PRICE'], 'required', 'when' => function ($model) {
return $model->REGION_TYPE == '2'; return $model->REGION_TYPE == '2';
},'message' => '{attribute}不能为空','on'=>['o2o_update']], }, 'message' => '{attribute}不能为空', 'on' => ['o2o_update']],
[['DELIVERY_PRICE'], 'required','when' => function($model) { [['DELIVERY_PRICE'], 'required', 'when' => function ($model) {
return $model->REGION_TYPE == '1'; return $model->REGION_TYPE == '1';
},'message' => '{attribute}不能为空','on'=>['o2o_update']], }, 'message' => '{attribute}不能为空', 'on' => ['o2o_update']],
]; ];
} }
...@@ -134,41 +135,41 @@ class ShopCityDistributionSetting extends BaseModel ...@@ -134,41 +135,41 @@ class ShopCityDistributionSetting extends BaseModel
//根据条件查询门店 //根据条件查询门店
$branch_query = ShopBranch::find()->alias('sb') $branch_query = ShopBranch::find()->alias('sb')
->select("vwb.PROVINCE,vwb.CITY,vwb.REGION,sb.NAME,sb.PHONE,sb.GUID,sb.LAT,sb.LNG,sb.CODE,sb.ADDRESS,group_concat(cds.SETTING_TYPE) SETTING_TYPES ") ->select("vwb.PROVINCE,vwb.CITY,vwb.REGION,sb.NAME,sb.PHONE,sb.GUID,sb.LAT,sb.LNG,sb.CODE,sb.ADDRESS,group_concat(cds.SETTING_TYPE) SETTING_TYPES ")
->leftJoin('shop_city_distribution_setting as cds',"cds.BRANCH_GUID=sb.GUID") ->leftJoin('shop_city_distribution_setting as cds', "cds.BRANCH_GUID=sb.GUID")
->leftJoin('VW_BRANCH_ADDRESS vwb', 'vwb.GUID=sb.GUID') ->leftJoin('VW_BRANCH_ADDRESS vwb', 'vwb.GUID=sb.GUID')
->groupBy('sb.GUID') ->groupBy('sb.GUID')
->asArray(); ->asArray();
//门店名称或编码 //门店名称或编码
if (isset($params['code'])) { if (isset($params['code'])) {
$branch_query->andfilterWhere(['or', ['=','sb.CODE', $params['code']],['like', 'sb.NAME', $params['code']]]); $branch_query->andfilterWhere(['or', ['=', 'sb.CODE', $params['code']], ['like', 'sb.NAME', $params['code']]]);
} }
//省市区 //省市区
if (isset($params['province'])) { if (isset($params['province'])) {
$branch_query->andfilterWhere(['sb.RECIVER_PROVINCE'=>$params['province']]); $branch_query->andfilterWhere(['sb.RECIVER_PROVINCE' => $params['province']]);
} }
if (isset($params['city'])) { if (isset($params['city'])) {
$branch_query->andfilterWhere(['sb.RECIVER_CITY'=>$params['city']]); $branch_query->andfilterWhere(['sb.RECIVER_CITY' => $params['city']]);
} }
if (isset($params['region'])) { if (isset($params['region'])) {
$branch_query->andfilterWhere(['sb.RECIVER_REGION'=>$params['region']]); $branch_query->andfilterWhere(['sb.RECIVER_REGION' => $params['region']]);
} }
//是否o2o、b2c //是否o2o、b2c
if (isset($params['b2c_issetting'])) { if (isset($params['b2c_issetting'])) {
if($params['b2c_issetting']=='1'){ if ($params['b2c_issetting'] == '1') {
$setting_query = $this::find()->where("SETTING_TYPE='1' AND BRANCH_GUID = sb.GUID"); $setting_query = $this::find()->where("SETTING_TYPE='1' AND BRANCH_GUID = sb.GUID");
$branch_query->andfilterWhere(['exists',$setting_query]); $branch_query->andfilterWhere(['exists', $setting_query]);
}else if($params['b2c_issetting']=='0'){ } else if ($params['b2c_issetting'] == '0') {
$setting_query = $this::find()->where("SETTING_TYPE='1' AND BRANCH_GUID = sb.GUID"); $setting_query = $this::find()->where("SETTING_TYPE='1' AND BRANCH_GUID = sb.GUID");
$branch_query->andfilterWhere(['not exists',$setting_query]); $branch_query->andfilterWhere(['not exists', $setting_query]);
} }
} }
if (isset($params['o2o_issetting'])) { if (isset($params['o2o_issetting'])) {
if($params['o2o_issetting']=='1'){ if ($params['o2o_issetting'] == '1') {
$setting_query = $this::find()->where("SETTING_TYPE='2' AND BRANCH_GUID = sb.GUID"); $setting_query = $this::find()->where("SETTING_TYPE='2' AND BRANCH_GUID = sb.GUID");
$branch_query->andfilterWhere(['exists',$setting_query]); $branch_query->andfilterWhere(['exists', $setting_query]);
}else if($params['o2o_issetting']=='0'){ } else if ($params['o2o_issetting'] == '0') {
$setting_query = $this::find()->where("SETTING_TYPE='2' AND BRANCH_GUID = sb.GUID"); $setting_query = $this::find()->where("SETTING_TYPE='2' AND BRANCH_GUID = sb.GUID");
$branch_query->andfilterWhere(['not exists',$setting_query]); $branch_query->andfilterWhere(['not exists', $setting_query]);
} }
} }
...@@ -182,7 +183,7 @@ class ShopCityDistributionSetting extends BaseModel ...@@ -182,7 +183,7 @@ class ShopCityDistributionSetting extends BaseModel
{ {
//门店信息 //门店信息
$branch_info = ShopBranch::find() $branch_info = ShopBranch::find()
->where(["GUID"=>$branchguid]) ->where(["GUID" => $branchguid])
->select("GUID,NAME,LAT,LNG,ADDRESS") ->select("GUID,NAME,LAT,LNG,ADDRESS")
->asArray() ->asArray()
->one(); ->one();
...@@ -193,17 +194,17 @@ class ShopCityDistributionSetting extends BaseModel ...@@ -193,17 +194,17 @@ class ShopCityDistributionSetting extends BaseModel
$select .= "cdr.DIVIDE_TYPE,cdr.REGION_R,cdr.REGION_RANGE,cdr.INITIAL_PRICE,cdr.DELIVERY_PRICE,cdr.WEEK,cdr.IS_TYPE"; $select .= "cdr.DIVIDE_TYPE,cdr.REGION_R,cdr.REGION_RANGE,cdr.INITIAL_PRICE,cdr.DELIVERY_PRICE,cdr.WEEK,cdr.IS_TYPE";
$setting_info = $this->find()->alias("cds") $setting_info = $this->find()->alias("cds")
->select($select) ->select($select)
->where(["cds.BRANCH_GUID"=>$branchguid]) ->where(["cds.BRANCH_GUID" => $branchguid])
->leftJoin("shop_city_distribution_region cdr","cdr.CITY_DISTR_GUID=cds.GUID") ->leftJoin("shop_city_distribution_region cdr", "cdr.CITY_DISTR_GUID=cds.GUID")
->asArray() ->asArray()
->all(); ->all();
//整合数组 //整合数组
$o2o = []; $o2o = [];
$b2c = []; $b2c = [];
foreach($setting_info as $key=>$value){ foreach ($setting_info as $key => $value) {
if($value['SETTING_TYPE']=='1'){ if ($value['SETTING_TYPE'] == '1') {
if(empty($b2c['GUID'])){ if (empty($b2c['GUID'])) {
$b2c['GUID'] = $value['SETTING_GUID']; $b2c['GUID'] = $value['SETTING_GUID'];
$b2c['REGION_TYPE'] = $value['REGION_TYPE']; $b2c['REGION_TYPE'] = $value['REGION_TYPE'];
$b2c['REGION_DISTR_DISTANCE'] = $value['REGION_DISTR_DISTANCE']; $b2c['REGION_DISTR_DISTANCE'] = $value['REGION_DISTR_DISTANCE'];
...@@ -213,40 +214,40 @@ class ShopCityDistributionSetting extends BaseModel ...@@ -213,40 +214,40 @@ class ShopCityDistributionSetting extends BaseModel
$b2c['STATUS'] = $value['STATUS']; $b2c['STATUS'] = $value['STATUS'];
$b2c['SETTING_TYPE'] = $value['SETTING_TYPE']; $b2c['SETTING_TYPE'] = $value['SETTING_TYPE'];
$b2c['REGION'] = []; $b2c['REGION'] = [];
if(!empty($value['REGION_GUID'])){ if (!empty($value['REGION_GUID'])) {
array_push($b2c['REGION'],array( array_push($b2c['REGION'], array(
"GUID"=>$value['REGION_GUID'], "GUID" => $value['REGION_GUID'],
"SORT"=>$value['SORT'], "SORT" => $value['SORT'],
"CITY_DISTR_GUID"=>$value['CITY_DISTR_GUID'], "CITY_DISTR_GUID" => $value['CITY_DISTR_GUID'],
"COLORS"=>$value['COLORS'], "COLORS" => $value['COLORS'],
"DIVIDE_TYPE"=>$value['DIVIDE_TYPE'], "DIVIDE_TYPE" => $value['DIVIDE_TYPE'],
"REGION_R"=>$value['REGION_R'], "REGION_R" => $value['REGION_R'],
"REGION_RANGE"=>$value['REGION_RANGE'], "REGION_RANGE" => $value['REGION_RANGE'],
"INITIAL_PRICE"=>$value['INITIAL_PRICE'], "INITIAL_PRICE" => $value['INITIAL_PRICE'],
"DELIVERY_PRICE"=>$value['DELIVERY_PRICE'], "DELIVERY_PRICE" => $value['DELIVERY_PRICE'],
"WEEK"=>$value['WEEK'], "WEEK" => $value['WEEK'],
"IS_TYPE"=>$value['IS_TYPE'], "IS_TYPE" => $value['IS_TYPE'],
)); ));
} }
}else{ } else {
if(!empty($value['REGION_GUID'])){ if (!empty($value['REGION_GUID'])) {
array_push($b2c['REGION'],array( array_push($b2c['REGION'], array(
"GUID"=>$value['REGION_GUID'], "GUID" => $value['REGION_GUID'],
"SORT"=>$value['SORT'], "SORT" => $value['SORT'],
"CITY_DISTR_GUID"=>$value['CITY_DISTR_GUID'], "CITY_DISTR_GUID" => $value['CITY_DISTR_GUID'],
"COLORS"=>$value['COLORS'], "COLORS" => $value['COLORS'],
"DIVIDE_TYPE"=>$value['DIVIDE_TYPE'], "DIVIDE_TYPE" => $value['DIVIDE_TYPE'],
"REGION_R"=>$value['REGION_R'], "REGION_R" => $value['REGION_R'],
"REGION_RANGE"=>$value['REGION_RANGE'], "REGION_RANGE" => $value['REGION_RANGE'],
"INITIAL_PRICE"=>$value['INITIAL_PRICE'], "INITIAL_PRICE" => $value['INITIAL_PRICE'],
"DELIVERY_PRICE"=>$value['DELIVERY_PRICE'], "DELIVERY_PRICE" => $value['DELIVERY_PRICE'],
"WEEK"=>$value['WEEK'], "WEEK" => $value['WEEK'],
"IS_TYPE"=>$value['IS_TYPE'], "IS_TYPE" => $value['IS_TYPE'],
)); ));
} }
} }
}else if($value['SETTING_TYPE']=='2'){ } else if ($value['SETTING_TYPE'] == '2') {
if(empty($o2o['GUID'])){ if (empty($o2o['GUID'])) {
$o2o['GUID'] = $value['SETTING_GUID']; $o2o['GUID'] = $value['SETTING_GUID'];
$o2o['REGION_TYPE'] = $value['REGION_TYPE']; $o2o['REGION_TYPE'] = $value['REGION_TYPE'];
$o2o['REGION_DISTR_DISTANCE'] = $value['REGION_DISTR_DISTANCE']; $o2o['REGION_DISTR_DISTANCE'] = $value['REGION_DISTR_DISTANCE'];
...@@ -256,35 +257,35 @@ class ShopCityDistributionSetting extends BaseModel ...@@ -256,35 +257,35 @@ class ShopCityDistributionSetting extends BaseModel
$o2o['STATUS'] = $value['STATUS']; $o2o['STATUS'] = $value['STATUS'];
$o2o['SETTING_TYPE'] = $value['SETTING_TYPE']; $o2o['SETTING_TYPE'] = $value['SETTING_TYPE'];
$o2o['REGION'] = []; $o2o['REGION'] = [];
if(!empty($value['REGION_GUID'])){ if (!empty($value['REGION_GUID'])) {
array_push($o2o['REGION'],array( array_push($o2o['REGION'], array(
"GUID"=>$value['REGION_GUID'], "GUID" => $value['REGION_GUID'],
"SORT"=>$value['SORT'], "SORT" => $value['SORT'],
"CITY_DISTR_GUID"=>$value['CITY_DISTR_GUID'], "CITY_DISTR_GUID" => $value['CITY_DISTR_GUID'],
"COLORS"=>$value['COLORS'], "COLORS" => $value['COLORS'],
"DIVIDE_TYPE"=>$value['DIVIDE_TYPE'], "DIVIDE_TYPE" => $value['DIVIDE_TYPE'],
"REGION_R"=>$value['REGION_R'], "REGION_R" => $value['REGION_R'],
"REGION_RANGE"=>$value['REGION_RANGE'], "REGION_RANGE" => $value['REGION_RANGE'],
"INITIAL_PRICE"=>$value['INITIAL_PRICE'], "INITIAL_PRICE" => $value['INITIAL_PRICE'],
"DELIVERY_PRICE"=>$value['DELIVERY_PRICE'], "DELIVERY_PRICE" => $value['DELIVERY_PRICE'],
"WEEK"=>$value['WEEK'], "WEEK" => $value['WEEK'],
"IS_TYPE"=>$value['IS_TYPE'], "IS_TYPE" => $value['IS_TYPE'],
)); ));
} }
}else{ } else {
if(!empty($value['REGION_GUID'])){ if (!empty($value['REGION_GUID'])) {
array_push($o2o['REGION'],array( array_push($o2o['REGION'], array(
"GUID"=>$value['REGION_GUID'], "GUID" => $value['REGION_GUID'],
"SORT"=>$value['SORT'], "SORT" => $value['SORT'],
"CITY_DISTR_GUID"=>$value['CITY_DISTR_GUID'], "CITY_DISTR_GUID" => $value['CITY_DISTR_GUID'],
"COLORS"=>$value['COLORS'], "COLORS" => $value['COLORS'],
"DIVIDE_TYPE"=>$value['DIVIDE_TYPE'], "DIVIDE_TYPE" => $value['DIVIDE_TYPE'],
"REGION_R"=>$value['REGION_R'], "REGION_R" => $value['REGION_R'],
"REGION_RANGE"=>$value['REGION_RANGE'], "REGION_RANGE" => $value['REGION_RANGE'],
"INITIAL_PRICE"=>$value['INITIAL_PRICE'], "INITIAL_PRICE" => $value['INITIAL_PRICE'],
"DELIVERY_PRICE"=>$value['DELIVERY_PRICE'], "DELIVERY_PRICE" => $value['DELIVERY_PRICE'],
"WEEK"=>$value['WEEK'], "WEEK" => $value['WEEK'],
"IS_TYPE"=>$value['IS_TYPE'], "IS_TYPE" => $value['IS_TYPE'],
)); ));
} }
} }
......
backend/models/v1/rbacuser/ShopRbacRole.php
View file @ 07f4652f
...@@ -75,8 +75,8 @@ class ShopRbacRole extends BaseModel ...@@ -75,8 +75,8 @@ class ShopRbacRole extends BaseModel
->where(['STATUS' => 1]) ->where(['STATUS' => 1])
->orderBy('SORT ASC'); ->orderBy('SORT ASC');
if(isset($ID) && !empty($ID)){ if (isset($ID) && !empty($ID)) {
$query->andFilterWhere(['=','ID',$ID]); $query->andFilterWhere(['=', 'ID', $ID]);
} }
return new ActiveDataProvider([ return new ActiveDataProvider([
......
backend/models/v1/rbacuser/ShopRbacRoleAccess.php
View file @ 07f4652f
...@@ -29,7 +29,7 @@ class ShopRbacRoleAccess extends BaseModel ...@@ -29,7 +29,7 @@ class ShopRbacRoleAccess extends BaseModel
public function rules() public function rules()
{ {
return [ return [
[['NODE_ID'], 'required','on'=>['create']], [['NODE_ID'], 'required', 'on' => ['create']],
[['ROLE_ID', 'NODE_ID'], 'string', 'max' => 20], [['ROLE_ID', 'NODE_ID'], 'string', 'max' => 20],
[['ORG_GUID'], 'string', 'max' => 50], [['ORG_GUID'], 'string', 'max' => 50],
]; ];
...@@ -58,7 +58,7 @@ class ShopRbacRoleAccess extends BaseModel ...@@ -58,7 +58,7 @@ class ShopRbacRoleAccess extends BaseModel
//删除角色原有权限 //删除角色原有权限
public function delRoleAuthorities($ROLE_ID) public function delRoleAuthorities($ROLE_ID)
{ {
$roleAuth = static::find()->where(['ROLE_ID'=>$ROLE_ID])->one(); $roleAuth = static::find()->where(['ROLE_ID' => $ROLE_ID])->one();
$res = $roleAuth->delete(); $res = $roleAuth->delete();
return $res; return $res;
} }
......
backend/models/v1/shopuser/UserComplain.php
View file @ 07f4652f
...@@ -42,7 +42,7 @@ class UserComplain extends BaseModel ...@@ -42,7 +42,7 @@ class UserComplain extends BaseModel
public function rules() public function rules()
{ {
return [ return [
[['GUID'], 'required','on'=>['create']], [['GUID'], 'required', 'on' => ['create']],
[['TS_CONTENT', 'TS_IDEA', 'TS_DESCRIPTION'], 'string'], [['TS_CONTENT', 'TS_IDEA', 'TS_DESCRIPTION'], 'string'],
[['TS_COMMIT_DATE', 'TS_REPLY_DATE', 'TS_REVISIT_DATE'], 'safe'], [['TS_COMMIT_DATE', 'TS_REPLY_DATE', 'TS_REVISIT_DATE'], 'safe'],
[['COMPLAIN_TYPE'], 'integer'], [['COMPLAIN_TYPE'], 'integer'],
...@@ -83,7 +83,7 @@ class UserComplain extends BaseModel ...@@ -83,7 +83,7 @@ class UserComplain extends BaseModel
->from('shop_user_complain suc') ->from('shop_user_complain suc')
->select('suc.GUID,su.NAME,suc.TS_PHONE,suc.TS_CONTENT,suc.TS_COMMIT_DATE,suc.COMPLAIN_TYPE') ->select('suc.GUID,su.NAME,suc.TS_PHONE,suc.TS_CONTENT,suc.TS_COMMIT_DATE,suc.COMPLAIN_TYPE')
->leftjoin('shop_user su', 'su.GUID = suc.TS_USER_GUID'); ->leftjoin('shop_user su', 'su.GUID = suc.TS_USER_GUID');
if($phone){ if ($phone) {
$query->Where(['like', 'suc.TS_PHONE', $phone]); $query->Where(['like', 'suc.TS_PHONE', $phone]);
} }
return new ActiveDataProvider( return new ActiveDataProvider(
......
backend/models/v1/shopuser/UserDepartment.php
View file @ 07f4652f
...@@ -33,7 +33,7 @@ class UserDepartment extends BaseModel ...@@ -33,7 +33,7 @@ class UserDepartment extends BaseModel
public function rules() public function rules()
{ {
return [ return [
[['GUID'], 'required','on'=>['create']], [['GUID'], 'required', 'on' => ['create']],
[['UPDATE_TIME'], 'safe'], [['UPDATE_TIME'], 'safe'],
[['GUID', 'ORG_GUID', 'CODE', 'NAME'], 'string', 'max' => 50], [['GUID', 'ORG_GUID', 'CODE', 'NAME'], 'string', 'max' => 50],
[['COMPANY', 'SUB_COMPANY'], 'string', 'max' => 255], [['COMPANY', 'SUB_COMPANY'], 'string', 'max' => 255],
...@@ -57,7 +57,7 @@ class UserDepartment extends BaseModel ...@@ -57,7 +57,7 @@ class UserDepartment extends BaseModel
]; ];
} }
//用户-部门信息 //用户-部门信息
public function DepartmentInfo($code,$name) public function DepartmentInfo($code, $name)
{ {
//$org_guid = 2; //$org_guid = 2;
$query = static::find()->select('GUID,NAME,CODE,COMPANY,SUB_COMPANY,UPDATE_TIME'); $query = static::find()->select('GUID,NAME,CODE,COMPANY,SUB_COMPANY,UPDATE_TIME');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment