Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xm-sportstest
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xiamai-test
xm-sportstest
Commits
43e51999
Commit
43e51999
authored
Jul 01, 2024
by
xuyamei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
校验员工修改是否授课
parent
6310d0ed
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
105 additions
and
1 deletions
+105
-1
src/main/java/com/xiaomai/cases/polar/admin/AdminTools.java
+32
-0
src/main/java/com/xiaomai/cases/polar/admin/TestCheckModifyTeaching.java
+71
-0
src/main/java/com/xiaomai/client/OkHttpClient.java
+2
-1
No files found.
src/main/java/com/xiaomai/cases/polar/admin/AdminTools.java
View file @
43e51999
...
...
@@ -328,5 +328,37 @@ public class AdminTools extends XMBaseTest {
}
/**
* @description:校验取消授课或者移除所授课程
* @author: xuyamei
* @date: 2024/7/1 16:54
* @param id :员工id
* @param teaching :是否授课
* @param coachTeachingTypes :授课类型 ["LEAGUE_CLASS","PERSONAL_TRAINERS", "TRAINING_CAMP"]
* @param userInfo
* @return: com.alibaba.fastjson.JSONObject
**/
public
JSONObject
checkModifyTeaching
(
String
id
,
boolean
teaching
,
JSONArray
coachTeachingTypes
,
DataUserInfo
...
userInfo
){
dataApi
.
setApiModule
(
ApiModule
.
Polar_Admin
)
.
setApiName
(
"API_checkModifyTeaching"
)
.
setTerminal
(
Terminal
.
B
);
super
.
beforeDataRequest
(
userInfo
);
JSONObject
body
=
new
JSONObject
();
body
.
put
(
"operatorId"
,
dataApi
.
getLoginInfo
().
getAdminId
());
body
.
put
(
"studioId"
,
dataApi
.
getLoginInfo
().
getStudioId
());
body
.
put
(
"brandId"
,
dataApi
.
getLoginInfo
().
getBrandId
());
body
.
put
(
"id"
,
id
);
JSONObject
teach
=
new
JSONObject
();
teach
.
put
(
"teaching"
,
teaching
);
// 是否授课
teach
.
put
(
"coachTeachingTypes"
,
coachTeachingTypes
);
body
.
put
(
"teaching"
,
teach
);
dataApi
.
doRequest
(
RequestType
.
JSON
,
dataparams
,
body
.
toString
(),
dataheadrs
).
assetsSuccess
(
true
);
return
dataApi
.
getBodyInJSON
().
getJSONObject
(
"result"
);
}
}
src/main/java/com/xiaomai/cases/polar/admin/TestCheckModifyTeaching.java
0 → 100644
View file @
43e51999
package
com
.
xiaomai
.
cases
.
polar
.
admin
;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONObject
;
import
com.xiaomai.basetest.BaseTestImpl
;
import
com.xiaomai.cases.polar.course.CourseTools
;
import
com.xiaomai.cases.polar.setting.courseCategory.CourseCategoryTools
;
import
com.xiaomai.enums.ApiModule
;
import
com.xiaomai.enums.LoginAccount
;
import
com.xiaomai.enums.Terminal
;
import
org.testng.Assert
;
import
org.testng.annotations.BeforeClass
;
import
org.testng.annotations.DataProvider
;
import
org.testng.annotations.Test
;
import
javax.annotation.Resource
;
/**
* @BelongsProject: xm-sportstest
* @BelongsPackage: com.xiaomai.cases.polar.admin
* @Author: xuyamei
* @CreateTime: 2024-07-01 16:57
* @Description: 校验取消授课或者移除所授课程
* @Version: 1.0
*/
public
class
TestCheckModifyTeaching
extends
BaseTestImpl
{
@Resource
(
name
=
"adminTools"
)
AdminTools
adminTools
;
@Resource
(
name
=
"courseTools"
)
CourseTools
courseTools
;
@Resource
(
name
=
"courseCategoryTools"
)
CourseCategoryTools
courseCategoryTools
;
@BeforeClass
public
void
beforeTest
(){
setTestInfo
(
ApiModule
.
Polar_Admin
,
"API_addStudioAdmin"
,
LoginAccount
.
GYM_PROD
,
Terminal
.
B
,
"xym"
);
super
.
beforeTest
();
}
@DataProvider
()
public
Object
[][]
data
()
{
JSONArray
coachTeachingTypes
=
new
JSONArray
();
coachTeachingTypes
.
add
(
"LEAGUE_CLASS"
);
coachTeachingTypes
.
add
(
"PERSONAL_TRAINERS"
);
coachTeachingTypes
.
add
(
"TRAINING_CAMP"
);
return
new
Object
[][]{
{
false
,
coachTeachingTypes
},
{
true
,
coachTeachingTypes
}
};
}
@Test
(
description
=
"测试修改老师授课状态"
,
dataProvider
=
"data"
)
public
void
testCheckModifyTeaching
(
boolean
teaching
,
JSONArray
coachTeachingTypes
)
{
// 查询存量的课程分类
String
categoryId
=
courseCategoryTools
.
getCourseCategoryPage
(
"瑜伽"
);
// 查询私教课
courseTools
.
getPersonalOrGroupCourseId
(
"PERSONAL"
,
"瑜伽"
,
categoryId
,
"STUDIO"
,
"ONE_TO_MANY"
,
2
,
1
);
// 课程类型
if
(
teaching
){
coachTeachingTypes
.
remove
(
"PERSONAL_TRAINERS"
);
}
JSONObject
response
=
adminTools
.
checkModifyTeaching
(
xmAppApi
.
getLoginInfo
().
getAdminId
(),
teaching
,
coachTeachingTypes
);
Assert
.
assertTrue
(
response
.
getJSONArray
(
"disables"
).
size
()>
0
,
"修改是否授课或者还有其他关联业务关联不能移除 返回的结果是空"
);
}
}
src/main/java/com/xiaomai/client/OkHttpClient.java
View file @
43e51999
...
...
@@ -206,7 +206,8 @@ public class OkHttpClient {
}
}
Headers
.
Builder
headerBuilder
=
new
Headers
.
Builder
();
// Headers.Builder headerBuilder = new Headers.Builder();
headerBuilder
=
new
Headers
.
Builder
();
// 以 Entry 添加消息头
if
(
headerParamsMap
!=
null
&&
headerParamsMap
.
size
()
>
0
)
{
Iterator
iterator
=
headerParamsMap
.
entrySet
().
iterator
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment