Skip to content

N
newShopBack
Commit 36942182 authored by 郭勇志's avatar 郭勇志
Browse files
Options

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

parents 9a367baa f81ab02a
Hide whitespace changes
Inline Side-by-side
Showing with 257 additions and 48 deletions
backend/config/main.php
View file @ 36942182
......@@ -54,8 +54,9 @@ return [
'v1/shop/branch/branch',
'v1/rbacuser/rbac-user',
'v1/shopuser/shop-user-membergrade',
'v1/shopuser/user-info',
'v1/shopuser/user-department',
'v1/shopuser/shop-user',
'v1/shopuser/user-complain',
],
'extraPatterns'=>[
'GET,OPTIONS test'=>'test',
......
backend/controllers/v1/shopuser/UserComplainController.php 0 → 100644
View file @ 36942182
<?php
namespace backend\controllers\v1\shopuser;
use Yii;
use backend\controllers\v1\BaseController;
use app\models\v1\shopuser\UserComplain;
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="phone",in="query",@OA\Schema(type="string")),
* @OA\Response(response="200",description="OK。一切正常"),
* security={{"Authorization": {}}}
* )
*/
public function actionUserComplain()
{
$get=Yii::$app->request->get();
$phone = isset($get['phone']) ? $get['phone'] : '';
$model=new UserComplain();
$info = $model->UserComplainInfo($phone);
return $info;
}
}
backend/controllers/v1/shopuser/UserInfoController.php → backend/controllers/v1/shopuser/UserDepartmentController.php
View file @ 36942182
......@@ -4,21 +4,21 @@ namespace backend\controllers\v1\shopuser;
use Yii;
use backend\controllers\v1\BaseController;
use app\models\v1\shopuser\UserInfos;
class UserInfoController extends BaseController
use app\models\v1\shopuser\UserDepartment;
class UserDepartmentController extends BaseController
{
public $modelClass='app\models\v1\shopuser\UserInfos';
public $modelClass='app\models\v1\shopuser\UserDepartment';
public $serializer = [
'class' => 'yii\rest\Serializer',
'collectionEnvelope' => 'userinfos',
'collectionEnvelope' => 'userdepartment',
];
/**
* @OA\Get(
* path="/backend/web/v1/shopuser/user-infos/department",
* tags={"部门信息"},
* description="部门信息",
* summary="部门信息",
* operationId="returnGetParam",
* path="/backend/web/v1/shopuser/user-departments/department",
* tags={"用户&员工接口"},
* description="部门信息列表",
* summary="部门信息列表(孙磊)",
* operationId="Department",
* @OA\Parameter(name="code",in="query",@OA\Schema(type="string")),
* @OA\Parameter(name="name",in="query",@OA\Schema(type="string")),
* @OA\Response(response="200",description="OK。一切正常"),
......@@ -30,29 +30,8 @@ class UserInfoController extends BaseController
$get=Yii::$app->request->get();
$code = isset($get['code']) ? $get['code'] : '';
$name = isset($get['name']) ? $get['name'] : '';
$model=new UserInfos();
$model=new UserDepartment();
$info = $model->DepartmentInfo($code,$name);
return $info;
}
/**
* @OA\Get(
* path="/backend/web/v1/shopuser/user-infos/user-complain",
* tags={"留言信息"},
* description="留言信息",
* summary="留言信息",
* operationId="returnGetParam",
* @OA\Parameter(name="orgguid",in="query",@OA\Schema(type="string")),
* @OA\Response(response="200",description="OK。一切正常"),
* security={{"Authorization": {}}}
* )
*/
public function actionUserComplain()
{
$get=Yii::$app->request->get();
$orgguid = isset($get['orgguid']) ? $get['orgguid'] : '';
$model=new UserInfos();
$info = $model->UserComplainInfo($orgguid);
return $info;
}
}
}
backend/models/v1/shopuser/UserComplain.php 0 → 100644
View file @ 36942182
<?php
namespace app\models\v1\shopuser;
use Yii;
use app\models\v1\BaseModel;
use yii\data\ActiveDataProvider;
/**
* This is the model class for table "shop_user_complain".
*
* @property string $GUID
* @property string $ORG_GUID 组织机构号
* @property string $TS_TYPE_NAME 留言类型描述
* @property string $TS_USER_GUID 用户GUID
* @property string $TS_USER_NAME 用户名
* @property string $TS_EMALL 邮箱
* @property string $TS_PHONE 电话号码
* @property string $TS_CONTENT 留言内容
* @property string $TS_COMMIT_DATE 留言时间
* @property string $TS_IDEA 留言回复内容
* @property string $TS_REPLY_DATE 回复日期
* @property string $LEASE_GOODS_GUID 租借商品GUID
* @property int $COMPLAIN_TYPE 留言种类:1.留言，0其他
* @property string $TS_REVISIT_DATE 建议回访时间段
* @property string $TS_DESCRIPTION 病情描述
* @property string $TS_TYPE_GUID 留言类型GUID
*/
class UserComplain extends BaseModel
{
/**
* {@inheritdoc}
*/
public static function tableName()
{
return 'shop_user_complain';
}
/**
* {@inheritdoc}
*/
public function rules()
{
return [
[['GUID'], 'required'],
[['TS_CONTENT', 'TS_IDEA', 'TS_DESCRIPTION'], 'string'],
[['TS_COMMIT_DATE', 'TS_REPLY_DATE', 'TS_REVISIT_DATE'], 'safe'],
[['COMPLAIN_TYPE'], 'integer'],
[['GUID', 'ORG_GUID', 'TS_TYPE_NAME', 'TS_USER_GUID', 'LEASE_GOODS_GUID', 'TS_TYPE_GUID'], 'string', 'max' => 50],
[['TS_USER_NAME', 'TS_EMALL', 'TS_PHONE'], 'string', 'max' => 255],
[['GUID'], 'unique'],
];
}
/**
* {@inheritdoc}
*/
public function attributeLabels()
{
return [
'GUID' => 'Guid',
'ORG_GUID' => 'Org Guid',
'TS_TYPE_NAME' => 'Ts Type Name',
'TS_USER_GUID' => 'Ts User Guid',
'TS_USER_NAME' => 'Ts User Name',
'TS_EMALL' => 'Ts Emall',
'TS_PHONE' => 'Ts Phone',
'TS_CONTENT' => 'Ts Content',
'TS_COMMIT_DATE' => 'Ts Commit Date',
'TS_IDEA' => 'Ts Idea',
'TS_REPLY_DATE' => 'Ts Reply Date',
'LEASE_GOODS_GUID' => 'Lease Goods Guid',
'COMPLAIN_TYPE' => 'Complain Type',
'TS_REVISIT_DATE' => 'Ts Revisit Date',
'TS_DESCRIPTION' => 'Ts Description',
'TS_TYPE_GUID' => 'Ts Type Guid',
];
}
//用户留言信息
public function UserComplainInfo($phone)
{
$query = static::find()
->from('shop_user su')
->select('su.GUID,su.NAME,suc.TS_PHONE,suc.TS_CONTENT,suc.TS_COMMIT_DATE,suc.COMPLAIN_TYPE')
->leftJoin('shop_user_complain suc', 'su.GUID = suc.TS_USER_GUID');
if($phone){
$query->Where(['like', 'suc.TS_PHONE', $phone]);
}
return new ActiveDataProvider(
[
'query' => $query->asArray(),
'pagination' => [
'pageSize' => 5,
]
]
);
}
}
\ No newline at end of file
backend/models/v1/shopuser/UserDepartment.php 0 → 100644
View file @ 36942182
<?php
namespace app\models\v1\shopuser;
use Yii;
use app\models\v1\BaseModel;
use yii\data\ActiveDataProvider;
/**
* This is the model class for table "shop_department".
*
* @property string $GUID
* @property string $ORG_GUID 组织机构号
* @property string $CODE 部门编号
* @property string $NAME 部门名称
* @property string $COMPANY 所属公司
* @property string $SUB_COMPANY 所属分公司
* @property string $UPDATE_TIME 更改时间
*/
class UserDepartment extends BaseModel
{
/**
* {@inheritdoc}
*/
public static function tableName()
{
return 'shop_department';
}
/**
* {@inheritdoc}
*/
public function rules()
{
return [
[['GUID'], 'required'],
[['UPDATE_TIME'], 'safe'],
[['GUID', 'ORG_GUID', 'CODE', 'NAME'], 'string', 'max' => 50],
[['COMPANY', 'SUB_COMPANY'], 'string', 'max' => 255],
[['GUID'], 'unique'],
];
}
/**
* {@inheritdoc}
*/
public function attributeLabels()
{
return [
'GUID' => 'Guid',
'ORG_GUID' => 'Org Guid',
'CODE' => 'Code',
'NAME' => 'Name',
'COMPANY' => 'Company',
'SUB_COMPANY' => 'Sub Company',
'UPDATE_TIME' => 'Update Time',
];
}
//用户-部门信息
public function DepartmentInfo($code,$name)
{
//$org_guid = 2;
$query = static::find()->select('GUID,NAME,CODE,COMPANY,SUB_COMPANY,UPDATE_TIME');
//->where(['ORG_GUID' => $org_guid]);
if (isset($name) && !empty($name)) {
$query->andWhere(['like', 'NAME', $name]);
}
if (isset($code) && !empty($code)) {
$query->andWhere(['like', 'CODE', $code]);
}
return new ActiveDataProvider(
[
'query' => $query->asArray(),
'pagination' => [
'pageSize' => 5,
]
]
);
}
}
\ No newline at end of file
backend/models/v1/shopuser/UserInfos.php deleted 100644 → 0
View file @ 9a367baa
<?php
namespace app\models\v1\shopuser;
use Yii;
use app\models\v1\BaseModel;
class UserInfos extends BaseModel
{
/**
* {@inheritdoc}
*/
public static function tableName()
{
return 'shop_user_complain';
}
public function DepartmentInfo($code,$name)
{
if($code && $name){
$info = Yii::$app->db->createCommand("select * from shop_department where CODE='".$code."' and NAME LIKE '%".$name."%'")
->query();
}else if($code && !$name){
$info = Yii::$app->db->createCommand('select * from shop_department where CODE='.$code)
->query();
}else if(!$code && $name){
$info = Yii::$app->db->createCommand("select * from shop_department where NAME LIKE '%".$name."%'")
->query();
}else{
$info = Yii::$app->db->createCommand('select * from shop_department')
->query();
}
return $info;
}
public function UserComplainInfo($orgguid)
{
if($orgguid){
$sql = 'select su.NAME,suc.TS_PHONE,suc.TS_CONTENT,suc.TS_COMMIT_DATE,suc.COMPLAIN_TYPE from shop_user_complain as suc left join
shop_user as su on suc.TS_USER_GUID=SU.GUID where suc.ORG_GUID='.$orgguid;
$info = Yii::$app->db->createCommand($sql)->query();
}else{
$sql = 'select su.NAME,suc.TS_PHONE,suc.TS_CONTENT,suc.TS_COMMIT_DATE,suc.COMPLAIN_TYPE from shop_user_complain as suc left join
shop_user as su on suc.TS_USER_GUID=SU.GUID';
$info = Yii::$app->db->createCommand($sql)->query();
}
return $info;
}
}
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