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
Expand all 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
This diff is collapsed.
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/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