Skip to content

X
xm-sportstest
Commit 02ad19e8 by yangjian
Options

Merge remote-tracking branch 'origin/master'

parents ac122773 20dc25b2
Showing with 34 additions and 25 deletions
src/main/java/com/xiaomai/cases/polar/data/financeData/TestGetCostData.java
......@@ -154,7 +154,7 @@ public class TestGetCostData extends XMBaseTest {
//根据商品类型全部加起来的确认收入查全部(覆盖一下商品类型的新接口)
JSONObject getCommodityTypeCostDetail=financeDataTools.getCommodityTypeCostDetail("DAY","LEFT_AMOUNT_DESC",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime());
int getCommodityTypeCostDetail_total=Integer.parseInt(getCommodityTypeCostDetail.getJSONObject("result").getString("total"));
Assert.assertEquals(getCommodityTypeCostDetail_total,9,"获取商品类型不是9个");
Assert.assertEquals(getCommodityTypeCostDetail_total,10,"获取商品类型不是10个");
JSONObject getCommodityTypeCostDetail_result=getCommodityTypeCostDetail.getJSONObject("result");
//确认收入
......@@ -167,6 +167,8 @@ public class TestGetCostData extends XMBaseTest {
BigDecimal confirmedAmount7=new BigDecimal(getCommodityTypeCostDetail_result.getJSONArray("records").getJSONObject(6).getString("confirmedAmount"));
BigDecimal confirmedAmount8=new BigDecimal(getCommodityTypeCostDetail_result.getJSONArray("records").getJSONObject(7).getString("confirmedAmount"));
BigDecimal confirmedAmount9=new BigDecimal(getCommodityTypeCostDetail_result.getJSONArray("records").getJSONObject(8).getString("confirmedAmount"));
BigDecimal confirmedAmount10=new BigDecimal(getCommodityTypeCostDetail_result.getJSONArray("records").getJSONObject(9).getString("confirmedAmount"));
......
src/main/java/com/xiaomai/cases/polar/entry/TestScan.java
......@@ -49,7 +49,7 @@ public class TestScan extends XMBaseTest {
Assert.assertEquals(res.getString("memberId"),"1805435813468483586");
Assert.assertEquals(res.getString("entryType"),"MEMBER");
Assert.assertEquals(res.getString("entryMethod"),"CODE");
Assert.assertEquals(res.getString("entryVoucherType"),"RESERVE");//原本是RESERVE，后面改成了 VENUE_BOOKING
Assert.assertTrue(res.getString("entryVoucherType").equals("RESERVE")||res.getString("entryVoucherType").equals("VENUE_BOOKING"));//RESERVE是使用约课记录入场，VENUE_BOOKING是使用约场记录入场，优先级是约课记录》约场记录
}
}
src/main/java/com/xiaomai/cases/polar/export/TestExportCard.java
......@@ -63,7 +63,7 @@ public class TestExportCard extends XMBaseTest {
xmAppApi.doRequest(RequestType.JSON,params,object.toString(),headers).assetsSuccess(true);
try {
Thread.sleep(3000);
Thread.sleep(5000);
} catch (InterruptedException e) {
e.printStackTrace();
}
......
src/main/java/com/xiaomai/cases/polar/goods/TestGoodsOrder.java
......@@ -224,11 +224,11 @@ public class TestGoodsOrder extends XMBaseTest {
Assert.assertEquals(afterInventory,beforeInventory-1,"购买1个物品生成待支付订单后，应扣除1个库存数");
//校验2：权益未到，数据中心的确认收入没有增加
//获取数据中心-财务中心-营收明细-物品的确认收入
JSONObject afterGetCostData_type=financeDataTools.getCostData_type("DAY","GOODS", TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime());
BigDecimal afterConfirmedAmount=new BigDecimal(afterGetCostData_type.getJSONObject("result").getString("confirmedAmount"));//确认收入
Assert.assertEquals(afterConfirmedAmount,beforeConfirmedAmount,"购买1个物品生成待支付订单后，财务中心-营收明细-物品的确认收入应无变化");
// //校验2：权益未到，数据中心的确认收入没有增加
// //获取数据中心-财务中心-营收明细-物品的确认收入
// JSONObject afterGetCostData_type=financeDataTools.getCostData_type("DAY","GOODS", TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime());
// BigDecimal afterConfirmedAmount=new BigDecimal(afterGetCostData_type.getJSONObject("result").getString("confirmedAmount"));//确认收入
// Assert.assertEquals(afterConfirmedAmount,beforeConfirmedAmount,"购买1个物品生成待支付订单后，财务中心-营收明细-物品的确认收入应无变化");
//B端变更为已完成物品订单
......
src/main/java/com/xiaomai/cases/polar/reserve/personal/TestSignReservePerson.java
......@@ -3,6 +3,7 @@ package com.xiaomai.cases.polar.reserve.personal;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.basetest.BaseTestImpl;
import com.xiaomai.cases.polar.admin.AdminTools;
import com.xiaomai.cases.polar.clue.MemberTools;
import com.xiaomai.cases.polar.course.CourseTools;
import com.xiaomai.cases.polar.finance.order.OrderTools;
......@@ -46,7 +47,8 @@ public class TestSignReservePerson extends BaseTestImpl {
@Resource(name = "groupScheduleTools")
GroupScheduleTools groupScheduleTools;
@Resource(name="adminTools")
AdminTools adminTools;
MemberTools memberTools = new MemberTools();
......@@ -92,11 +94,17 @@ public class TestSignReservePerson extends BaseTestImpl {
// 第三步：查询存量的私教教练，并将教练添加到课程中
// 获取到员工
// 获取教练列表
JSONObject pageStudioPersonalCoach = reserveTools.pageStudioPersonalCoach("");
int total = pageStudioPersonalCoach.getInteger("total");
Random rand = new Random();
// 随机取1个教练
coachedId = pageStudioPersonalCoach.getJSONArray("records").getJSONObject(rand.nextInt(total > 10 ? 10 : total)).getString("id");
JSONObject pageStudioPersonalCoach = reserveTools.pageStudioPersonalCoach("1V1约课签到教练");
if (pageStudioPersonalCoach.getJSONArray("records").size()==0){
adminTools.addStudioAdmin("教练","1V1约课签到教练");
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
pageStudioPersonalCoach = reserveTools.pageStudioPersonalCoach("1V1约课签到教练");
}
coachedId = pageStudioPersonalCoach.getJSONArray("records").getJSONObject(0).getString("id");
// 编辑私教课程教练添加到课程中
courseTools.editPersonalCourse(categoryId, courseId, courseName, 10, coachedId, "1");
......
src/main/java/com/xiaomai/cases/polar/schedule/camp/TestTrainingSign.java
......@@ -43,7 +43,7 @@ public class TestTrainingSign extends BaseTestImpl {
@Test(description = "训练营签到")
public void testTrainingSign() {
// 训练营课表查询存量的训练营课次
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(), "1887314841778122754"); // 造存量训练营活动，最多课次只能排200个课时，所以需要训练营排课时间结束之后重新造训练营数据（因报名人数很多，所以可以进行批量导入）
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(), "1960520725768978433"); // 造存量训练营活动，最多课次只能排200个课时，所以需要训练营排课时间结束之后重新造训练营数据（因报名人数很多，所以可以进行批量导入）
scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId");
// 训练营课次详情
......@@ -91,7 +91,7 @@ public class TestTrainingSign extends BaseTestImpl {
String[] result = new String[]{"id", "benefitId", "reserveMemberNum", "courseType", "reserveState", "scheduleId", "signInState"};
String[] resultData = new String[]{reserveId, benefitId, "1", "TRAINING_CAMP", "SUCCESS", scheduleId, "SIGNED"};
// check 2.1 预约记录列表
JSONArray getPageByStudio = reserveTools.getPageByStudio("", "SUCCESS", "SIGNED", "", TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(), memberId, "TRAINING_CAMP", "1887314841778122754");
JSONArray getPageByStudio = reserveTools.getPageByStudio("", "SUCCESS", "SIGNED", "", TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(), memberId, "TRAINING_CAMP", "1960520725768978433");
boolean success = false;
for (int i = 0; i < getPageByStudio.size(); i++) {
if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)) {
......@@ -123,7 +123,7 @@ public class TestTrainingSign extends BaseTestImpl {
@Test(description = "训练营请假", priority = 1)
public void testTrainingSign_Leave() {
// 训练营课表查询存量的训练营课次
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1887314841778122754");
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1960520725768978433");
scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId");
// 训练营课次详情
......@@ -170,7 +170,7 @@ public class TestTrainingSign extends BaseTestImpl {
String[] result = new String[] {"id","benefitId","reserveMemberNum","courseType","reserveState","scheduleId","signInState"};
String[] resultData = new String[] {reserveId,benefitId,"1","TRAINING_CAMP","SUCCESS",scheduleId,"LEAVE"};
// check 2.1 预约记录列表
JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","LEAVE","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1887314841778122754");
JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","LEAVE","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1960520725768978433");
boolean success = false;
for(int i =0;i<getPageByStudio.size();i++){
if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){
......@@ -200,11 +200,10 @@ public class TestTrainingSign extends BaseTestImpl {
}
@Test(description = "训练营请假补签到", priority = 2)
public void testTrainingSign_SIGNED() {
// 训练营课表查询存量的训练营课次
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1887314841778122754");
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1960520725768978433");
scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId");
// 训练营课次详情
......@@ -259,7 +258,7 @@ public class TestTrainingSign extends BaseTestImpl {
String[] result = new String[] {"id","benefitId","reserveMemberNum","courseType","reserveState","scheduleId","signInState"};
String[] resultData = new String[] {reserveId,benefitId,"1","TRAINING_CAMP","SUCCESS",scheduleId,"SIGNED"};
// check 2.1 预约记录列表
JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","SIGNED","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1887314841778122754");
JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","SIGNED","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1960520725768978433");
boolean success = false;
for(int i =0;i<getPageByStudio.size();i++){
if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){
......@@ -294,7 +293,7 @@ public class TestTrainingSign extends BaseTestImpl {
@Test(description = "训练营请假标记已补", priority = 3)
public void testTrainingSign_MARK_REMEDIAL() {
// 训练营课表查询存量的训练营课次
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1887314841778122754");
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1960520725768978433");
scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId");
// 训练营课次详情
......@@ -354,7 +353,7 @@ public class TestTrainingSign extends BaseTestImpl {
String[] result = new String[] {"id","benefitId","reserveMemberNum","courseType","reserveState","scheduleId","signInState","remedialSignState"};
String[] resultData = new String[] {reserveId,benefitId,"1","TRAINING_CAMP","SUCCESS",scheduleId,"LEAVE","MARK_REMEDIAL"};
// check 2.1 预约记录列表
JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","LEAVE","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1887314841778122754");
JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","LEAVE","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1960520725768978433");
boolean success = false;
for(int i =0;i<getPageByStudio.size();i++){
if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){
......@@ -388,7 +387,7 @@ public class TestTrainingSign extends BaseTestImpl {
@Test(description = "训练营请假无需补课", priority = 3)
public void testTrainingSign_NEED_NOT_REMEDIAL() {
// 训练营课表查询存量的训练营课次
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1887314841778122754");
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1960520725768978433");
scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId");
// 训练营课次详情
......@@ -448,7 +447,7 @@ public class TestTrainingSign extends BaseTestImpl {
String[] result = new String[] {"id","benefitId","reserveMemberNum","courseType","reserveState","scheduleId","signInState","remedialSignState"};
String[] resultData = new String[] {reserveId,benefitId,"1","TRAINING_CAMP","SUCCESS",scheduleId,"LEAVE","NEED_NOT_REMEDIAL"};
// check 2.1 预约记录列表
JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","LEAVE","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1887314841778122754");
JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","LEAVE","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1960520725768978433");
boolean success = false;
for(int i =0;i<getPageByStudio.size();i++){
if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){
......
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