fix

src/main/java/com/xiaomai/cases/lunar/order/TestPurchaseDeposit.java

@@ -35,7 +35,8 @@ public class TestPurchaseDeposit extends XMBaseTest {
     public String memberId;
     public String memberId;
     public String cardId;
     public String cardId;
     public String cardName;
     public String cardName;
-    public String orderId;
+    public String voucherId;
+    public String depositCardId;
 
 
     @BeforeMethod
     @BeforeMethod
     public void beforeTest(){
     public void beforeTest(){
@@ -86,11 +87,11 @@ public class TestPurchaseDeposit extends XMBaseTest {
         //调用详情
         //调用详情
         xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers).assetsSuccess(true);
         xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers).assetsSuccess(true);
         //获取返回值里的订单id
         //获取返回值里的订单id
-        orderId = XMJSONPath.readPath(xmAppApi.getBodyInJSON(), "$.result");
+        voucherId = XMJSONPath.readPath(xmAppApi.getBodyInJSON(), "$.result");
         //check该订单的状态及名称
         //check该订单的状态及名称
-        Assert.assertEquals(XMJSONPath.readPath(orderCTools.getDetail(orderId),"$.result.state"),"PAID");
-        Assert.assertEquals(XMJSONPath.readPath(orderCTools.getDetail(orderId),"$.result.voucherItems[0].purchaseDepositSkuAttr.skuName"),cardName);
-        String skuId = XMJSONPath.readPath(orderCTools.getDetail(orderId),"$.result.voucherItems[0].skuId");
+        Assert.assertEquals(XMJSONPath.readPath(orderCTools.getDetail(voucherId),"$.result.state"),"PAID");
+        Assert.assertEquals(XMJSONPath.readPath(orderCTools.getDetail(voucherId),"$.result.voucherItems[0].purchaseDepositSkuAttr.skuName"),cardName);
+        String skuId = XMJSONPath.readPath(orderCTools.getDetail(voucherId),"$.result.voucherItems[0].skuId");
 
 
         //check我的卡包数据+1
         //check我的卡包数据+1
         Thread.sleep(1000);
         Thread.sleep(1000);
@@ -98,6 +99,7 @@ public class TestPurchaseDeposit extends XMBaseTest {
         //check我的卡包里有该生效中的卡
         //check我的卡包里有该生效中的卡
         Thread.sleep(1000);
         Thread.sleep(1000);
         JSONObject object = minCardTools.getMyMemberCardList(true,memberId,"DEPOSIT");
         JSONObject object = minCardTools.getMyMemberCardList(true,memberId,"DEPOSIT");
+        depositCardId = XMJSONPath.readPath(object,"$.result[0].id");
         Assert.assertEquals(XMJSONPath.readPath(object,"$.result[0].tenantMemberCardId"),skuId);
         Assert.assertEquals(XMJSONPath.readPath(object,"$.result[0].tenantMemberCardId"),skuId);
     }
     }
 
 
@@ -107,16 +109,16 @@ public class TestPurchaseDeposit extends XMBaseTest {
         info.setLoginUser(LoginAccount.GYM_PROD);
         info.setLoginUser(LoginAccount.GYM_PROD);
 
 
         //作废订单
         //作废订单
-        orderTools.discard(orderId,"其他","自动化作废订单",info);
+        orderTools.discard(voucherId,"其他","自动化作废订单",info);
         Thread.sleep(3000);
         Thread.sleep(3000);
         //check储值卡状态为已作废
         //check储值卡状态为已作废
-        Assert.assertEquals(XMJSONPath.readPath(cardTools.memberCardFindDetailById(cardId,info),"$.result.state"),"DISCARD");
+        Assert.assertEquals(XMJSONPath.readPath(cardTools.memberCardFindDetailById(depositCardId,info),"$.result.state"),"DISCARD");
         //check剩余金额=0
         //check剩余金额=0
-        Assert.assertEquals(XMJSONPath.readPath(cardTools.memberCardFindDetailById(cardId,info),"$.result.leftBalance"),"0.00");
+        Assert.assertEquals(XMJSONPath.readPath(cardTools.memberCardFindDetailById(depositCardId,info),"$.result.depositBenefit.leftBalance"),"0.00");
         //check消耗记录有1条作废订单记录
         //check消耗记录有1条作废订单记录
         Thread.sleep(2000);
         Thread.sleep(2000);
-        String benefitId = XMJSONPath.readPath(cardTools.memberCardFindDetailById(cardId,info),"$.result.depositBenefit.id");
-        Assert.assertEquals(XMJSONPath.readPath(cardTools.fetchPageOfConsumeRecord(benefitId,cardId,info),"$.result.records[0].consumeType").equals("DISCARD_ORDER"),"作废订单，消耗记录第一条操作类型");
+        String benefitId = XMJSONPath.readPath(cardTools.memberCardFindDetailById(depositCardId,info),"$.result.depositBenefit.id");
+        Assert.assertEquals(XMJSONPath.readPath(cardTools.fetchPageOfConsumeRecord(benefitId,depositCardId,info),"$.result.records[0].consumeType"),"DISCARD_ORDER");
     }
     }
 
 
 }
 }