解决报错

60c91044 · xuyamei · 860acdb0 · 60c91044 · 60c91044
Commit 60c91044 authored Jul 30, 2024 by xuyamei
Hide whitespace changes
Inline Side-by-side

Showing with 26 additions and 19 deletions

src/main/java/com/xiaomai/cases/polar/reserve/group/TestAddMemberReserve.java
+25 -18

src/main/java/com/xiaomai/cases/polar/reserve/group/TestAddToQueue.java
+1 -1

No files found.
--- a/src/main/java/com/xiaomai/cases/polar/reserve/group/TestAddMemberReserve.java
+++ b/src/main/java/com/xiaomai/cases/polar/reserve/group/TestAddMemberReserve.java
@@ -64,18 +64,15 @@ public class TestAddMemberReserve extends BaseTestImpl {
    String todayStartTimeTamp = CommUtil.oneKeyGetAddDay(0);
    //获取今天结束日期的时间戳
    String todayEndDateTimeTamp = CommUtil.getNDayEndTimeTamp(0);
    private String ruldId;
-    private String benefitId;
-    private String memberId;
    private String scheduleId;
    private Long startTime;
    private String courseId;
-    private String reserveId;
+    JSONArray memberInfo1 = new JSONArray();
+    JSONArray memberInfo2 = new JSONArray();
-    private String memberCardId;
    @BeforeMethod
    @Override
@@ -121,6 +118,7 @@ public class TestAddMemberReserve extends BaseTestImpl {
            throw new RuntimeException(e);
        }
+        String memberId;
        // 查询存量的学员没有则创建学员
        if (tools.commonSearch("约课学员sandy","NORMAL").getJSONArray("result").size()>0){
            memberId = tools.commonSearch("约课学员sandy","NORMAL").getJSONArray("result").getJSONObject(0).getString("id");
@@ -131,6 +129,7 @@ public class TestAddMemberReserve extends BaseTestImpl {
        }else{
            memberId = memberTools.create("约课学员sandy", RandomStringUtil.randomMobile("203")).getString("result");
        }
+        memberInfo1.add(memberId);
        // 查询是否有可用的会员卡，没有则购买
@@ -146,14 +145,18 @@ public class TestAddMemberReserve extends BaseTestImpl {
            listUserReservableBenefit = cardTools.listUserReservableBenefit(courseId, "GROUP_CLASS", "MEMBER", memberId, TimeUtils.getTodayTime());
        }
        // 查询权益
-        benefitId = listUserReservableBenefit.getJSONObject(0).getString("benefitId");
+        String benefitId = listUserReservableBenefit.getJSONObject(0).getString("benefitId");
-        memberCardId = listUserReservableBenefit.getJSONObject(0).getString("memberCardId");
+        String memberCardId = listUserReservableBenefit.getJSONObject(0).getString("memberCardId");
+        memberInfo1.add(benefitId);
+        memberInfo1.add(memberCardId);
        // 查询课次详情 查课次的开始时间
        JSONObject getScheduleItemDetail = groupScheduleTools.getScheduleItemDetail(scheduleId);
        startTime = getScheduleItemDetail.getLongValue("startTime");
        // 预约
-        reserveId = reserveTools.addReserve("","",benefitId,xmAppApi.getLoginInfo().getAdminId(),memberId,1,scheduleId,startTime,true);
+        String reserveId = reserveTools.addReserve("","",benefitId,xmAppApi.getLoginInfo().getAdminId(),memberId,1,scheduleId,startTime,true);
+        memberInfo1.add(reserveId);
        try {
            Thread.sleep(2000);
        } catch (InterruptedException e) {
@@ -221,7 +224,7 @@ public class TestAddMemberReserve extends BaseTestImpl {
    @Test(priority = 1,description = "学员已经在课次中，无需重复添加")
    public void testAddMemberReserve2(){
-        reserveTools.addReserve("","",benefitId,xmAppApi.getLoginInfo().getAdminId(),memberId,1,scheduleId,startTime,false);
+        reserveTools.addReserve("","",memberInfo1.getString(1),xmAppApi.getLoginInfo().getAdminId(),memberInfo1.getString(0),1,scheduleId,startTime,false);
        String message = dataApi.getBodyInJSON().getString("message");
        Assert.assertTrue(message.equals("会员已约该课程，不可重复预约") || message.equals("预约失败，无需重复添加"));
    }
@@ -249,6 +252,7 @@ public class TestAddMemberReserve extends BaseTestImpl {
        }else{
            memberId2 = memberTools.create("约课学员susan", RandomStringUtil.randomMobile("203")).getString("result");
        }
+        memberInfo2.add(memberId2);
        // 查询是否有可用的会员卡，没有则购买
        JSONArray listUserReservableBenefit = cardTools.listUserReservableBenefit(courseId, "GROUP_CLASS", "MEMBER", memberId2, TimeUtils.getTodayTime());
@@ -262,7 +266,10 @@ public class TestAddMemberReserve extends BaseTestImpl {
            }
            listUserReservableBenefit = cardTools.listUserReservableBenefit(courseId, "GROUP_CLASS", "MEMBER", memberId2, TimeUtils.getTodayTime());
        }
-        benefitId = listUserReservableBenefit.getJSONObject(0).getString("benefitId");
+        String benefitId = listUserReservableBenefit.getJSONObject(0).getString("benefitId");
+        String memberCardId = listUserReservableBenefit.getJSONObject(0).getString("memberCardId");
+        memberInfo2.add(benefitId);
+        memberInfo2.add(memberCardId);
        reserveTools.addReserve("","",benefitId,xmAppApi.getLoginInfo().getAdminId(),memberId2,1,scheduleId,startTime,true);
        String resultCode = dataApi.getBodyInJSON().getJSONObject("result").getString("resultCode");
@@ -279,7 +286,7 @@ public class TestAddMemberReserve extends BaseTestImpl {
    }
    @Test(dataProvider = "dataProvider",priority = 3)
    public void testCancelMemberReserve(boolean success,String message){
-        reserveTools.cancelMemberReserve(reserveId,success);
+        reserveTools.cancelMemberReserve(memberInfo1.getString(3),success);
        Assert.assertEquals(dataApi.getBodyInJSON().getString("message").contains(message),true);
        try {
            Thread.sleep(2000);
@@ -292,36 +299,36 @@ public class TestAddMemberReserve extends BaseTestImpl {
            JSONArray reserveIds = getScheduleItemDetail.getJSONArray("reserveIds");
            success = false;
            for (int i = 0; i < reserveIds.size(); i++){
-                if(reserveIds.getString(i).equals(reserveId)){
+                if(reserveIds.getString(i).equals(memberInfo1.getString(3))){
                    success = true;
                }
            }
            Assert.assertFalse(success,"取消约课后课次详情学员还在课次中");
            // check 2：会员详情 - 预约记录已取消
-            JSONArray getPageByMember = reserveTools.getPageByMember(courseId,"RESERVE_CANCEL","","", startTime,TimeUtils.getTodayEndTime(),memberId,"GROUP_CLASS");
+            JSONArray getPageByMember = reserveTools.getPageByMember(courseId,"RESERVE_CANCEL","","", startTime,TimeUtils.getTodayEndTime(),memberInfo1.getString(0),"GROUP_CLASS");
            success = false;
            for(int i =0;i<getPageByMember.size();i++){
-                if (getPageByMember.getJSONObject(i).getString("id").equals(reserveId)){
+                if (getPageByMember.getJSONObject(i).getString("id").equals(memberInfo1.getString(3))){
                    success = true;
                }
            }
            Assert.assertTrue(success,"取消约课后查询取消状态在会员详情页面未查询到相关信息");
            // check 3：预约记录列表中已取消
-            JSONArray getPageByStudio = reserveTools.getPageByStudio(courseId,"RESERVE_CANCEL","","",startTime,TimeUtils.getTodayEndTime(),memberId,"GROUP_CLASS","");
+            JSONArray getPageByStudio = reserveTools.getPageByStudio(courseId,"RESERVE_CANCEL","","",startTime,TimeUtils.getTodayEndTime(),memberInfo1.getString(0),"GROUP_CLASS","");
            success = false;
            for(int i =0;i<getPageByStudio.size();i++){
-                if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){
+                if (getPageByStudio.getJSONObject(i).getString("id").equals(memberInfo1.getString(3))){
                    success = true;
                }
            }
            Assert.assertTrue(success,"取消约课后在约课记录查询取消状态没有查询到相关信息");
            // check 3： 会员卡消耗记录中包含该记录锁定的次数释放
-            JSONArray consumeRecord = cardTools.fetchPageOfConsumeRecord(benefitId,memberCardId).getJSONObject("result").getJSONArray("records");
+            JSONArray consumeRecord = cardTools.fetchPageOfConsumeRecord(memberInfo1.getString(1),memberInfo1.getString(2)).getJSONObject("result").getJSONArray("records");
            String[] result2 = new String[] {"resourceId","consumeType","changeOfUsablePurchaseBalance"};
-            String[] respect = new String[] {reserveId,"CANCEL_RESERVE","1.00"};
+            String[] respect = new String[] {memberInfo1.getString(3),"CANCEL_RESERVE","1.00"};
            String[] message1 = new String[] {"会员卡消耗记录中记录的资源id与实际约课记录id不符合","会员卡消耗记录中记录的资源id与实际约课记录类型不符合","会员卡消耗记录中记录的资源id与实际约课记录余额不符合"};
            for (int i = 0; i < result2.length; i++){
                Assert.assertEquals(consumeRecord.getJSONObject(0).getString(result2[i]),respect[i],message1[i]);

--- a/src/main/java/com/xiaomai/cases/polar/reserve/group/TestAddToQueue.java
+++ b/src/main/java/com/xiaomai/cases/polar/reserve/group/TestAddToQueue.java
@@ -207,7 +207,7 @@ public class TestAddToQueue extends BaseTestImpl {
        Assert.assertEquals(getDetailById.getString("queueSort"),"1","第一位的学员取消排队后排队名次应该是第1位");
        // 操作3：将约课的学员取消
-        reserveTools.cancelMemberReserve(memberId1.getString(2),true);
+        reserveTools.cancelMemberReserve(memberId1.getString(3),true);
        try {
            Thread.sleep(2500);
        } catch (InterruptedException e) {