Skip to content

N
newShopBack
Commit 689fd6fc authored by 孙磊's avatar 孙磊
Browse files
Options

conflicts

parents a361f316 dda32b36
Hide whitespace changes
Inline Side-by-side
Showing with 220 additions and 35 deletions
backend/config/urlmanager.php
View file @ 689fd6fc
...@@ -19,7 +19,9 @@ return [ ...@@ -19,7 +19,9 @@ return [
'v1/shopuser/shop-user', 'v1/shopuser/shop-user',
'v1/shopuser/user-complain', 'v1/shopuser/user-complain',
'v1/branch/branch-service-type', 'v1/branch/branch-service-type',
'v1/branch/shop-city-distribution-setting',
'v1/shopuser/shop-user-list', 'v1/shopuser/shop-user-list',
'v1/branch/branch-licence',
], ],
'extraPatterns'=>[ 'extraPatterns'=>[
'GET,OPTIONS test'=>'test', 'GET,OPTIONS test'=>'test',
...@@ -29,11 +31,12 @@ return [ ...@@ -29,11 +31,12 @@ return [
'GET,OPTIONS user-complain'=>'user-complain', 'GET,OPTIONS user-complain'=>'user-complain',
'GET,OPTIONS employee-info' => 'employee-info', 'GET,OPTIONS employee-info' => 'employee-info',
'GET,OPTIONS employee-list' => 'employee-list', 'GET,OPTIONS employee-list' => 'employee-list',
'GET,OPTIONS list' => 'list', 'GET,OPTIONS membergrade-list' => 'membergrade-list',
'GET,OPTIONS one' => 'one', 'GET,OPTIONS membergrade-detail' => 'membergrade-detail',
'PUT,OPTIONS revise' => 'revise', 'PUT,OPTIONS membergrade-revise' => 'membergrade-revise',
'POST,OPTIONS add' => 'add', 'POST,OPTIONS membergrade-add' => 'membergrade-add',
'DELETE,OPTIONS del' => 'del', 'DELETE,OPTIONS del' => 'membergrade-delete',
'GET,OPTIONS city-distribution-setting-list' => 'city-distribution-setting-list',
'GET,OPTIONS branch-score-list' => 'branch-score-list', 'GET,OPTIONS branch-score-list' => 'branch-score-list',
'GET,OPTIONS score-info' => 'score-info', 'GET,OPTIONS score-info' => 'score-info',
'PUT,OPTIONS score-info-update'=>'score-info-update', 'PUT,OPTIONS score-info-update'=>'score-info-update',
...@@ -45,8 +48,10 @@ return [ ...@@ -45,8 +48,10 @@ return [
'DELETE,OPTIONS del-branch-service' => 'del-branch-service', 'DELETE,OPTIONS del-branch-service' => 'del-branch-service',
'GET,OPTIONS user-list' => 'user-list', 'GET,OPTIONS user-list' => 'user-list',
'GET,OPTIONS user-detail'=>'user-detail', 'GET,OPTIONS user-detail'=>'user-detail',
'GET,OPTIONS user-update'=>'user-update', 'POST,OPTIONS user-update'=>'user-update',
'GET,OPTIONS user-delete'=>'user-delete', 'GET,OPTIONS user-delete'=>'user-delete',
'GET,OPTIONS licence-list'=>'licence-list',
'GET,OPTIONS licence-detail'=>'licence-detail',
'GET,OPTIONS branch-list'=>'branch-list', 'GET,OPTIONS branch-list'=>'branch-list',
], ],
], ],
......
backend/controllers/v1/branch/BranchLicenceController.php 0 → 100644
View file @ 689fd6fc
<?php
namespace backend\controllers\v1\branch;
use Yii;
use yii\data\ArrayDataProvider;
use backend\models\v1\branch\BranchLicence;
use backend\controllers\v1\BaseController;
class BranchLicenceController extends BaseController{
public $modelClass = 'backend\models\v1\branch\BranchLicence';
/**
* @OA\GET(
* path="/backend/web/v1/branch/branch-licences/licence-list",
* tags={"门店&DC"},
* summary="证照管理(张晓林)",
* description="证照管理列表",
* @OA\Parameter(name="BRANCHCODE", description="门店编号",in="query",@OA\Schema(type="string")),
* @OA\Parameter(name="ISFROM", description="证照来源",in="query",@OA\Schema(type="string")),
* @OA\Parameter(name="LICENCEEXPIRYDATE", description="到期时间",in="query",@OA\Schema(type="string")),
* @OA\Parameter(name="UPDATETIME", description="更新时间",in="query",@OA\Schema(type="string")),
* @OA\Response(response="200",description="
* GUID:证照GUID,
* BRANCH_CODE:门店编码,
* NAME:门店名称,
* LICENCE_NAME:证照名称,
* IS_FROM:来源,
* IS_SHOW:是否显示,
* LICENCE_EXPIRY_DATE:到期时间,
* UPDATE_TIME:更新时间,
* color:列表颜色,
*
* "),
* security={{"Authorization": {}}}
* )
*/
//证照列表
public function actionLicenceList(){
$param = Yii::$app->request->get();
$model = new BranchLicence();
$model->scenario = 'licenceList';
$query = $model::find();
$query->select(['sbl.GUID','sbl.BRANCH_CODE','sbl.LICENCE_NAME','sbl.IS_FROM','sbl.IS_SHOW','sbl.UPDATE_TIME','sbl.LICENCE_EXPIRY_DATE','sb.NAME']);
$query->from('shop_branch_licence sbl')->leftJoin('shop_branch as sb','sb.CODE=sbl.BRANCH_CODE');
$query->orderBy(['sbl.LICENCE_EXPIRY_DATE'=>SORT_ASC]);
if(isset($param['BRANCHCODE']) && !empty($param['BRANCHCODE'])){
$query->andWhere(['=','sbl.BRANCH_CODE',$param['BRANCHCODE']]);
}
if(isset($param['ISFROM']) && $param['ISFROM'] != ''){
$query->andWhere(['=','sbl.IS_FROM',$param['ISFROM']]);
}
if(isset($param['LICENCEEXPIRYDATE']) && $param['LICENCEEXPIRYDATE'] == 0){
$query->andWhere(['<=',"datediff(date_format(sbl.LICENCE_EXPIRY_DATE, '%Y-%m-%d' ),date_format( now(), '%Y-%m-%d' ))",'0']);
}
if(isset($param['LICENCEEXPIRYDATE']) && !empty($param['LICENCEEXPIRYDATE']) && $param['LICENCEEXPIRYDATE'] == 1){
$query->andWhere(['and',"datediff(date_format(sbl.LICENCE_EXPIRY_DATE, '%Y-%m-%d' ),date_format( now(), '%Y-%m-%d' )) > 0","datediff(date_format(sbl.LICENCE_EXPIRY_DATE, '%Y-%m-%d' ),date_format( now(), '%Y-%m-%d' )) <= 30"]);
}
if(isset($param['UPDATETIME']) && !empty($param['UPDATETIME'])){
$query->andWhere(['=','date_format(sbl.UPDATE_TIME,"%Y-%m-%d")',$param['UPDATETIME']]);
}
$list = $query->asArray()->all();
foreach($list as $listKey=>$listValue){
//判断证照的到期时间
$startdate=time();
$enddate=strtotime($listValue['LICENCE_EXPIRY_DATE']);
$days=round(($enddate-$startdate)/3600/24) ;
if(empty($listValue['LICENCE_EXPIRY_DATE'])){
$list[$listKey]['color'] = 'blue';
}elseif($days >0 && $days <= 30){
$list[$listKey]['color'] = 'yellow';
}elseif($days <= 0){
$list[$listKey]['color'] = 'red';
}else{
$list[$listKey]['color'] = '';
}
//判断是否显示
if(isset($listValue['IS_SHOW']) && $listValue['IS_SHOW'] == 1){
$list[$listKey]['IS_SHOW'] = '前台显示';
}elseif(isset($listValue['IS_SHOW']) && $listValue['IS_SHOW'] == 0){
$list[$listKey]['IS_SHOW'] = '前台不显示';
}
//证照来源
if(isset($listValue['IS_FROM']) && $listValue['IS_FROM'] == 1){
$list[$listKey]['IS_FROM'] = '商城';
}elseif(isset($listValue['IS_FROM']) && $listValue['IS_FROM'] == 0){
$list[$listKey]['IS_FROM'] = 'OA系统';
}
}
return new ArrayDataProvider([
'allModels'=>$list,
'pagination' => [
'pageSize' => 15,
]
]);
}
/**
* @OA\GET(
* path="/backend/web/v1/branch/branch-licences/licence-detail",
* tags={"门店&DC"},
* summary="证照管理(张晓林)",
* description="证照详情页",
* @OA\Parameter(name="GUID", description="证照GUID",in="query",@OA\Schema(type="string")),
* @OA\Response(response="200",description="
* CODE:状态
* GUID:证照GUID,
* BRANCH_CODE:门店编码,
* NAME:门店名称,
* LICENCE_NAME:证照名称,
* IS_FROM:来源, 0 OA系统 1 商城
* IS_SHOW:是否显示, 0 不显示
* LICENCE_EXPIRY_DATE:到期时间,
* LICENCE_CONTENT:证照文本说明,
* LICENCE_IMG_URL:证照图片
*
* "),
* security={{"Authorization": {}}}
* )
*/
public function actionLicenceDetail(){
$param = Yii::$app->request->get();
$model = new BranchLicence;
$model->GUID = $param['GUID'];
$model->scenario = 'licenceDetail';
if($model->validate()){
$query = $model::find();
$query->select(['sbl.GUID','sbl.LICENCE_EXPIRY_DATE','sbl.LICENCE_IMG_URL','sbl.LICENCE_CONTENT','sbl.BRANCH_CODE','sbl.LICENCE_NAME','sbl.IS_FROM','sbl.IS_SHOW','sb.NAME']);
$query->from('shop_branch_licence sbl')->leftJoin('shop_branch as sb','sb.CODE=sbl.BRANCH_CODE');
$query->where(['=','sbl.GUID',$param['GUID']]);
return ['data'=>$query->asArray()->all(),'CODE'=>200];
}else{
return [
'CODE'=>'200',
'data'=>$model->errors
];
}
}
}
\ No newline at end of file
backend/controllers/v1/shopuser/ShopUserMembergradeController.php
View file @ 689fd6fc
...@@ -27,7 +27,7 @@ class ShopUserMembergradeController extends BaseController ...@@ -27,7 +27,7 @@ class ShopUserMembergradeController extends BaseController
/** /**
* @OA\Get( * @OA\Get(
* path="/backend/web/v1/shopuser/shop-user-membergrades/list", * path="/backend/web/v1/shopuser/shop-user-membergrades/membergrade-list",
* tags={"用户&员工接口"}, * tags={"用户&员工接口"},
* summary="用户组列表接口(姚书侠)", * summary="用户组列表接口(姚书侠)",
* description="用户组列表接口", * description="用户组列表接口",
...@@ -38,7 +38,7 @@ class ShopUserMembergradeController extends BaseController ...@@ -38,7 +38,7 @@ class ShopUserMembergradeController extends BaseController
* ) * )
*/ */
//重写index //重写index
public function actionList() public function actionMembergradeList()
{ {
$requestParams = Yii::$app->getRequest()->get(); $requestParams = Yii::$app->getRequest()->get();
$query = $this->modelClass::find(); $query = $this->modelClass::find();
...@@ -55,7 +55,7 @@ class ShopUserMembergradeController extends BaseController ...@@ -55,7 +55,7 @@ class ShopUserMembergradeController extends BaseController
/** /**
* @OA\Get( * @OA\Get(
* path="/backend/web/v1/shopuser/shop-user-membergrades/one", * path="/backend/web/v1/shopuser/shop-user-membergrades/membergrade-detail",
* tags={"用户&员工接口"}, * tags={"用户&员工接口"},
* summary="用户组详情接口(姚书侠)", * summary="用户组详情接口(姚书侠)",
* description="用户组详情接口", * description="用户组详情接口",
...@@ -65,7 +65,7 @@ class ShopUserMembergradeController extends BaseController ...@@ -65,7 +65,7 @@ class ShopUserMembergradeController extends BaseController
* ) * )
*/ */
//编辑用 //编辑用
public function actionOne() public function actionMembergradeDetail()
{ {
$guid = Yii::$app->getRequest()->get('guid'); $guid = Yii::$app->getRequest()->get('guid');
$model = $this->modelClass::findOne($guid); $model = $this->modelClass::findOne($guid);
...@@ -74,7 +74,7 @@ class ShopUserMembergradeController extends BaseController ...@@ -74,7 +74,7 @@ class ShopUserMembergradeController extends BaseController
/** /**
* @OA\POST( * @OA\POST(
* path="/backend/web/v1/shopuser/shop-user-membergrades/add", * path="/backend/web/v1/shopuser/shop-user-membergrades/membergrade-add",
* tags={"用户&员工接口"}, * tags={"用户&员工接口"},
* summary="添加用户组接口(姚书侠)", * summary="添加用户组接口(姚书侠)",
* description="添加用户组接口", * description="添加用户组接口",
...@@ -96,7 +96,7 @@ class ShopUserMembergradeController extends BaseController ...@@ -96,7 +96,7 @@ class ShopUserMembergradeController extends BaseController
* security={{"Authorization": {}}} * security={{"Authorization": {}}}
* ) * )
*/ */
public function actionAdd() public function actionMembergradeAdd()
{ {
$model = new $this->modelClass(); $model = new $this->modelClass();
$model->scenario = 'create';//创建的场景 $model->scenario = 'create';//创建的场景
...@@ -118,7 +118,7 @@ class ShopUserMembergradeController extends BaseController ...@@ -118,7 +118,7 @@ class ShopUserMembergradeController extends BaseController
/** /**
* @OA\PUT( * @OA\PUT(
* path="/backend/web/v1/shopuser/shop-user-membergrades/revise", * path="/backend/web/v1/shopuser/shop-user-membergrades/membergrade-revise",
* tags={"用户&员工接口"}, * tags={"用户&员工接口"},
* summary="修改用户组接口(姚书侠)", * summary="修改用户组接口(姚书侠)",
* description="修改用户组接口", * description="修改用户组接口",
...@@ -141,12 +141,12 @@ class ShopUserMembergradeController extends BaseController ...@@ -141,12 +141,12 @@ class ShopUserMembergradeController extends BaseController
* security={{"Authorization": {}}} * security={{"Authorization": {}}}
* ) * )
*/ */
public function actionRevise() public function actionMembergradeRevise()
{ {
$guid = Yii::$app->getRequest()->post('GUID'); $guid = Yii::$app->getRequest()->post('GUID');
$model = $this->modelClass::findOne($guid); $model = $this->modelClass::findOne($guid);
if(!$model){ if(!$model){
throw new BadRequestHttpException('没有找到要修改的记录'); throw new BadRequestHttpException('没有找到记录');
} }
$model->scenario = 'update';//创建的场景 $model->scenario = 'update';//创建的场景
$model->setAttributes(Yii::$app->getRequest()->post()); $model->setAttributes(Yii::$app->getRequest()->post());
...@@ -160,7 +160,7 @@ class ShopUserMembergradeController extends BaseController ...@@ -160,7 +160,7 @@ class ShopUserMembergradeController extends BaseController
/** /**
* @OA\DELETE( * @OA\DELETE(
* path="/backend/web/v1/shopuser/shop-user-membergrades/del", * path="/backend/web/v1/shopuser/shop-user-membergrades/membergrade-delete",
* tags={"用户&员工接口"}, * tags={"用户&员工接口"},
* summary="删除用户组接口(姚书侠)", * summary="删除用户组接口(姚书侠)",
* description="删除用户组接口", * description="删除用户组接口",
...@@ -178,12 +178,12 @@ class ShopUserMembergradeController extends BaseController ...@@ -178,12 +178,12 @@ class ShopUserMembergradeController extends BaseController
* security={{"Authorization": {}}} * security={{"Authorization": {}}}
* ) * )
*/ */
public function actionDel() public function actionMembergradeDelete()
{ {
$guid = Yii::$app->getRequest()->post('GUID'); $guid = Yii::$app->getRequest()->post('GUID');
$model = $this->modelClass::findOne($guid); $model = $this->modelClass::findOne($guid);
if(!$model){ if(!$model){
throw new BadRequestHttpException('没有找到要修改的记录'); throw new BadRequestHttpException('没有找到记录');
}else if ($model->delete() === false) { }else if ($model->delete() === false) {
throw new ServerErrorHttpException('Failed to delete the object for unknown reason.'); throw new ServerErrorHttpException('Failed to delete the object for unknown reason.');
} }
......
backend/models/v1/branch/BranchLicence.php 0 → 100644
View file @ 689fd6fc
<?php
namespace backend\models\v1\branch;
use yii\db\ActiveRecord;
class BranchLicence extends ActiveRecord{
public static function tableName()
{
return 'shop_branch_licence';
}
public function rules()
{
return [
['GUID','required','on'=>'licenceDetail','message'=>'缺少参数GUID']
];
}
public function attributeLabels()
{
return [
'GUID'=>'门店GUID'
];
}
}
\ No newline at end of file
backend/models/v1/branch/ShopBranchScore.php
View file @ 689fd6fc
...@@ -53,15 +53,14 @@ class ShopBranchScore extends BaseModel ...@@ -53,15 +53,14 @@ class ShopBranchScore extends BaseModel
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
// public function scenarios() public function scenarios()
// { {
// return [ $scenarios = parent::scenarios();
// //更新时，防止BRANCH_CODE，BRANCH_NAME被赋值更新 //更新时，防止BRANCH_CODE，BRANCH_NAME被赋值更新
// 'update' => [ $scenarios['update'] = ['BASIC_SERVICES', 'QUALITY_ASSURANCE', 'OPERATION_MANAGEMENT', 'STORE_IMAGE', 'ELECTRICITY_MANAGEMENT', 'CUSTOMERE_VALUATION', 'STORE_CONFIGURATION','ARTIFICIAL_NUMBER', 'ARTIFICIAL_NAME', 'UPDATE_TIME'];
// 'BASIC_SERVICES', 'QUALITY_ASSURANCE', 'OPERATION_MANAGEMENT', 'STORE_IMAGE', 'ELECTRICITY_MANAGEMENT', 'CUSTOMERE_VALUATION', 'STORE_CONFIGURATION','ARTIFICIAL_NUMBER', 'ARTIFICIAL_NAME', 'UPDATE_TIME', return $scenarios;
// ] }
// ];
// }
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
......
backend/models/v1/shopuser/ShopUser.php
View file @ 689fd6fc
...@@ -71,7 +71,7 @@ use yii\data\ActiveDataProvider; ...@@ -71,7 +71,7 @@ use yii\data\ActiveDataProvider;
*/ */
class ShopUser extends BaseModel class ShopUser extends BaseModel
{ {
public $BRANCH_CODE; //别名（所属门店别名） public $branch_code; //别名（所属门店别名）
/** /**
* {@inheritdoc} * {@inheritdoc}
...@@ -213,6 +213,16 @@ class ShopUser extends BaseModel ...@@ -213,6 +213,16 @@ class ShopUser extends BaseModel
); );
} }
/**
* {@inheritdoc}
*/
public function fields()
{
$fields = parent::fields();
$fields['BRANCH_CODE'] = 'branch_code'; //增加（所属门店别名）属性
return $fields;
}
/** /**
* 查询员工信息 * 查询员工信息
* *
...@@ -222,15 +232,10 @@ class ShopUser extends BaseModel ...@@ -222,15 +232,10 @@ class ShopUser extends BaseModel
public function employeeInfo($id) public function employeeInfo($id)
{ {
$info = static::find()->alias('su') $info = static::find()->alias('su')
->select('su.GUID,su.NAME,su.EMPLOYEE_CODE,su.MOBILE_PHONE,su.AGE,su.CONTACT_SEX,su.MEMBER_NO,su.IS_DISTRIBUTOR,su.EMPLOYEE_IS_MANAGER,sb.CODE as BRANCH_CODE') ->select('su.GUID,su.NAME,su.EMPLOYEE_CODE,su.MOBILE_PHONE,su.AGE,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') ->leftJoin('shop_branch sb','sb.GUID=su.EMPLOYEE_BRANCH_GUID')
->where(['su.GUID' => $id, 'su.BELONG' => 1]) ->where(['su.GUID' => $id, 'su.BELONG' => 1])
->one(); ->one();
return $info; return $info;
} }
public function fields()
{
return ['GUID','NAME','EMPLOYEE_CODE','MOBILE_PHONE','AGE','CONTACT_SEX','MEMBER_NO','IS_DISTRIBUTOR','EMPLOYEE_IS_MANAGER','BRANCH_CODE'];
}
} }
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