Skip to content

N
newShopBack
Commit e9625051 authored by 张晓林's avatar 张晓林
Browse files
Options

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

parents 0f86b295 19bdda2e
Show whitespace changes
Inline Side-by-side
Showing with 725 additions and 733 deletions
backend/config/constants.php
View file @ e9625051
......@@ -11,3 +11,8 @@ defined('USER_ROLE_HEADQUARTERS_ADMIN') or define('USER_ROLE_HEADQUARTERS_ADMIN'
defined('USER_ROLE_REGION_ADMIN') or define('USER_ROLE_REGION_ADMIN',2);//分部管理员权限2
defined('USER_ROLE_STORE_ADMIN') or define('USER_ROLE_STORE_ADMIN',3);//分部管理员权限3
defined('O2O_FLAG') or define('O2O_FLAG',2);//o2o类型标志量
defined('BRANCH_TYPE_HEADQUARTERS') or define('BRANCH_TYPE_HEADQUARTERS',0);//门店类型：总部
defined('BRANCH_TYPE_REGION') or define('BRANCH_TYPE_REGION',1);//门店类型：省级
defined('BRANCH_TYPE_STORE') or define('BRANCH_TYPE_STORE',2);//门店类型：门店
defined('REGION_TYPE_REGION') or define('REGION_TYPE_REGION',1);//配送区域类型,1按区域
defined('REGION_TYPE_DISTANCE') or define('REGION_TYPE_DISTANCE',2);//配送区域类型,2按距离
\ No newline at end of file
backend/config/urlmanager.php
View file @ e9625051
......@@ -5,46 +5,46 @@ return [
'urlManager' => [
'enablePrettyUrl' => true,
'showScriptName' => false,
'enableStrictParsing'=>true,
'enableStrictParsing' => true,
'rules' => [
[
'class'=>'yii\rest\UrlRule',
'controller'=>[
'class' => 'yii\rest\UrlRule',
'controller' => [
'swagger',
],
'extraPatterns'=>[
'GET swagger'=>'swagger',
'extraPatterns' => [
'GET swagger' => 'swagger',
],
],
//swagger
'GET swaggers/swagger/<id>'=>'swagger/swagger',
'GET swaggers/swagger/<id>' => 'swagger/swagger',
[
'class'=>'yii\rest\UrlRule',
'controller'=>[
'class' => 'yii\rest\UrlRule',
'controller' => [
'v1/branch/branch',
],
'extraPatterns'=>[
'GET,OPTIONS branch-list'=>'branch-list',
'POST,OPTIONS upload'=>'upload',
'extraPatterns' => [
'GET,OPTIONS branch-list' => 'branch-list',
'POST,OPTIONS upload' => 'upload',
],
],
//门店
[
'class'=>'yii\rest\UrlRule',
'controller'=>[
'class' => 'yii\rest\UrlRule',
'controller' => [
'v1/branch/branch',
],
'extraPatterns'=>[
'GET,OPTIONS branch-list'=>'branch-list',
'POST,OPTIONS upload'=>'upload',
'POST,OPTIONS import-branch'=>'import-branch',
'extraPatterns' => [
'GET,OPTIONS branch-list' => 'branch-list',
'POST,OPTIONS upload' => 'upload',
'POST,OPTIONS import-branch' => 'import-branch',
'GET,OPTIONS branch-detail' => 'branch-detail',
'GET,OPTIONS branch-services' => 'branch-services',
'GET,OPTIONS branch-sup-company' => 'branch-sup-company',
'GET,OPTIONS branch-sup-region' => 'branch-sup-region',
'GET,OPTIONS sup-company-region' => 'sup-company-region',
'GET,OPTIONS branch-transport-type'=>'branch-transport-type',
'GET,OPTIONS branch-transport-type' => 'branch-transport-type',
'POST,OPTIONS add-branch' => 'add-branch',
'PUT,OPTIONS revise-branch' => 'revise-branch',
'DELETE,OPTIONS del-branch' => 'del-branch',
......@@ -58,37 +58,37 @@ return [
],
//门店评分
[
'class'=>'yii\rest\UrlRule',
'controller'=>[
'class' => 'yii\rest\UrlRule',
'controller' => [
'v1/branch/branch-score',
],
'extraPatterns'=>[
'extraPatterns' => [
'GET,OPTIONS branch-score-list' => 'branch-score-list',
'GET,OPTIONS score-info' => 'score-info',
'PUT,OPTIONS score-info-update'=>'score-info-update',
'DELETE,OPTIONS score-info-del'=>'score-info-del',
'POST,OPTIONS add-branch-score'=>'add-branch-score',
'PUT,OPTIONS score-info-update' => 'score-info-update',
'DELETE,OPTIONS score-info-del' => 'score-info-del',
'POST,OPTIONS add-branch-score' => 'add-branch-score',
'GET,OPTIONS score-export' => 'score-export',
'POST,OPTIONS score-import' => 'score-import',
],
],
//后台管理员
[
'class'=>'yii\rest\UrlRule',
'controller'=>[
'class' => 'yii\rest\UrlRule',
'controller' => [
'v1/rbacuser/rbac-user',
],
'extraPatterns'=>[
'POST,OPTIONS login'=>'login',
'extraPatterns' => [
'POST,OPTIONS login' => 'login',
],
],
//用户组
[
'class'=>'yii\rest\UrlRule',
'controller'=>[
'class' => 'yii\rest\UrlRule',
'controller' => [
'v1/shopuser/shop-user-membergrade',
],
'extraPatterns'=>[
'extraPatterns' => [
'GET,OPTIONS membergrade-list' => 'membergrade-list',
'GET,OPTIONS membergrade-detail' => 'membergrade-detail',
'PUT,OPTIONS membergrade-revise' => 'membergrade-revise',
......@@ -98,21 +98,21 @@ return [
],
//部门信息
[
'class'=>'yii\rest\UrlRule',
'controller'=>[
'class' => 'yii\rest\UrlRule',
'controller' => [
'v1/shopuser/user-department',
],
'extraPatterns'=>[
'GET,OPTIONS department'=>'department',
'extraPatterns' => [
'GET,OPTIONS department' => 'department',
],
],
//用户
//员工
[
'class'=>'yii\rest\UrlRule',
'controller'=>[
'v1/shopuser/shop-user',
'class' => 'yii\rest\UrlRule',
'controller' => [
'v1/shopuser/shop-employee',
],
'extraPatterns'=>[
'extraPatterns' => [
'GET,OPTIONS employee-info' => 'employee-info',
'GET,OPTIONS employee-list' => 'employee-list',
'POST,OPTIONS employee-import' => 'employee-import',
......@@ -120,21 +120,21 @@ return [
],
//用户评论
[
'class'=>'yii\rest\UrlRule',
'controller'=>[
'class' => 'yii\rest\UrlRule',
'controller' => [
'v1/shopuser/user-complain',
],
'extraPatterns'=>[
'GET,OPTIONS user-complain'=>'user-complain',
'extraPatterns' => [
'GET,OPTIONS user-complain' => 'user-complain',
],
],
//门店服务类型
[
'class'=>'yii\rest\UrlRule',
'controller'=>[
'class' => 'yii\rest\UrlRule',
'controller' => [
'v1/branch/branch-service-type',
],
'extraPatterns'=>[
'extraPatterns' => [
'GET,OPTIONS branch-service-list' => 'branch-service-list',
'GET,OPTIONS branch-service-info' => 'branch-service-info',
'POST,OPTIONS add-branch-service' => 'add-branch-service',
......@@ -146,11 +146,11 @@ return [
],
//门店电子围栏
[
'class'=>'yii\rest\UrlRule',
'controller'=>[
'class' => 'yii\rest\UrlRule',
'controller' => [
'v1/branch/city-distribution-setting',
],
'extraPatterns'=>[
'extraPatterns' => [
'GET,OPTIONS city-distribution-setting-list' => 'city-distribution-setting-list',
'GET,OPTIONS city-distribution-setting-export' => 'city-distribution-setting-export',
'GET,OPTIONS city-distribution-setting-detail' => 'city-distribution-setting-detail',
......@@ -160,11 +160,11 @@ return [
],
//快递方式
[
'class'=>'yii\rest\UrlRule',
'controller'=>[
'class' => 'yii\rest\UrlRule',
'controller' => [
'v1/transport/company',
],
'extraPatterns'=>[
'extraPatterns' => [
'GET,OPTIONS company-list' => 'company-list',
'GET,OPTIONS company-detail' => 'company-detail',
'POST,OPTIONS company-add' => 'company-add',
......@@ -174,62 +174,62 @@ return [
],
//用户列表
[
'class'=>'yii\rest\UrlRule',
'controller'=>[
'class' => 'yii\rest\UrlRule',
'controller' => [
'v1/shopuser/shop-user-list',
'v1/branch/branch-licence',
'v1/common/shop-transport-area',
],
'extraPatterns'=>[
'extraPatterns' => [
'GET,OPTIONS user-list' => 'user-list',
'GET,OPTIONS user-detail'=>'user-detail',
'POST user-update'=>'user-update',
'GET,OPTIONS user-detail' => 'user-detail',
'POST user-update' => 'user-update',
// 'GET,OPTIONS user-delete'=>'user-delete',
'GET,OPTIONS get-member-grade-list'=>'get-member-grade-list',
'GET,OPTIONS get-member-grade-list' => 'get-member-grade-list',
],
],
//门店证照
[
'class'=>'yii\rest\UrlRule',
'controller'=>[
'class' => 'yii\rest\UrlRule',
'controller' => [
'v1/branch/branch-licence',
],
'extraPatterns'=>[
'GET,OPTIONS licence-list'=>'licence-list',
'GET,OPTIONS licence-detail'=>'licence-detail',
'GET,OPTIONS licence-excel-download'=>'licence-excel-download',
'POST,OPTIONS licence-insert'=>'licence-insert',
'POST,OPTIONS licence-img-upload'=>'licence-img-upload',
'POST,OPTIONS licence-excel-upload'=>'licence-excel-upload',
'extraPatterns' => [
'GET,OPTIONS licence-list' => 'licence-list',
'GET,OPTIONS licence-detail' => 'licence-detail',
'GET,OPTIONS licence-excel-download' => 'licence-excel-download',
'POST,OPTIONS licence-insert' => 'licence-insert',
'POST,OPTIONS licence-img-upload' => 'licence-img-upload',
'POST,OPTIONS licence-excel-upload' => 'licence-excel-upload',
],
],
//省市区
[
'class'=>'yii\rest\UrlRule',
'controller'=>[
'class' => 'yii\rest\UrlRule',
'controller' => [
'v1/common/shop-transport-area',
],
'extraPatterns'=>[
'extraPatterns' => [
'GET,OPTIONS area' => 'area',
],
],
//模板下载类
[
'class'=>'yii\rest\UrlRule',
'controller'=>[
'class' => 'yii\rest\UrlRule',
'controller' => [
'v1/common/down-template',
],
'extraPatterns'=>[
'extraPatterns' => [
'GET,OPTIONS template-file' => 'template-file',
],
],
//快递配送价格
[
'class'=>'yii\rest\UrlRule',
'controller'=>[
'class' => 'yii\rest\UrlRule',
'controller' => [
'v1/transport/transport-setting',
],
'extraPatterns'=>[
'extraPatterns' => [
'GET,OPTIONS transport-templates' => 'transport-templates',
'GET,OPTIONS transport-fee-details' => 'transport-fee-details',
'GET,OPTIONS get-branches-packaging' => 'get-branches-packaging',
......@@ -240,23 +240,23 @@ return [
],
//o2o起送价设置
[
'class'=>'yii\rest\UrlRule',
'controller'=>[
'class' => 'yii\rest\UrlRule',
'controller' => [
'v1/transport/transport-initial-price',
],
'extraPatterns'=>[
'extraPatterns' => [
'GET,OPTIONS initial-price-list' => 'initial-price-list',
'PUT,OPTIONS revise-initial-price' => 'revise-initial-price',
'POST,OPTIONS initial-price-import'=>'initial-price-import',
'POST,OPTIONS initial-price-import' => 'initial-price-import',
],
],
//o2o配送价格
[
'class'=>'yii\rest\UrlRule',
'controller'=>[
'class' => 'yii\rest\UrlRule',
'controller' => [
'v1/transport/o2o-delivery',
],
'extraPatterns'=>[
'extraPatterns' => [
'GET,OPTIONS o2o-delivery-list' => 'o2o-delivery-list',
'PUT,OPTIONS o2o-delivery-update' => 'o2o-delivery-update',
'GET,OPTIONS o2o-delivery-export' => 'o2o-delivery-export',
......@@ -265,11 +265,11 @@ return [
],
//配送方式
[
'class'=>'yii\rest\UrlRule',
'controller'=>[
'class' => 'yii\rest\UrlRule',
'controller' => [
'v1/transport/transport-method',
],
'extraPatterns'=>[
'extraPatterns' => [
'GET,OPTIONS get-transport-method' => 'get-transport-method',
'GET,OPTIONS make-use' => 'make-use',
'POST,OPTIONS transport-method-insert' => 'transport-method-insert',
......@@ -278,13 +278,13 @@ return [
],
//权限-角色
[
'class'=>'yii\rest\UrlRule',
'controller'=>[
'class' => 'yii\rest\UrlRule',
'controller' => [
'v1/authority/authority-role',
],
'extraPatterns'=>[
'extraPatterns' => [
'GET,OPTIONS authority-role-list' => 'authority-role-list',
'GET,OPTIONS authority-role-detail'=>'authority-role-detail',
'GET,OPTIONS authority-role-detail' => 'authority-role-detail',
'POST,OPTIONS add-authority-role' => 'add-authority-role',
'PUT,OPTIONS revise-authority-role' => 'revise-authority-role',
'GET,OPTIONS role-authorities' => 'role-authorities',
......@@ -308,11 +308,11 @@ return [
],
//权限-管理员列表
[
'class'=>'yii\rest\UrlRule',
'controller'=>[
'class' => 'yii\rest\UrlRule',
'controller' => [
'v1/authority/manage-list',
],
'extraPatterns'=>[
'extraPatterns' => [
'GET,OPTIONS get-manage-list' => 'get-manage-list',
],
],
......
backend/controllers/v1/branch/BranchController.php
View file @ e9625051
......@@ -63,13 +63,13 @@ class BranchController extends BaseController
// print_r($userinfo);die();
$where_branch = '';
//是否是 分公司管理员 是的话只显示所管理门店的数据
if($userinfo['ROLE_ID'] == USER_ROLE_REGION_ADMIN){
if ($userinfo['ROLE_ID'] == USER_ROLE_REGION_ADMIN) {
$branchguids_str = $userinfo['BRANCH_GUID'];
$where_branch = empty($branchguids_str)?$userinfo['SUPPROVINCE_GUID']:"'".$userinfo['SUPPROVINCE_GUID']."',".$branchguids_str;
}elseif($userinfo['ROLE_ID'] == USER_ROLE_STORE_ADMIN){
$where_branch = empty($branchguids_str) ? $userinfo['SUPPROVINCE_GUID'] : "'" . $userinfo['SUPPROVINCE_GUID'] . "'," . $branchguids_str;
} elseif ($userinfo['ROLE_ID'] == USER_ROLE_STORE_ADMIN) {
//门店
$branchguid = $userinfo['BRANCH_GUID'];
$where_branch = !empty($branchguid) ? $branchguid :'';
$where_branch = !empty($branchguid) ? $branchguid : '';
}
$model = new $this->modelClass();
$params = Yii::$app->request->queryParams;
......@@ -83,8 +83,8 @@ class BranchController extends BaseController
if (!$list = $info->getModels()) {
throw new BadRequestHttpException('未找到符合的门店列表信息');
}
foreach($list as $key => $val){
$list[$key]['DETAIL_ADDRESS'] = $val['PROVINCE'].$val['CITY'].$val['REGION'].$val['ADDRESS'];
foreach ($list as $key => $val) {
$list[$key]['DETAIL_ADDRESS'] = $val['PROVINCE'] . $val['CITY'] . $val['REGION'] . $val['ADDRESS'];
}
$info->setModels($list);
return $info;
......@@ -124,16 +124,16 @@ class BranchController extends BaseController
//获取门店服务类目关系信息
$branch_service_relation = $branch_service->BranchSeviceRelation($params['GUID']);
//获取门店服务类目名称
if($branch_service_relation){
foreach($branch_service_relation as $k => $v){
$branch_s_type = $branch_service_type->BranchServiceInfo('','',$v['SERVICE_TYPE_GUID']);
if ($branch_service_relation) {
foreach ($branch_service_relation as $k => $v) {
$branch_s_type = $branch_service_type->BranchServiceInfo('', '', $v['SERVICE_TYPE_GUID']);
$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'];
// unset($branch_service_relation[$k]['GUID']);
// unset($branch_service_relation[$k]['BRANCH_GUID']);
}else{
} else {
$branch_service_relation[$k]['SERVICE_TYPE_GUID'] = '';
$branch_service_relation[$k]['BRANCH_SERVICE_TYPE_NAME'] = '';
}
......@@ -202,57 +202,57 @@ class BranchController extends BaseController
$param = Yii::$app->getRequest()->post();
$ShopBranchService = new ShopBranchService();
//门店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
if(isset($param['BRANCH_SERVICE_TYPE']) && !empty($param['BRANCH_SERVICE_TYPE'])){
$ShopBranchService->scenario = 'create';//创建的场景
if (isset($param['BRANCH_SERVICE_TYPE']) && !empty($param['BRANCH_SERVICE_TYPE'])) {
$ShopBranchService->scenario = 'create'; //创建的场景
//删除门店原有服务类目
$ShopBranchService->BranchServiceDel($branch_guid);
$BST = $param['BRANCH_SERVICE_TYPE'];
//判断门店服务类目类型
if(is_string($BST)){
$BST_arr = explode(',',$BST);
}else{
if (is_string($BST)) {
$BST_arr = explode(',', $BST);
} else {
$BST_arr = $BST;
}
//添加门店服务类目
foreach($BST_arr as $k => $v){
foreach ($BST_arr as $k => $v) {
$ShopBranchService = new ShopBranchService();
$service_param = array(
'GUID' => Func::create_guid(),
'STATE'=> 1,
'STATE' => 1,
'SERVICE_TYPE_GUID' => $v,
'BRANCH_GUID' => $branch_guid,
);
$ShopBranchService->setAttributes($service_param);
//添加门店新的服务类目
if(!$ShopBranchService->save()){
return array('message'=>'门店服务类目添加失败！');
if (!$ShopBranchService->save()) {
return array('message' => '门店服务类目添加失败！');
}
}
}
//营业时间
if(!empty($param['WORK_TIME_START']) && !empty($param['WORK_TIME_END'])){
$WORK_TIME = $param['WORK_TIME_START'].'-'.$param['WORK_TIME_END'];
}else{
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{
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 = new $this->modelClass();
$model->scenario = 'create';//创建的场景
$model->scenario = 'create'; //创建的场景
$other_param = array(
//'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,
'DELIVERY_TIME'=>$DELIVERY_TIME,
'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,
'DELIVERY_TIME' => $DELIVERY_TIME,
);
$model->setAttributes($other_param);
$model->setAttributes(Yii::$app->getRequest()->post());
......@@ -285,7 +285,7 @@ class BranchController extends BaseController
*/
public function actionBranchServices()
{
$model=new BranchServiceType();
$model = new BranchServiceType();
$info = $model->BranchServiceInfoAll();
if (!$info) {
throw new BadRequestHttpException('未找到符合的门店服务类目信息');
......@@ -402,7 +402,7 @@ class BranchController extends BaseController
if ($model->validate()) {
//所有输入数据都有效 all inputs are valid
$info = $model->getBranchRegion($SUPPROVINCE_GUID,1);
$info = $model->getBranchRegion($SUPPROVINCE_GUID, 1);
if (!$info) {
throw new BadRequestHttpException('未找到符合的门店区域信息');
}
......@@ -470,56 +470,56 @@ class BranchController extends BaseController
$model = $this->modelClass::findOne($guid);
$ShopBranchService = new ShopBranchService();
//门店GUID 拼装
$branch_guid = Yii::$app->user->identity->ORG_GUID.'-'.$param['CODE'];
if(!$model){
$branch_guid = Yii::$app->user->identity->ORG_GUID . '-' . $param['CODE'];
if (!$model) {
throw new BadRequestHttpException('没有找到要修改的记录');
}
//修改门店服务类目
$BRANCH_SERVICE_TYPE = $param['BRANCH_SERVICE_TYPE'];
if(isset($BRANCH_SERVICE_TYPE) && !empty($BRANCH_SERVICE_TYPE)){
$ShopBranchService->scenario = 'create';//创建的场景
if (isset($BRANCH_SERVICE_TYPE) && !empty($BRANCH_SERVICE_TYPE)) {
$ShopBranchService->scenario = 'create'; //创建的场景
//删除门店原有服务类目
$ShopBranchService->BranchServiceDel($branch_guid);
//判断门店服务类目类型
if(is_string($BRANCH_SERVICE_TYPE)){
$BST_arr = explode(',',$BRANCH_SERVICE_TYPE);
}else{
if (is_string($BRANCH_SERVICE_TYPE)) {
$BST_arr = explode(',', $BRANCH_SERVICE_TYPE);
} else {
$BST_arr = $BRANCH_SERVICE_TYPE;
}
//添加门店服务类目
foreach($BST_arr as $k => $v){
foreach ($BST_arr as $k => $v) {
$ShopBranchService = new ShopBranchService();
$service_param = array(
'GUID' => Func::create_guid(),
'STATE'=> 1,
'STATE' => 1,
'SERVICE_TYPE_GUID' => $v,
'BRANCH_GUID' => $branch_guid,
);
$ShopBranchService->setAttributes($service_param);
//添加门店新的服务类目
if(!$ShopBranchService->save()){
return array('message'=>'门店服务类目添加失败！');
if (!$ShopBranchService->save()) {
return array('message' => '门店服务类目添加失败！');
}
}
}
//营业时间
if(!empty($param['WORK_TIME_START']) && !empty($param['WORK_TIME_END'])){
$WORK_TIME = $param['WORK_TIME_START'].'-'.$param['WORK_TIME_END'];
}else{
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{
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 = 'update';//创建的场景
$model->scenario = 'update'; //创建的场景
$other_param = array(
'UPDATE_TIME'=>date('Y-m-d H:i:s',time()),
'WORK_TIME'=>$WORK_TIME,
'DELIVERY_TIME'=>$DELIVERY_TIME,
'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());
......@@ -555,9 +555,9 @@ class BranchController extends BaseController
$guid = Yii::$app->getRequest()->post('GUID');
$model = new $this->modelClass();
$branchservice = $model::findOne($guid);
if(!$branchservice){
if (!$branchservice) {
throw new BadRequestHttpException('没有找到要删除的记录');
}else if ($branchservice->delete() === false) {
} else if ($branchservice->delete() === false) {
throw new ServerErrorHttpException('Failed to delete the object for unknown reason.');
}
......@@ -593,25 +593,25 @@ class BranchController extends BaseController
public function actionBranchImgUpload()
{
//多文件时依赖注入参数参考UploadFiles类
$model = new UploadFiles(['png','jpg','jpeg']);
$model = new UploadFiles(['png', 'jpg', 'jpeg']);
if (Yii::$app->request->isPost) {
//多文件用getInstances
$model->uploadFiles = UploadedFile::getInstance($model,'uploadFile');
$model->uploadFiles = UploadedFile::getInstance($model, 'uploadFile');
$fileInfo = $model->upload();
if ($fileInfo['CODE']==200) {
if ($fileInfo['CODE'] == 200) {
// 文件上传成功
return [
'CODE'=>200,
'imgUrl'=>$fileInfo['INFO']
'CODE' => 200,
'imgUrl' => $fileInfo['INFO']
];
}else{
} else {
throw new HttpException(422);
}
}
}
/**
/**
* @OA\Post(
* path="/backend/web/v1/branch/branches/upload",
* tags={"上传文件事例"},
......@@ -644,18 +644,17 @@ class BranchController extends BaseController
$model = new UploadFiles();
if (Yii::$app->request->isPost) {
//多文件用getInstances
$model->uploadFiles = UploadedFile::getInstance($model,'uploadFile');
$model->uploadFiles = UploadedFile::getInstance($model, 'uploadFile');
$fileInfo = $model->upload();
if ($fileInfo['CODE']==200) {
if ($fileInfo['CODE'] == 200) {
// 文件上传成功
return $fileInfo['INFO'];
// throw new HttpException(200);
}else{
} else {
throw new HttpException(422);
}
}
}
/**
......@@ -682,106 +681,106 @@ class BranchController extends BaseController
$model = new UploadFiles();
if (Yii::$app->request->isPost) {
//多文件用getInstances
$model->uploadFiles = UploadedFile::getInstance($model,'uploadFile');
$model->uploadFiles = UploadedFile::getInstance($model, 'uploadFile');
$fileInfo = $model->upload();
if ($fileInfo['CODE']==200) {
if ($fileInfo['CODE'] == 200) {
// 文件上传成功
$rows = Helper::newSpreadsheet($fileInfo['INFO'][0])->getRows();
$tempArr=array_slice($rows,2);
$tempArr = array_slice($rows, 2);
$branchModel = new $this->modelClass();
$branchModel->scenario = 'import';
$transaction=$branchModel->getDb()->beginTransaction();
$transaction = $branchModel->getDb()->beginTransaction();
$servicModel = new ShopBranchService();
try {
foreach ($tempArr as $key => $value) {
$_branchModel = $branchModel::findOne(Yii::$app->user->identity->ORG_GUID.'-'.$value[0]);
if ($_branchModel===null) {
$_branchModel = $branchModel::findOne(Yii::$app->user->identity->ORG_GUID . '-' . $value[0]);
if ($_branchModel === null) {
$_branchModel = clone $branchModel;
}
$_branchModel->GUID=Yii::$app->user->identity->ORG_GUID.'-'.$value[0];
$_branchModel->CODE=$value[0];
$_branchModel->ORG_GUID=Yii::$app->user->identity->ORG_GUID;
$_branchModel->DESCRIPTION=$value[1];
$_branchModel->CONTACT_NAME=$value[2];
$_branchModel->PHONE=$value[3];
$_branchModel->DELIVERY_TIME=$value[4];
$_branchModel->WORK_TIME=$value[5];
$_branchModel->NAME=$value[6];
$_branchModel->LAT=$value[7];
$_branchModel->LNG=$value[8];
$_branchModel->IS_DELIVERY=$value[9];
$_branchModel->IS_CARE=$value[10];
$_branchModel->IS_RESERV=$value[11];
$_branchModel->IS_O2O=$value[12];
$_branchModel->IS_BOIL_MEDICINE=$value[13];
$_branchModel->IS_POINTS_SHOP=$value[14];
$_branchModel->IS_VIRTUAL_BRANCH=$value[15];
$_branchModel->IS_DELIVERY_CODECHAIN_GOODS=$value[16];
$_branchModel->IS_SHELVE=$value[17];
$_branchModel->SERVICE_TYPE_CODE=$value[18];
$_branchModel->IS_BRANCH_SELF_MENTION=$value[19];
$_branchModel->IS_BRANCH_EXPRESS_DELIVERY=$value[20];
$_branchModel->IS_DELIVERS_GOODS=$value[21];
$_branchModel->IS_EXPRESS_DELIVERY=$value[22];
$_branchModel->IS_BRANCH_SELF_DELIVERY=$value[23];
$_branchModel->IS_HAFL_HOUR_DELIVERY=$value[24];
$_branchModel->IS_ONE_HOUR_DELIVERY=$value[25];
$_branchModel->IS_TWO_HOUR_DELIVERY=$value[26];
$_branchModel->IS_DAY_DELIVERY=$value[27];
$_branchModel->GUID = Yii::$app->user->identity->ORG_GUID . '-' . $value[0];
$_branchModel->CODE = $value[0];
$_branchModel->ORG_GUID = Yii::$app->user->identity->ORG_GUID;
$_branchModel->DESCRIPTION = $value[1];
$_branchModel->CONTACT_NAME = $value[2];
$_branchModel->PHONE = $value[3];
$_branchModel->DELIVERY_TIME = $value[4];
$_branchModel->WORK_TIME = $value[5];
$_branchModel->NAME = $value[6];
$_branchModel->LAT = $value[7];
$_branchModel->LNG = $value[8];
$_branchModel->IS_DELIVERY = $value[9];
$_branchModel->IS_CARE = $value[10];
$_branchModel->IS_RESERV = $value[11];
$_branchModel->IS_O2O = $value[12];
$_branchModel->IS_BOIL_MEDICINE = $value[13];
$_branchModel->IS_POINTS_SHOP = $value[14];
$_branchModel->IS_VIRTUAL_BRANCH = $value[15];
$_branchModel->IS_DELIVERY_CODECHAIN_GOODS = $value[16];
$_branchModel->IS_SHELVE = $value[17];
$_branchModel->SERVICE_TYPE_CODE = $value[18];
$_branchModel->IS_BRANCH_SELF_MENTION = $value[19];
$_branchModel->IS_BRANCH_EXPRESS_DELIVERY = $value[20];
$_branchModel->IS_DELIVERS_GOODS = $value[21];
$_branchModel->IS_EXPRESS_DELIVERY = $value[22];
$_branchModel->IS_BRANCH_SELF_DELIVERY = $value[23];
$_branchModel->IS_HAFL_HOUR_DELIVERY = $value[24];
$_branchModel->IS_ONE_HOUR_DELIVERY = $value[25];
$_branchModel->IS_TWO_HOUR_DELIVERY = $value[26];
$_branchModel->IS_DAY_DELIVERY = $value[27];
//门店自提
$string='';
if(isset($value[19]) && !empty($value[19])){
$string.='23B70F47-45D6-4ECE-8A3A-13CC92DEA4B1,';
$string = '';
if (isset($value[19]) && !empty($value[19])) {
$string .= '23B70F47-45D6-4ECE-8A3A-13CC92DEA4B1,';
}
//门店快递配送
if(isset($value[20]) && !empty($value[20])){
$string.='1,';
if (isset($value[20]) && !empty($value[20])) {
$string .= '1,';
}
//送货上门
if(isset($value[21]) && !empty($value[21])){
$string.='2,';
if (isset($value[21]) && !empty($value[21])) {
$string .= '2,';
}
//快递配送
if(isset($value[22]) && !empty($value[22])){
$string.='3,';
if (isset($value[22]) && !empty($value[22])) {
$string .= '3,';
}
//门店自配送
if(isset($value[23]) && !empty($value[23])){
$string.='4,';
if (isset($value[23]) && !empty($value[23])) {
$string .= '4,';
}
//半小时达
if(isset($value[24]) && !empty($value[24])){
$string.='5,';
if (isset($value[24]) && !empty($value[24])) {
$string .= '5,';
}
//1小时达
if(isset($value[25]) && !empty($value[25])){
$string.='6,';
if (isset($value[25]) && !empty($value[25])) {
$string .= '6,';
}
//2小时达
if(isset($value[26]) && !empty($value[26])){
$string.='7,';
if (isset($value[26]) && !empty($value[26])) {
$string .= '7,';
}
//当日定时达
if(isset($value[27]) && !empty($value[27])){
$string.='8,';
if (isset($value[27]) && !empty($value[27])) {
$string .= '8,';
}
$string=substr($string,0,strlen($string)-1);
$_branchModel->TRANSPORT_TYPE=(string)$string;
$_servicModel =clone $servicModel;
$string = substr($string, 0, strlen($string) - 1);
$_branchModel->TRANSPORT_TYPE = (string) $string;
$_servicModel = clone $servicModel;
$_servicModel->BranchServiceDel($_branchModel->GUID);
$serviceCode = explode(',',$_branchModel->SERVICE_TYPE_CODE);
$serviceCode = explode(',', $_branchModel->SERVICE_TYPE_CODE);
$serviceArr = [];
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()) {
$transaction->rollBack();
$returnInfo = [
($key+1) => $_branchModel->errors
($key + 1) => $_branchModel->errors
];
@unlink($fileInfo['INFO'][0]);
Yii::$app->response->statusCode = 422;
......@@ -791,17 +790,17 @@ class BranchController extends BaseController
$transaction->commit();
@unlink($fileInfo['INFO'][0]);
throw new HttpException("200", '导入成功');
}catch(\Throwable $e) {
} catch (\Throwable $e) {
$transaction->rollBack();
@unlink($fileInfo['INFO'][0]);
throw $e;
}
}else{
} else {
return $fileInfo['INFO'];
}
}
}
/**
/**
* @OA\Get(
* path="/backend/web/v1/branch/branches/export-branch",
* tags={"门店&DC"},
......@@ -844,47 +843,46 @@ class BranchController extends BaseController
IS_DELIVERY_CODECHAIN_GOODS,IS_SHELVE,TRANSPORT_TYPE')
->filterWhere(
[
'RECIVER_PROVINCE' => isset($get['RECIVER_PROVINCE'])?$get['RECIVER_PROVINCE']:'',
'RECIVER_CITY' => isset($get['RECIVER_CITY'])?$get['RECIVER_CITY']:'',
'RECIVER_REGION' => isset($get['RECIVER_REGION'])?$get['RECIVER_REGION']:'',
'IS_CARE' => isset($get['IS_CARE'])?$get['IS_CARE']:'',
'IS_POINTS_SHOP' => isset($get['IS_POINTS_SHOP'])?$get['IS_POINTS_SHOP']:'',
'IS_SHELVE' => isset($get['IS_SHELVE'])?$get['IS_SHELVE']:'',
'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_O2O' => isset($get['IS_O2O'])?$get['IS_O2O']:'',
'CODE' => isset($get['CODE'])?$get['CODE']:''
'RECIVER_PROVINCE' => isset($get['RECIVER_PROVINCE']) ? $get['RECIVER_PROVINCE'] : '',
'RECIVER_CITY' => isset($get['RECIVER_CITY']) ? $get['RECIVER_CITY'] : '',
'RECIVER_REGION' => isset($get['RECIVER_REGION']) ? $get['RECIVER_REGION'] : '',
'IS_CARE' => isset($get['IS_CARE']) ? $get['IS_CARE'] : '',
'IS_POINTS_SHOP' => isset($get['IS_POINTS_SHOP']) ? $get['IS_POINTS_SHOP'] : '',
'IS_SHELVE' => isset($get['IS_SHELVE']) ? $get['IS_SHELVE'] : '',
'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_O2O' => isset($get['IS_O2O']) ? $get['IS_O2O'] : '',
'CODE' => isset($get['CODE']) ? $get['CODE'] : ''
]
)
->asArray()
->all();
$_transportArr=[];
$_transportArr = [];
foreach ($transportArr as $tKey => $tValue) {
$_transportArr[$tValue['GUID']]=$tValue['NAME'];
$_transportArr[$tValue['GUID']] = $tValue['NAME'];
}
$_branchArr=[];
$_branchArr = [];
foreach ($branchArr as $bKey => $bValue) {
if (!empty($bValue['TRANSPORT_TYPE'])) {
$transportType = explode(',', $bValue['TRANSPORT_TYPE']);
$bValue['TRANSPORT_TYPE']='';
foreach($transportType as $tempKey => $tempValue){
$bValue['TRANSPORT_TYPE'] .=$_transportArr[$tempValue].",";
$bValue['TRANSPORT_TYPE'] = '';
foreach ($transportType as $tempKey => $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;
}
}
// var_dump($_branchArr);exit;
Helper::newSpreadsheet()
->addRow(['门店编号', '门店名称', '上级部门编号','描述','联系人姓名','手机号','省','市','区','详细地址'
,'lat坐标','lng坐标','是否支持配送','配送时间','配送距离','营业时间','是否医保','是否预约门店','是否自提门店'
,'自提范围','转账手续费','收款人openid','是否O2O','是否中药熬送','是否积分兑换','是否虚拟门店'
,'是否支持冷链配送','是否营业','配送方式'])
->addRow([
'门店编号', '门店名称', '上级部门编号', '描述', '联系人姓名', '手机号', '省', '市', '区', '详细地址', 'lat坐标', 'lng坐标', '是否支持配送', '配送时间', '配送距离', '营业时间', '是否医保', '是否预约门店', '是否自提门店', '自提范围', '转账手续费', '收款人openid', '是否O2O', '是否中药熬送', '是否积分兑换', '是否虚拟门店', '是否支持冷链配送', '是否营业', '配送方式'
])
->addRows(
$_branchArr
)
->output('门店导入','Csv');
->output('门店导入', 'Csv');
} else {
return $model->errors;
}
......@@ -929,7 +927,7 @@ class BranchController extends BaseController
[
'query' => $query,
'pagination' => [
'pageSize'=>$params['pageSize']??20,
'pageSize' => $params['pageSize'] ?? 20,
]
]
);
......@@ -971,7 +969,7 @@ class BranchController extends BaseController
$result = $query->all();
$export_result = [];
foreach($result as $key=>&$value){
foreach ($result as $key => &$value) {
$export = array(
$value['NAME'],
$value['CODE'],
......@@ -980,13 +978,13 @@ class BranchController extends BaseController
$value['LAT'],
$value['LNG'],
);
array_push($export_result,$export);
array_push($export_result, $export);
}
unset($result);
Helper::newSpreadsheet()
->addRow(['门店名称','门店编号','门店电话','联系人姓名','门店地址','LAT','LNG'])
->addRow(['门店名称', '门店编号', '门店电话', '联系人姓名', '门店地址', 'LAT', 'LNG'])
->addRows($export_result)
->output("DC仓列表","Csv");
->output("DC仓列表", "Csv");
}
/**
......@@ -1055,27 +1053,27 @@ class BranchController extends BaseController
$param = Yii::$app->request->getBodyParams();
$guid = Yii::$app->request->getBodyParam('GUID');
$model = $this->modelClass::findOne($guid);
if(!$model){
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{
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{
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';//创建的场景
$model->scenario = 'dcUpdate'; //创建的场景
$other_param = array(
'UPDATE_TIME'=>date('Y-m-d H:i:s',time()),
'WORK_TIME'=>$WORK_TIME,
'DELIVERY_TIME'=>$DELIVERY_TIME,
'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());
......
backend/controllers/v1/branch/BranchServiceTypeController.php
View file @ e9625051
......@@ -17,7 +17,7 @@ use app\models\v1\rbacuser\ShopRbacUser;
class BranchServiceTypeController extends BaseController
{
public $modelClass='app\models\v1\branch\BranchServiceType';
public $modelClass = 'app\models\v1\branch\BranchServiceType';
/**
* @OA\Get(
......@@ -47,11 +47,11 @@ class BranchServiceTypeController extends BaseController
$rbac = new ShopRbacUser();
$userGuid = Yii::$app->user->identity->GUID;
$userinfo = $rbac->getRbacUserInfo($userGuid);
if($userinfo['ROLE_ID'] != USER_ROLE_HEADQUARTERS_ADMIN){
if ($userinfo['ROLE_ID'] != USER_ROLE_HEADQUARTERS_ADMIN) {
throw new BadRequestHttpException('您没有查看门店服务类目列表的权限，请联系管理员');
}
$model=new $this->modelClass();
$model = new $this->modelClass();
//用户输入数据赋值到模型属性
$model->CODE = Yii::$app->request->get('code');
$model->NAME = Yii::$app->request->get('name');
......@@ -60,7 +60,7 @@ class BranchServiceTypeController extends BaseController
//所有输入数据都有效 all inputs are valid
$code = $model->CODE;
$name = $model->NAME;
$info = $model->BranchServiceInfo($code,$name);
$info = $model->BranchServiceInfo($code, $name);
if (!$info->getModels()) {
throw new BadRequestHttpException('未找到符合的门店服务类目信息');
}
......@@ -92,14 +92,14 @@ class BranchServiceTypeController extends BaseController
*/
public function actionBranchServiceInfo()
{
$model=new $this->modelClass();
$model = new $this->modelClass();
//用户输入数据赋值到模型属性
$model->CODE = Yii::$app->request->get('code');
if ($model->validate()) {
//所有输入数据都有效 all inputs are valid
$code = $model->CODE;
$info = $model->BranchServiceInfo($code,'');
$info = $model->BranchServiceInfo($code, '');
if (!$info->getModels()) {
throw new BadRequestHttpException('未找到符合的门店服务类目信息');
}
......@@ -136,14 +136,14 @@ class BranchServiceTypeController extends BaseController
public function actionAddBranchService()
{
$model = new $this->modelClass();
$model->scenario = 'create';//创建的场景
$model->scenario = 'create'; //创建的场景
// $datetime = new \DateTime;
// $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(
'GUID'=>Func::create_guid(),
'ORG_GUID'=>Yii::$app->user->identity->ORG_GUID,
'CREATE_TIME'=>$create_time,
'GUID' => Func::create_guid(),
'ORG_GUID' => Yii::$app->user->identity->ORG_GUID,
'CREATE_TIME' => $create_time,
);
$model->setAttributes($other_param);
......@@ -184,10 +184,10 @@ class BranchServiceTypeController extends BaseController
{
$guid = Yii::$app->getRequest()->post('GUID');
$model = $this->modelClass::findOne($guid);
if(!$model){
if (!$model) {
throw new BadRequestHttpException('没有找到要修改的记录');
}
$model->scenario = 'update';//创建的场景
$model->scenario = 'update'; //创建的场景
$model->setAttributes(Yii::$app->getRequest()->post());
if ($model->save() === false && !$model->hasErrors()) {
......@@ -221,9 +221,9 @@ class BranchServiceTypeController extends BaseController
$guid = Yii::$app->getRequest()->post('GUID');
$model = new $this->modelClass();
$branchservice = $model::findOne($guid);
if(!$branchservice){
if (!$branchservice) {
throw new BadRequestHttpException('没有找到要删除的记录');
}else if ($branchservice->delete() === false) {
} else if ($branchservice->delete() === false) {
throw new ServerErrorHttpException('Failed to delete the object for unknown reason.');
}
......@@ -263,44 +263,44 @@ class BranchServiceTypeController extends BaseController
$rbac = new ShopRbacUser();
$userGuid = Yii::$app->user->identity->GUID;
$userinfo = $rbac->getRbacUserInfo($userGuid);
if($userinfo['ROLE_ID'] != USER_ROLE_HEADQUARTERS_ADMIN){
if ($userinfo['ROLE_ID'] != USER_ROLE_HEADQUARTERS_ADMIN) {
throw new BadRequestHttpException('您没有导入门店服务类目的权限，请联系管理员');
}
$model = new UploadFiles();
if (Yii::$app->request->isPost) {
//多文件用getInstances
$model->uploadFiles = UploadedFile::getInstance($model,'uploadFile');
$model->uploadFiles = UploadedFile::getInstance($model, 'uploadFile');
$fileInfo = $model->upload();
if ($fileInfo['CODE']==200) {
if ($fileInfo['CODE'] == 200) {
// 文件上传成功
$rows = Helper::newSpreadsheet($fileInfo['INFO'][0])->getRows();
$tempArr=array_slice($rows,2);
$tempArr = array_slice($rows, 2);
$branchServiceModel = new $this->modelClass();
$branchServiceModel->scenario = 'import';
$transaction=$branchServiceModel->getDb()->beginTransaction();
$transaction = $branchServiceModel->getDb()->beginTransaction();
try {
foreach ($tempArr as $key => $value) {
$_servicModel = $branchServiceModel::findOne(['CODE' => $value[0]]);
if ($_servicModel===null) {
if ($_servicModel === null) {
$_servicModel = clone $branchServiceModel;
$_servicModel->GUID=Func::create_guid();
$_servicModel->ORG_GUID=Yii::$app->user->identity->ORG_GUID;
$_servicModel->CREATE_TIME=date('Y-m-d H:i:s',time());
$_servicModel->GUID = Func::create_guid();
$_servicModel->ORG_GUID = Yii::$app->user->identity->ORG_GUID;
$_servicModel->CREATE_TIME = date('Y-m-d H:i:s', time());
}
$_servicModel->CODE=$value[0];
$_servicModel->NAME=$value[1];
$_servicModel->THEME_COLOR=$value[2];
$_servicModel->DESCRIPTION=$value[3];
$_servicModel->CODE = $value[0];
$_servicModel->NAME = $value[1];
$_servicModel->THEME_COLOR = $value[2];
$_servicModel->DESCRIPTION = $value[3];
if (!$_servicModel->save()) {
$transaction->rollBack();
$returnInfo = [
($key+1) => $_servicModel->errors
($key + 1) => $_servicModel->errors
];
return $returnInfo;
}
......@@ -308,12 +308,12 @@ class BranchServiceTypeController extends BaseController
$transaction->commit();
@unlink($fileInfo['INFO'][0]);
throw new HttpException("200", '导入成功');
}catch(\Throwable $e) {
} catch (\Throwable $e) {
$transaction->rollBack();
@unlink($fileInfo['INFO'][0]);
throw $e;
}
}else{
} else {
return $fileInfo['INFO'];
}
}
......@@ -336,19 +336,19 @@ class BranchServiceTypeController extends BaseController
$params = Yii::$app->request->queryParams;
$model->attributes = $params;
if(!$model->validate()){
throw new HttpException(422,json_encode($model->errors));
if (!$model->validate()) {
throw new HttpException(422, json_encode($model->errors));
}
$list = $model->BranchServiceExport($params);
if(!$list){
if (!$list) {
throw new BadRequestHttpException('未找到符合条件的数据');
}
$name = '门店服务类目'.date('Y-m-d',time());
$name = '门店服务类目' . date('Y-m-d', time());
return Helper::newSpreadsheet()
->addRow(['服务类目名称','服务类目编号','服务类目描述','主体颜色','创建时间'])
->addRow(['服务类目名称', '服务类目编号', '服务类目描述', '主体颜色', '创建时间'])
->addRows($list)
->output($name,'Csv');
->output($name, 'Csv');
}
}
backend/controllers/v1/shopuser/ShopUserController.php → backend/controllers/v1/shopuser/ShopEmployeeController.php
View file @ e9625051
......@@ -12,13 +12,13 @@ use yii\web\UploadedFile;
use yii\web\BadRequestHttpException;
use yii\web\HttpException;
class ShopUserController extends BaseController
class ShopEmployeeController extends BaseController
{
public $modelClass = 'app\models\v1\shopuser\ShopUser';
public $modelClass = 'app\models\v1\shopuser\ShopEmployee';
/**
* @OA\GET(
* path="/backend/web/v1/shopuser/shop-users/employee-list",
* path="/backend/web/v1/shopuser/shop-employees/employee-list",
* tags={"用户&员工接口"},
* summary="员工信息列表(侯贺政)",
* description="员工信息列表",
......@@ -55,7 +55,7 @@ class ShopUserController extends BaseController
/**
* @OA\GET(
* path="/backend/web/v1/shopuser/shop-users/employee-info",
* path="/backend/web/v1/shopuser/shop-employees/employee-info",
* tags={"用户&员工接口"},
* summary="员工信息详情(侯贺政)",
* description="某员工的信息详情",
......@@ -92,7 +92,7 @@ class ShopUserController extends BaseController
/**
* @OA\Post(
* path="/backend/web/v1/shopuser/shop-users/employee-import",
* path="/backend/web/v1/shopuser/shop-employees/employee-import",
* tags={"用户&员工接口"},
* summary="导入员工信息(侯贺政)",
* description="导入员工的信息,员工已存在为更新，不存在则新建",
......
backend/controllers/v1/shopuser/UserComplainController.php
View file @ e9625051
......@@ -9,27 +9,24 @@ use yii\web\BadRequestHttpException;
class UserComplainController extends BaseController
{
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={"用户&员工接口"},
* description="留言信息列表",
* summary="留言信息列表(孙磊)",
* operationId="UserComplain",
* @OA\Parameter(name="page",in="query",description="分页页码",@OA\Schema(type="int")),
* @OA\Parameter(name="phone",in="query",description="用户电话",@OA\Schema(type="string")),
* @OA\Response(response="200",description="OK。一切正常"),
* security={{"Authorization": {}}}
* )
*/
public $modelClass = 'app\models\v1\shopuser\UserComplain';
/**
* @OA\Get(
* path="/backend/web/v1/shopuser/user-complains/user-complain",
* tags={"用户&员工接口"},
* description="留言信息列表",
* summary="留言信息列表(孙磊)",
* operationId="UserComplain",
* @OA\Parameter(name="page",in="query",description="分页页码",@OA\Schema(type="int")),
* @OA\Parameter(name="phone",in="query",description="用户电话",@OA\Schema(type="string")),
* @OA\Response(response="200",description="OK。一切正常"),
* security={{"Authorization": {}}}
* )
*/
public function actionUserComplain()
{
$model=new UserComplain();
$model = new UserComplain();
//用户输入数据赋值到模型属性
$model->TS_PHONE = Yii::$app->request->get('phone');
......@@ -47,5 +44,4 @@ class UserComplainController extends BaseController
return $errors;
}
}
}
backend/controllers/v1/shopuser/UserDepartmentController.php
View file @ e9625051
......@@ -9,12 +9,9 @@ use yii\web\BadRequestHttpException;
class UserDepartmentController extends BaseController
{
public $modelClass='app\models\v1\shopuser\UserDepartment';
// public $serializer = [
// 'class' => 'yii\rest\Serializer',
// 'collectionEnvelope' => 'userdepartment',
// ];
/**
public $modelClass = 'app\models\v1\shopuser\UserDepartment';
/**
* @OA\Get(
* path="/backend/web/v1/shopuser/user-departments/department",
* tags={"用户&员工接口"},
......@@ -30,7 +27,7 @@ class UserDepartmentController extends BaseController
*/
public function actionDepartment()
{
$model=new UserDepartment();
$model = new UserDepartment();
//用户输入数据赋值到模型属性
$model->CODE = Yii::$app->request->get('code');
$model->NAME = Yii::$app->request->get('name');
......@@ -39,7 +36,7 @@ class UserDepartmentController extends BaseController
//所有输入数据都有效 all inputs are valid
$code = $model->CODE;
$name = $model->NAME;
$info = $model->DepartmentInfo($code,$name);
$info = $model->DepartmentInfo($code, $name);
if (!$info->getModels()) {
throw new BadRequestHttpException('未找到符合的部门信息');
}
......
backend/controllers/v1/transport/TransportInitialPriceController.php
View file @ e9625051
......@@ -52,9 +52,9 @@ class TransportInitialPriceController extends BaseController
$rbac = new ShopRbacUser();
$userGuid = Yii::$app->user->identity->GUID;
$userinfo = $rbac->getRbacUserInfo($userGuid);
if($userinfo){
if ($userinfo) {
$params['BRANCH_GUID'] = $userinfo['BRANCH_GUID'];
}else{
} else {
$params['BRANCH_GUID'] = '';
}
$params['BRANCH_GUID'] = 003;
......@@ -99,11 +99,11 @@ class TransportInitialPriceController extends BaseController
$guid = $param['GUID'];
$model = $this->modelClass::findOne($guid);
if(!$model){
if (!$model) {
throw new BadRequestHttpException('没有找到要修改的记录');
}
//门店起送价修改
$model->scenario = 'update';//创建的场景
$model->scenario = 'update'; //创建的场景
$model->setAttributes($param);
if ($model->save() === false && !$model->hasErrors()) {
......@@ -144,22 +144,22 @@ class TransportInitialPriceController extends BaseController
$model = new UploadFiles();
if (Yii::$app->request->isPost) {
//多文件用getInstances
$model->uploadFiles = UploadedFile::getInstance($model,'uploadFile');
$model->uploadFiles = UploadedFile::getInstance($model, 'uploadFile');
$fileInfo = $model->upload();
if ($fileInfo['CODE']==200) {
if ($fileInfo['CODE'] == 200) {
// 文件上传成功
$rows = Helper::newSpreadsheet($fileInfo['INFO'][0])->getRows();
$tempArr=array_slice($rows,2);
$tempArr = array_slice($rows, 2);
$citydisregion = new $this->modelClass();
$citydisregion->scenario = 'import';
$transaction=$citydisregion->getDb()->beginTransaction();
$transaction = $citydisregion->getDb()->beginTransaction();
try {
foreach ($tempArr as $key => $value) {
$CS_BRANCH_GUID = Yii::$app->user->identity->ORG_GUID.'-'.$value[0];
$_citydisregion = $citydisregion->getBranchInitialPrice('',$CS_BRANCH_GUID);
$CS_BRANCH_GUID = Yii::$app->user->identity->ORG_GUID . '-' . $value[0];
$_citydisregion = $citydisregion->getBranchInitialPrice('', $CS_BRANCH_GUID);
// $_citydisregion = $citydisregion->getBranchInitialPrice('',003);
//权限信息
$rbac = new ShopRbacUser();
......@@ -167,36 +167,36 @@ class TransportInitialPriceController extends BaseController
$userinfo = $rbac->getRbacUserInfo($userGuid);
//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();
// $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;
}
}else if($userinfo['ROLE_ID'] == USER_ROLE_STORE_ADMIN){//如果是门店
if($userinfo['BRANCH_GUID'] != $CS_BRANCH_GUID){
} else if ($userinfo['ROLE_ID'] == USER_ROLE_STORE_ADMIN) { //如果是门店
if ($userinfo['BRANCH_GUID'] != $CS_BRANCH_GUID) {
continue;
}
}
//修改已有的起送价设置
if(!$list = $_citydisregion->getModels()){
if (!$list = $_citydisregion->getModels()) {
continue;
}else{
} else {
//更新起送价
$GUID = $list[0]['GUID'];
$_cdrModel = $citydisregion::findOne(['GUID' => $GUID]);
if(empty($value[1])){
$value[1]=0;
if (empty($value[1])) {
$value[1] = 0;
}
$_cdrModel->INITIAL_PRICE=$value[1];
$_cdrModel->INITIAL_PRICE = $value[1];
if (!$_cdrModel->save()) {
$transaction->rollBack();
$returnInfo = [
($key+1) => $_cdrModel->errors
($key + 1) => $_cdrModel->errors
];
return $returnInfo;
}
......@@ -205,12 +205,12 @@ class TransportInitialPriceController extends BaseController
$transaction->commit();
@unlink($fileInfo['INFO'][0]);
throw new HttpException("200", '导入成功');
}catch(\Throwable $e) {
} catch (\Throwable $e) {
$transaction->rollBack();
@unlink($fileInfo['INFO'][0]);
throw $e;
}
}else{
} else {
return $fileInfo['INFO'];
}
}
......
backend/controllers/v1/transport/TransportSettingController.php
View file @ e9625051
......@@ -178,6 +178,7 @@ class TransportSettingController extends BaseController
{
$params = Yii::$app->request->bodyParams;
$model = new $this->modelClass();
$model->scenario = 'update';
$_model = $model::findOne($params['GUID']);
if (!$_model) {
throw new BadRequestHttpException('Requested resource does not exist !');
......@@ -191,18 +192,7 @@ class TransportSettingController extends BaseController
throw new BadRequestHttpException('没有修改权限！');
}
$_model->attributes = [
"TRANSPOR_TTYPE" => $params['TRANSPOR_TTYPE'],
"BASE_FEE" => is_numeric($params['BASE_FEE']) ? $params['BASE_FEE'] : 0,
"BASE_WEIGHT" => is_numeric($params['BASE_WEIGHT']) ? $params['BASE_WEIGHT'] : '0',
"BASE_WEIGHT_FEE" => is_numeric($params['BASE_WEIGHT_FEE']) ? $params['BASE_WEIGHT_FEE'] : 0,
"INCREASE_WEIGHT" => is_numeric($params['INCREASE_WEIGHT']) ? $params['INCREASE_WEIGHT'] : '0',
"INCREASE_WEIGHT_FEE" => is_numeric($params['INCREASE_WEIGHT_FEE']) ? $params['INCREASE_WEIGHT_FEE'] : 0,
"IS_USED" => is_null($params['IS_USED']) ? 1 : $params['IS_USED'],
"DESCRIPTION" => $params['DESCRIPTION'],
"LIMIT_MEMBER_GROUP_GUID" => $params['LIMIT_MEMBER_GROUP_GUID'],
"SELECT_AREA" => $params['SELECT_AREA'],
];
$_model->attributes = $params;
//删除条件：总部权限删除所有，省级只能删除自己。
switch ($userInfo['ROLE_ID']) {
......@@ -371,24 +361,17 @@ class TransportSettingController extends BaseController
{
$params = Yii::$app->request->bodyParams;
$userInfo = (new ShopRbacUser)->getRbacUserInfo(Yii::$app->user->identity->GUID);
//只有总部和省级可以添加
if (!in_array($userInfo['ROLE_ID'],[USER_ROLE_REGION_ADMIN,USER_ROLE_HEADQUARTERS_ADMIN])) {
throw new BadRequestHttpException('没有添加权限！');
}
$model = new $this->modelClass();
$model->scenario = 'creation';
$model->attributes = [
"GUID" => Func::create_guid(),
"ORG_GUID" => Yii::$app->user->identity->ORG_GUID,
"TRANSPOR_TTYPE" => $params['TRANSPOR_TTYPE'],
"BASE_FEE" => is_numeric($params['BASE_FEE']) ? $params['BASE_FEE'] : 0,
"BASE_WEIGHT" => is_numeric($params['BASE_WEIGHT']) ? $params['BASE_WEIGHT'] : '0',
"BASE_WEIGHT_FEE" => is_numeric($params['BASE_WEIGHT_FEE']) ? $params['BASE_WEIGHT_FEE'] : 0,
"INCREASE_WEIGHT" => is_numeric($params['INCREASE_WEIGHT']) ? $params['INCREASE_WEIGHT'] : '0',
"INCREASE_WEIGHT_FEE" => is_numeric($params['INCREASE_WEIGHT_FEE']) ? $params['INCREASE_WEIGHT_FEE'] : 0,
"IS_USED" => is_null($params['IS_USED']) ? 1 : $params['IS_USED'],
"DESCRIPTION" => $params['DESCRIPTION'],
"LIMIT_MEMBER_GROUP_GUID" => $params['LIMIT_MEMBER_GROUP_GUID'],
"SELECT_AREA" => $params['SELECT_AREA'],
"GROUP_GUID" => $userInfo['BRANCH_GUID'],
"PLATFORM_TYPE" => empty($params['PLATFORM_TYPE']) ? 'shop' : $params['PLATFORM_TYPE'],
];
$model->attributes = $params;
$model->GUID = Func::create_guid();
$model->ORG_GUID = Yii::$app->user->identity->ORG_GUID;
$model->GROUP_GUID = $userInfo['BRANCH_GUID'];
//开启事务
$packagingcostsBranches = new ShopPackagingcostsBranches();
......
backend/models/v1/branch/BranchServiceType.php
View file @ e9625051
......@@ -5,6 +5,7 @@ namespace app\models\v1\branch;
use Yii;
use app\models\v1\BaseModel;
use yii\data\ActiveDataProvider;
/**
* This is the model class for table "shop_branch_service_type".
*
......@@ -32,15 +33,15 @@ class BranchServiceType extends BaseModel
public function rules()
{
return [
[['GUID'], 'required','on'=>['create','update']],
[['GUID'], 'required', 'on' => ['create', 'update']],
[['CREATE_TIME'], 'safe'],
[['GUID', 'ORG_GUID', 'CODE', 'NAME'], 'string', 'max' => 50],
[['THEME_COLOR', 'DESCRIPTION'], 'string', 'max' => 255],
[['GUID'], 'unique'],
[['CODE','NAME'], 'required','on'=>['import'] ,'message' => '{attribute}不能为空'],
[['DESCRIPTION'],'string', 'max' => 100,'on'=>['import'],'tooLong'=>'最大长度不能超过100'],
[['NAME'],'string', 'max' => 50,'on'=>['import'],'tooLong'=>'{attribute}最大长度不能超过50'],
[['CODE', 'NAME'], 'required', 'on' => ['import'], 'message' => '{attribute}不能为空'],
[['DESCRIPTION'], 'string', 'max' => 100, 'on' => ['import'], 'tooLong' => '最大长度不能超过100'],
[['NAME'], 'string', 'max' => 50, 'on' => ['import'], 'tooLong' => '{attribute}最大长度不能超过50'],
];
}
......@@ -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');
......@@ -107,11 +108,11 @@ class BranchServiceType extends BaseModel
}
$list = [];
foreach($query->all() as $request){
foreach ($query->all() as $request) {
$list[] = $request->toArray();
}
foreach($list as $key => $value){
foreach ($list as $key => $value) {
$row_list[] = [
$value['NAME'], //服务类目名称
$value['CODE'], //服务类目编号
......
backend/models/v1/branch/ShopBranch.php
View file @ e9625051
......@@ -96,16 +96,16 @@ class ShopBranch extends BaseModel
}
const SCENARIO_DCUPDATE = 'dcUpdate';
public $IS_BRANCH_SELF_MENTION;//是否门店自提
public $IS_BRANCH_EXPRESS_DELIVERY;//是否门店快递配送
public $IS_DELIVERS_GOODS;//是否送货上门
public $IS_EXPRESS_DELIVERY;//是否快递配送
public $IS_BRANCH_SELF_DELIVERY;//是否门店自配送
public $IS_HAFL_HOUR_DELIVERY;//是否半小时达
public $IS_ONE_HOUR_DELIVERY;//是否1小时达
public $IS_TWO_HOUR_DELIVERY;//是否2小时达
public $IS_DAY_DELIVERY;//是否当日定时达
public $SERVICE_TYPE_CODE;//服务门店CODE
public $IS_BRANCH_SELF_MENTION; //是否门店自提
public $IS_BRANCH_EXPRESS_DELIVERY; //是否门店快递配送
public $IS_DELIVERS_GOODS; //是否送货上门
public $IS_EXPRESS_DELIVERY; //是否快递配送
public $IS_BRANCH_SELF_DELIVERY; //是否门店自配送
public $IS_HAFL_HOUR_DELIVERY; //是否半小时达
public $IS_ONE_HOUR_DELIVERY; //是否1小时达
public $IS_TWO_HOUR_DELIVERY; //是否2小时达
public $IS_DAY_DELIVERY; //是否当日定时达
public $SERVICE_TYPE_CODE; //服务门店CODE
public $search; //门店编码或名称搜索
/**
......@@ -115,9 +115,11 @@ class ShopBranch extends BaseModel
public function scenarios()
{
$scenarios = parent::scenarios();
$scenarios[self::SCENARIO_DCUPDATE] = ['NAME','BRANCH_NAME', 'RECIVER_PROVINCE', 'RECIVER_CITY','RECIVER_REGION','ADDRESS','PHONE',
'CONTACT_NAME','BRANCH_TYPE','LAT','LNG','IS_SHELVE','WORK_TIME','DELIVERY_TIME','RETURN_ADDRESS','DESCRIPTION',
'UPDATE_TIME'];
$scenarios[self::SCENARIO_DCUPDATE] = [
'NAME', 'BRANCH_NAME', 'RECIVER_PROVINCE', 'RECIVER_CITY', 'RECIVER_REGION', 'ADDRESS', 'PHONE',
'CONTACT_NAME', 'BRANCH_TYPE', 'LAT', 'LNG', 'IS_SHELVE', 'WORK_TIME', 'DELIVERY_TIME', 'RETURN_ADDRESS', 'DESCRIPTION',
'UPDATE_TIME'
];
return $scenarios;
}
/**
......@@ -158,9 +160,9 @@ class ShopBranch extends BaseModel
'IS_DAY_DELIVERY'
], 'in', 'range' => [0, 1], 'on' => ['import'], 'message' => '{attribute}只能为0或1'],
[['SERVICE_TYPE_CODE'], 'validateEffective'],//如果影响性能就注释掉
[['BRANCH_NAME', 'NAME','BRANCH_TYPE'], 'required','on'=>[self::SCENARIO_DCUPDATE]],
[['BRANCH_TYPE'], 'in', 'range' => [1, 2],'on'=>[self::SCENARIO_DCUPDATE]],
[['SERVICE_TYPE_CODE'], 'validateEffective'], //如果影响性能就注释掉
[['BRANCH_NAME', 'NAME', 'BRANCH_TYPE'], 'required', 'on' => [self::SCENARIO_DCUPDATE]],
[['BRANCH_TYPE'], 'in', 'range' => [1, 2], 'on' => [self::SCENARIO_DCUPDATE]],
[['search'], 'string', 'on' => 'search'],
];
}
......@@ -376,24 +378,24 @@ class ShopBranch extends BaseModel
{
return $query = static::find()
->select('GUID,NAME')
->where(['BRANCH_TYPE'=>1])
->where(['BRANCH_TYPE' => 1])
->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()
->select('GUID,NAME')
->where(['BRANCH_TYPE'=>2])
->andWhere(['PARENT_GUID'=>$SUPPROVINCE_GUID])
->where(['BRANCH_TYPE' => 2])
->andWhere(['PARENT_GUID' => $SUPPROVINCE_GUID])
->asArray()
->all();
}
if(!empty($flag) && !empty($SUPPROVINCE_GUID)){
if (!empty($flag) && !empty($SUPPROVINCE_GUID)) {
return $query = static::find()
->select('GUID,NAME')
->andWhere(['PARENT_GUID'=>$SUPPROVINCE_GUID])
->andWhere(['PARENT_GUID' => $SUPPROVINCE_GUID])
->asArray()
->all();
}
......@@ -455,7 +457,7 @@ class ShopBranch extends BaseModel
}
$query = static::find()
->select(['GUID', 'NAME', 'CODE', 'RECIVER_PROVINCE as PROVINCE', 'RECIVER_CITY as CITY', 'RECIVER_REGION as REGION'])
->where('BRANCH_TYPE=1')
->where(['BRANCH_TYPE' => BRANCH_TYPE_REGION])
->andFilterWhere($where)
->andfilterWhere(['or', ['like', 'CODE', $search], ['like', 'NAME', $search]]);
......
backend/models/v1/branch/ShopBranchScore.php
View file @ e9625051
......@@ -4,7 +4,6 @@ namespace app\models\v1\branch;
use Yii;
use app\models\v1\BaseModel;
use backend\helpers\Func;
use yii\data\ActiveDataProvider;
/**
......
backend/models/v1/branch/ShopBranchService.php
View file @ e9625051
......@@ -31,11 +31,11 @@ class ShopBranchService extends BaseModel
public function rules()
{
return [
[['GUID'], 'required','on'=>['create','update']],
[['GUID'], 'required', 'on' => ['create', 'update']],
[['STATE'], 'integer'],
[['GUID', 'BRANCH_GUID', 'SERVICE_TYPE_GUID'], 'string', 'max' => 50],
[['ORDER_INDEX'], 'string', 'max' => 5],
[['GUID'], 'unique','on'=>['create']],
[['GUID'], 'unique', 'on' => ['create']],
];
}
......@@ -55,7 +55,7 @@ class ShopBranchService extends BaseModel
//删除门店原有服务类目
public function BranchServiceDel($b_guid)
{
$branch_service = static::deleteAll(['BRANCH_GUID'=>$b_guid]);
$branch_service = static::deleteAll(['BRANCH_GUID' => $b_guid]);
return $branch_service;
}
//获取门店服务类目关系
......@@ -63,12 +63,11 @@ class ShopBranchService extends BaseModel
{
$branch_service = static::find()
->select('GUID,BRANCH_GUID,SERVICE_TYPE_GUID')
->where(['STATE'=>1])
->andwhere(['BRANCH_GUID'=>$b_guid])
->where(['STATE' => 1])
->andwhere(['BRANCH_GUID' => $b_guid])
->asArray()
->all();
return $branch_service;
}
}
backend/models/v1/branch/ShopCityDistributionRegion.php
View file @ e9625051
<?php
namespace app\models\v1\branch;
use Yii;
......@@ -40,17 +41,17 @@ class ShopCityDistributionRegion extends BaseModel
public function rules()
{
return [
[['GUID','SORT','COLORS','DIVIDE_TYPE','REGION_R','REGION_RANGE','INITIAL_PRICE','DELIVERY_PRICE'], 'required','on'=>"save"],
[['DIVIDE_TYPE'], 'in', 'range' => [1, 2],'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"],
[['SORT'], 'integer'],
[['REGION_RANGE','COLORS'], 'string'],
[['INITIAL_PRICE', 'DELIVERY_PRICE','REGION_R'], 'double'],
[['REGION_RANGE', 'COLORS'], 'string'],
[['INITIAL_PRICE', 'DELIVERY_PRICE', 'REGION_R'], 'double'],
[['GUID', 'REGION_RANGE'], 'required','on'=>['create']],
[['GUID'],'required','on'=>['update']],
[['GUID', 'ORG_GUID', 'CITY_DISTR_GUID', 'ORDEX', 'COLORS', 'WEEK', 'IS_TYPE'], 'string', 'max' => 50,'on'=>['create']],
[['GUID'], 'unique','on'=>['create']],
[['INITIAL_PRICE'], 'required','on'=>['import'] ,'message' => '{attribute}不能为空'],
[['GUID', 'REGION_RANGE'], 'required', 'on' => ['create']],
[['GUID'], 'required', 'on' => ['update']],
[['GUID', 'ORG_GUID', 'CITY_DISTR_GUID', 'ORDEX', 'COLORS', 'WEEK', 'IS_TYPE'], 'string', 'max' => 50, 'on' => ['create']],
[['GUID'], 'unique', 'on' => ['create']],
[['INITIAL_PRICE'], 'required', 'on' => ['import'], 'message' => '{attribute}不能为空'],
];
}
......@@ -83,29 +84,29 @@ class ShopCityDistributionRegion extends BaseModel
return $this->hasOne(ShopCityDistributionSetting::className(), ['GUID' => 'CITY_DISTR_GUID']);
}
//获取门店起送价
public function getBranchInitialPrice($params,$guid='')
public function getBranchInitialPrice($params, $guid = '')
{
$query = static::find()->alias('sg')
->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_BRANCH sb','sb.GUID=cs.BRANCH_GUID')
->leftJoin('SHOP_BRANCH sb', 'sb.GUID=cs.BRANCH_GUID')
->where(['cs.SETTING_TYPE' => 2]);
//门店名称或编码
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'])) {
$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(['!=','sg.GUID','']);
$query->andWhere(['!=', 'sg.GUID', '']);
}
//批量修改 条件
if(isset($guid) && !empty($guid)){
$query->andFilterWhere(['=','cs.BRANCH_GUID',$guid]);
$query->andWhere(['!=','sg.GUID','']);
if (isset($guid) && !empty($guid)) {
$query->andFilterWhere(['=', 'cs.BRANCH_GUID', $guid]);
$query->andWhere(['!=', 'sg.GUID', '']);
}
return new ActiveDataProvider([
......
backend/models/v1/branch/ShopCityDistributionSetting.php
View file @ e9625051
<?php
namespace app\models\v1\branch;
use Yii;
......@@ -58,20 +59,20 @@ class ShopCityDistributionSetting extends BaseModel
public function rules()
{
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'],
[['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_INFO'],'match', 'pattern' => '/^[\x{4e00}-\x{9fa5}A-Za-z0-9_]+$/u','message'=>'只能包含中文汉字，字母，数字','on' => 'search'],
[['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'], 'required','when' => function($model) {
[['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}不能为空'],
[['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) {
return $model->REGION_TYPE == '2';
},'message' => '{attribute}不能为空','on'=>['o2o_update']],
[['DELIVERY_PRICE'], 'required','when' => function($model) {
}, 'message' => '{attribute}不能为空', 'on' => ['o2o_update']],
[['DELIVERY_PRICE'], 'required', 'when' => function ($model) {
return $model->REGION_TYPE == '1';
},'message' => '{attribute}不能为空','on'=>['o2o_update']],
}, 'message' => '{attribute}不能为空', 'on' => ['o2o_update']],
];
}
......@@ -134,41 +135,41 @@ class ShopCityDistributionSetting extends BaseModel
//根据条件查询门店
$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 ")
->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')
->groupBy('sb.GUID')
->asArray();
//门店名称或编码
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'])) {
$branch_query->andfilterWhere(['sb.RECIVER_PROVINCE'=>$params['province']]);
$branch_query->andfilterWhere(['sb.RECIVER_PROVINCE' => $params['province']]);
}
if (isset($params['city'])) {
$branch_query->andfilterWhere(['sb.RECIVER_CITY'=>$params['city']]);
$branch_query->andfilterWhere(['sb.RECIVER_CITY' => $params['city']]);
}
if (isset($params['region'])) {
$branch_query->andfilterWhere(['sb.RECIVER_REGION'=>$params['region']]);
$branch_query->andfilterWhere(['sb.RECIVER_REGION' => $params['region']]);
}
//是否o2o、b2c
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");
$branch_query->andfilterWhere(['exists',$setting_query]);
}else if($params['b2c_issetting']=='0'){
$branch_query->andfilterWhere(['exists', $setting_query]);
} else if ($params['b2c_issetting'] == '0') {
$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($params['o2o_issetting']=='1'){
if ($params['o2o_issetting'] == '1') {
$setting_query = $this::find()->where("SETTING_TYPE='2' AND BRANCH_GUID = sb.GUID");
$branch_query->andfilterWhere(['exists',$setting_query]);
}else if($params['o2o_issetting']=='0'){
$branch_query->andfilterWhere(['exists', $setting_query]);
} else if ($params['o2o_issetting'] == '0') {
$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
{
//门店信息
$branch_info = ShopBranch::find()
->where(["GUID"=>$branchguid])
->where(["GUID" => $branchguid])
->select("GUID,NAME,LAT,LNG,ADDRESS")
->asArray()
->one();
......@@ -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";
$setting_info = $this->find()->alias("cds")
->select($select)
->where(["cds.BRANCH_GUID"=>$branchguid])
->leftJoin("shop_city_distribution_region cdr","cdr.CITY_DISTR_GUID=cds.GUID")
->where(["cds.BRANCH_GUID" => $branchguid])
->leftJoin("shop_city_distribution_region cdr", "cdr.CITY_DISTR_GUID=cds.GUID")
->asArray()
->all();
//整合数组
$o2o = [];
$b2c = [];
foreach($setting_info as $key=>$value){
if($value['SETTING_TYPE']=='1'){
if(empty($b2c['GUID'])){
foreach ($setting_info as $key => $value) {
if ($value['SETTING_TYPE'] == '1') {
if (empty($b2c['GUID'])) {
$b2c['GUID'] = $value['SETTING_GUID'];
$b2c['REGION_TYPE'] = $value['REGION_TYPE'];
$b2c['REGION_DISTR_DISTANCE'] = $value['REGION_DISTR_DISTANCE'];
......@@ -213,40 +214,40 @@ class ShopCityDistributionSetting extends BaseModel
$b2c['STATUS'] = $value['STATUS'];
$b2c['SETTING_TYPE'] = $value['SETTING_TYPE'];
$b2c['REGION'] = [];
if(!empty($value['REGION_GUID'])){
array_push($b2c['REGION'],array(
"GUID"=>$value['REGION_GUID'],
"SORT"=>$value['SORT'],
"CITY_DISTR_GUID"=>$value['CITY_DISTR_GUID'],
"COLORS"=>$value['COLORS'],
"DIVIDE_TYPE"=>$value['DIVIDE_TYPE'],
"REGION_R"=>$value['REGION_R'],
"REGION_RANGE"=>$value['REGION_RANGE'],
"INITIAL_PRICE"=>$value['INITIAL_PRICE'],
"DELIVERY_PRICE"=>$value['DELIVERY_PRICE'],
"WEEK"=>$value['WEEK'],
"IS_TYPE"=>$value['IS_TYPE'],
if (!empty($value['REGION_GUID'])) {
array_push($b2c['REGION'], array(
"GUID" => $value['REGION_GUID'],
"SORT" => $value['SORT'],
"CITY_DISTR_GUID" => $value['CITY_DISTR_GUID'],
"COLORS" => $value['COLORS'],
"DIVIDE_TYPE" => $value['DIVIDE_TYPE'],
"REGION_R" => $value['REGION_R'],
"REGION_RANGE" => $value['REGION_RANGE'],
"INITIAL_PRICE" => $value['INITIAL_PRICE'],
"DELIVERY_PRICE" => $value['DELIVERY_PRICE'],
"WEEK" => $value['WEEK'],
"IS_TYPE" => $value['IS_TYPE'],
));
}
}else{
if(!empty($value['REGION_GUID'])){
array_push($b2c['REGION'],array(
"GUID"=>$value['REGION_GUID'],
"SORT"=>$value['SORT'],
"CITY_DISTR_GUID"=>$value['CITY_DISTR_GUID'],
"COLORS"=>$value['COLORS'],
"DIVIDE_TYPE"=>$value['DIVIDE_TYPE'],
"REGION_R"=>$value['REGION_R'],
"REGION_RANGE"=>$value['REGION_RANGE'],
"INITIAL_PRICE"=>$value['INITIAL_PRICE'],
"DELIVERY_PRICE"=>$value['DELIVERY_PRICE'],
"WEEK"=>$value['WEEK'],
"IS_TYPE"=>$value['IS_TYPE'],
} else {
if (!empty($value['REGION_GUID'])) {
array_push($b2c['REGION'], array(
"GUID" => $value['REGION_GUID'],
"SORT" => $value['SORT'],
"CITY_DISTR_GUID" => $value['CITY_DISTR_GUID'],
"COLORS" => $value['COLORS'],
"DIVIDE_TYPE" => $value['DIVIDE_TYPE'],
"REGION_R" => $value['REGION_R'],
"REGION_RANGE" => $value['REGION_RANGE'],
"INITIAL_PRICE" => $value['INITIAL_PRICE'],
"DELIVERY_PRICE" => $value['DELIVERY_PRICE'],
"WEEK" => $value['WEEK'],
"IS_TYPE" => $value['IS_TYPE'],
));
}
}
}else if($value['SETTING_TYPE']=='2'){
if(empty($o2o['GUID'])){
} else if ($value['SETTING_TYPE'] == '2') {
if (empty($o2o['GUID'])) {
$o2o['GUID'] = $value['SETTING_GUID'];
$o2o['REGION_TYPE'] = $value['REGION_TYPE'];
$o2o['REGION_DISTR_DISTANCE'] = $value['REGION_DISTR_DISTANCE'];
......@@ -256,35 +257,35 @@ class ShopCityDistributionSetting extends BaseModel
$o2o['STATUS'] = $value['STATUS'];
$o2o['SETTING_TYPE'] = $value['SETTING_TYPE'];
$o2o['REGION'] = [];
if(!empty($value['REGION_GUID'])){
array_push($o2o['REGION'],array(
"GUID"=>$value['REGION_GUID'],
"SORT"=>$value['SORT'],
"CITY_DISTR_GUID"=>$value['CITY_DISTR_GUID'],
"COLORS"=>$value['COLORS'],
"DIVIDE_TYPE"=>$value['DIVIDE_TYPE'],
"REGION_R"=>$value['REGION_R'],
"REGION_RANGE"=>$value['REGION_RANGE'],
"INITIAL_PRICE"=>$value['INITIAL_PRICE'],
"DELIVERY_PRICE"=>$value['DELIVERY_PRICE'],
"WEEK"=>$value['WEEK'],
"IS_TYPE"=>$value['IS_TYPE'],
if (!empty($value['REGION_GUID'])) {
array_push($o2o['REGION'], array(
"GUID" => $value['REGION_GUID'],
"SORT" => $value['SORT'],
"CITY_DISTR_GUID" => $value['CITY_DISTR_GUID'],
"COLORS" => $value['COLORS'],
"DIVIDE_TYPE" => $value['DIVIDE_TYPE'],
"REGION_R" => $value['REGION_R'],
"REGION_RANGE" => $value['REGION_RANGE'],
"INITIAL_PRICE" => $value['INITIAL_PRICE'],
"DELIVERY_PRICE" => $value['DELIVERY_PRICE'],
"WEEK" => $value['WEEK'],
"IS_TYPE" => $value['IS_TYPE'],
));
}
}else{
if(!empty($value['REGION_GUID'])){
array_push($o2o['REGION'],array(
"GUID"=>$value['REGION_GUID'],
"SORT"=>$value['SORT'],
"CITY_DISTR_GUID"=>$value['CITY_DISTR_GUID'],
"COLORS"=>$value['COLORS'],
"DIVIDE_TYPE"=>$value['DIVIDE_TYPE'],
"REGION_R"=>$value['REGION_R'],
"REGION_RANGE"=>$value['REGION_RANGE'],
"INITIAL_PRICE"=>$value['INITIAL_PRICE'],
"DELIVERY_PRICE"=>$value['DELIVERY_PRICE'],
"WEEK"=>$value['WEEK'],
"IS_TYPE"=>$value['IS_TYPE'],
} else {
if (!empty($value['REGION_GUID'])) {
array_push($o2o['REGION'], array(
"GUID" => $value['REGION_GUID'],
"SORT" => $value['SORT'],
"CITY_DISTR_GUID" => $value['CITY_DISTR_GUID'],
"COLORS" => $value['COLORS'],
"DIVIDE_TYPE" => $value['DIVIDE_TYPE'],
"REGION_R" => $value['REGION_R'],
"REGION_RANGE" => $value['REGION_RANGE'],
"INITIAL_PRICE" => $value['INITIAL_PRICE'],
"DELIVERY_PRICE" => $value['DELIVERY_PRICE'],
"WEEK" => $value['WEEK'],
"IS_TYPE" => $value['IS_TYPE'],
));
}
}
......
backend/models/v1/rbacuser/ShopRbacRole.php
View file @ e9625051
......@@ -75,8 +75,8 @@ class ShopRbacRole extends BaseModel
->where(['STATUS' => 1])
->orderBy('SORT ASC');
if(isset($ID) && !empty($ID)){
$query->andFilterWhere(['=','ID',$ID]);
if (isset($ID) && !empty($ID)) {
$query->andFilterWhere(['=', 'ID', $ID]);
}
return new ActiveDataProvider([
......
backend/models/v1/rbacuser/ShopRbacRoleAccess.php
View file @ e9625051
......@@ -29,7 +29,7 @@ class ShopRbacRoleAccess extends BaseModel
public function rules()
{
return [
[['NODE_ID'], 'required','on'=>['create']],
[['NODE_ID'], 'required', 'on' => ['create']],
[['ROLE_ID', 'NODE_ID'], 'string', 'max' => 20],
[['ORG_GUID'], 'string', 'max' => 50],
];
......@@ -58,7 +58,7 @@ class ShopRbacRoleAccess extends BaseModel
//删除角色原有权限
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();
return $res;
}
......
backend/models/v1/shopuser/ShopEmployee.php 0 → 100644
View file @ e9625051
<?php
namespace app\models\v1\shopuser;
use yii\data\ActiveDataProvider;
class ShopEmployee extends ShopUser
{
public $branch_code; //别名（所属门店别名）
public $birthday; //出生日期
/**
* 查询员工信息列表
*
* @param array $params 查询参数数组
* @return array|null 匹配到的员工列表
*/
public function employeeSearch($params)
{
$query = static::find()->alias('su')
->select('su.GUID,su.NAME,su.EMPLOYEE_CODE,su.MOBILE_PHONE,sb.NAME as SHOP_BRANCH_NAME')
->leftJoin('shop_branch sb', 'sb.GUID=su.EMPLOYEE_BRANCH_GUID')
->where(['su.BELONG' => 1]);
if (isset($params['NAME'])) {
$query->andfilterWhere(['like', 'su.NAME', $params['NAME']]);
}
if (isset($params['EMPLOYEE_CODE'])) {
$query->andfilterWhere(['like', 'su.EMPLOYEE_CODE', $params['EMPLOYEE_CODE']]);
}
if (isset($params['MOBILEPHONE'])) {
$query->andfilterWhere(['like', 'su.MOBILEPHONE', $params['MOBILEPHONE']]);
}
if (isset($params['EMPLOYEE_BRANCH_NAME'])) {
$query->andfilterWhere(['like', 'sb.NAME', $params['EMPLOYEE_BRANCH_NAME']]);
}
return new ActiveDataProvider(
[
'query' => $query->asArray(),
'pagination' => [
'pageSize' => 10,
]
]
);
}
/**
* {@inheritdoc}
*/
public function fields()
{
$fields = parent::fields();
$fields['BRANCH_CODE'] = 'branch_code'; //增加（所属门店别名）属性
$fields['AGE'] = function () { //根据生日计算年龄
list($year, $month, $day) = explode("-", date('Y-m-d',strtotime($this->birthday)));
$year_diff = date("Y") - $year;
$month_diff = date("m") - $month;
$day_diff = date("d") - $day;
if ($day_diff < 0 || $month_diff < 0)
$year_diff--;
return $year_diff;
};
return $fields;
}
/**
* 查询员工信息
*
* @param string $id 员工GUID
* @return array $info 该员工信息
*/
public function employeeInfo($id)
{
$info = static::find()->alias('su')
->select('su.GUID,su.NAME,su.EMPLOYEE_CODE,su.MOBILE_PHONE,su.CONTACTBIRTH_DATE as birthday,su.CONTACT_SEX,su.MEMBER_NO,su.IS_DISTRIBUTOR,su.EMPLOYEE_IS_MANAGER,sb.CODE as branch_code')
->leftJoin('shop_branch sb', 'sb.GUID=su.EMPLOYEE_BRANCH_GUID')
->where(['su.GUID' => $id, 'su.BELONG' => 1])
->one();
return $info;
}
}
backend/models/v1/shopuser/ShopUser.php
View file @ e9625051
......@@ -4,7 +4,6 @@ namespace app\models\v1\shopuser;
use app\models\v1\BaseModel;
use Yii;
use yii\data\ActiveDataProvider;
/**
* This is the model class for table "shop_user".
......@@ -71,9 +70,6 @@ use yii\data\ActiveDataProvider;
*/
class ShopUser extends BaseModel
{
public $branch_code; //别名（所属门店别名）
public $birthday; //出生日期
/**
* {@inheritdoc}
*/
......@@ -175,78 +171,4 @@ class ShopUser extends BaseModel
'EMPDISTRIBUTO_RCODE' => 'Empdistributo Rcode',
];
}
/**
* 查询员工信息列表
*
* @param array $params 查询参数数组
* @return array|null 匹配到的员工列表
*/
public function employeeSearch($params)
{
$query = static::find()->alias('su')
->select('su.GUID,su.NAME,su.EMPLOYEE_CODE,su.MOBILE_PHONE,sb.NAME as SHOP_BRANCH_NAME')
->leftJoin('shop_branch sb', 'sb.GUID=su.EMPLOYEE_BRANCH_GUID')
->where(['su.BELONG' => 1]);
if (isset($params['NAME'])) {
$query->andfilterWhere(['like', 'su.NAME', $params['NAME']]);
}
if (isset($params['EMPLOYEE_CODE'])) {
$query->andfilterWhere(['like', 'su.EMPLOYEE_CODE', $params['EMPLOYEE_CODE']]);
}
if (isset($params['MOBILEPHONE'])) {
$query->andfilterWhere(['like', 'su.MOBILEPHONE', $params['MOBILEPHONE']]);
}
if (isset($params['EMPLOYEE_BRANCH_NAME'])) {
$query->andfilterWhere(['like', 'sb.NAME', $params['EMPLOYEE_BRANCH_NAME']]);
}
return new ActiveDataProvider(
[
'query' => $query->asArray(),
'pagination' => [
'pageSize' => 10,
]
]
);
}
/**
* {@inheritdoc}
*/
public function fields()
{
$fields = parent::fields();
$fields['BRANCH_CODE'] = 'branch_code'; //增加（所属门店别名）属性
$fields['AGE'] = function () { //根据生日计算年龄
list($year, $month, $day) = explode("-", date('Y-m-d',strtotime($this->birthday)));
$year_diff = date("Y") - $year;
$month_diff = date("m") - $month;
$day_diff = date("d") - $day;
if ($day_diff < 0 || $month_diff < 0)
$year_diff--;
return $year_diff;
};
return $fields;
}
/**
* 查询员工信息
*
* @param string $id 员工GUID
* @return array $info 该员工信息
*/
public function employeeInfo($id)
{
$info = static::find()->alias('su')
->select('su.GUID,su.NAME,su.EMPLOYEE_CODE,su.MOBILE_PHONE,su.CONTACTBIRTH_DATE as birthday,su.CONTACT_SEX,su.MEMBER_NO,su.IS_DISTRIBUTOR,su.EMPLOYEE_IS_MANAGER,sb.CODE as branch_code')
->leftJoin('shop_branch sb', 'sb.GUID=su.EMPLOYEE_BRANCH_GUID')
->where(['su.GUID' => $id, 'su.BELONG' => 1])
->one();
return $info;
}
}
backend/models/v1/shopuser/UserComplain.php
View file @ e9625051
......@@ -42,7 +42,7 @@ class UserComplain extends BaseModel
public function rules()
{
return [
[['GUID'], 'required','on'=>['create']],
[['GUID'], 'required', 'on' => ['create']],
[['TS_CONTENT', 'TS_IDEA', 'TS_DESCRIPTION'], 'string'],
[['TS_COMMIT_DATE', 'TS_REPLY_DATE', 'TS_REVISIT_DATE'], 'safe'],
[['COMPLAIN_TYPE'], 'integer'],
......@@ -83,7 +83,7 @@ class UserComplain extends BaseModel
->from('shop_user_complain suc')
->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');
if($phone){
if ($phone) {
$query->Where(['like', 'suc.TS_PHONE', $phone]);
}
return new ActiveDataProvider(
......
backend/models/v1/shopuser/UserDepartment.php
View file @ e9625051
......@@ -33,7 +33,7 @@ class UserDepartment extends BaseModel
public function rules()
{
return [
[['GUID'], 'required','on'=>['create']],
[['GUID'], 'required', 'on' => ['create']],
[['UPDATE_TIME'], 'safe'],
[['GUID', 'ORG_GUID', 'CODE', 'NAME'], 'string', 'max' => 50],
[['COMPANY', 'SUB_COMPANY'], 'string', 'max' => 255],
......@@ -57,7 +57,7 @@ class UserDepartment extends BaseModel
];
}
//用户-部门信息
public function DepartmentInfo($code,$name)
public function DepartmentInfo($code, $name)
{
//$org_guid = 2;
$query = static::find()->select('GUID,NAME,CODE,COMPANY,SUB_COMPANY,UPDATE_TIME');
......
backend/models/v1/transport/TransportSetting.php
View file @ e9625051
......@@ -50,6 +50,9 @@ class TransportSetting extends \app\models\v1\BaseModel
[['GUID', 'ORG_GUID', 'TRANSPOR_TTYPE', 'TRANSPORT_COMPANY', 'BASE_WEIGHT', 'INCREASE_WEIGHT', 'PLATFORM_TYPE', 'GROUP_GUID'], 'string', 'max' => 50],
[['DESCRIPTION'], 'string', 'max' => 300],
[['GUID'], 'unique', 'on' => ['creation']],
[['BASE_FEE', 'BASE_WEIGHT_FEE', 'INCREASE_WEIGHT_FEE', 'BASE_WEIGHT', 'INCREASE_WEIGHT'], 'default', 'value' => 0, 'on' => ['creation', 'update']],
['IS_USED', 'defalut', 'value' => 1, 'on' => ['creation', 'update']],
['PLATFORM_TYPE', 'default', 'value' => 'shop', 'on' => 'creation'],
];
}
......@@ -97,7 +100,7 @@ class TransportSetting extends \app\models\v1\BaseModel
$where = ['or', ['ts.GROUP_GUID' => $userInfo['PARENT_BRANCH_GUID']], ['ts.GROUP_GUID' => $userInfo['BRANCH_GUID']]];
break;
default:
$where = ['>',1,2];
$where = ['>', 1, 2];
break;
}
......
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