Commit 13830c6d by xyy

fix

parent 2db1e7fd
...@@ -74,61 +74,62 @@ public class TestPurchaseByDeposit extends BaseTestImpl { ...@@ -74,61 +74,62 @@ public class TestPurchaseByDeposit extends BaseTestImpl {
if (Double.parseDouble(leftBalance) >= Double.parseDouble(price)) { if (Double.parseDouble(leftBalance) >= Double.parseDouble(price)) {
depositCardId = XMJSONPath.readPath(minCardTools.listUserUsableDepositCard(memberId, paymentScenario), "$.result.applicableList[" + i + "].id"); depositCardId = XMJSONPath.readPath(minCardTools.listUserUsableDepositCard(memberId, paymentScenario), "$.result.applicableList[" + i + "].id");
break; break;
}else{
//切换B端校验
info.setTerminal(Terminal.B);
info.setLoginUser(LoginAccount.GYM_PROD);
//查询启用中的储值卡,获取储值卡id
String cardId = XMJSONPath.readPath(cardTools.fetchPageOfMemberCard("DEPOSIT_CARD",info), "$.result.records[0].id");
//购买1张储值卡
cardTools.signOrderDeposit(cardId,memberId,"0.00","1000.00",info);
//获取C端第1张可使用的储值卡
depositCardId = XMJSONPath.readPath(minCardTools.listUserUsableDepositCard(memberId, paymentScenario), "$.result.applicableList[0].id");
} }
} }
}else{ //查询要使用的储值卡消耗记录条数
//切换B端校验 String depositBenefitId = XMJSONPath.readPath(minCardTools.findMemberCardDetailById(depositCardId),"$.result.depositBenefit.id");
info.setTerminal(Terminal.B); int total = Integer.parseInt(XMJSONPath.readPath(minCardTools.fetchPageOfConsumeRecord(depositCardId,depositBenefitId),"$.result.total"));
info.setLoginUser(LoginAccount.GYM_PROD);
//查询启用中的储值卡,获取储值卡id
String cardId = XMJSONPath.readPath(cardTools.fetchPageOfMemberCard("DEPOSIT_CARD",info), "$.result.records[0].id");
//购买1张储值卡
cardTools.signOrderDeposit(cardId,memberId,"0.00","1000.00",info);
//获取C端第1张可使用的储值卡
depositCardId = XMJSONPath.readPath(minCardTools.listUserUsableDepositCard(memberId, paymentScenario), "$.result.applicableList[0].id");
}
//查询要使用的储值卡消耗记录条数
String depositBenefitId = XMJSONPath.readPath(minCardTools.findMemberCardDetailById(depositCardId),"$.result.depositBenefit.id");
int total = Integer.parseInt(XMJSONPath.readPath(minCardTools.fetchPageOfConsumeRecord(depositCardId,depositBenefitId),"$.result.total"));
//构建接口参数 //构建接口参数
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("activatePattern","FIRST_USED"); jsonObject.put("activatePattern","FIRST_USED");
jsonObject.put("cardId",memberCardId); jsonObject.put("cardId",memberCardId);
jsonObject.put("cardSnapshotId",cardSnapshotId); jsonObject.put("cardSnapshotId",cardSnapshotId);
jsonObject.put("memberId",memberId); jsonObject.put("memberId",memberId);
jsonObject.put("memo","自动化使用储值卡抵扣"); jsonObject.put("memo","自动化使用储值卡抵扣");
jsonObject.put("receivableAmount","0.00"); jsonObject.put("receivableAmount","0.00");
jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId()); jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId());
jsonObject.put("objectId", RandomStringUtil.randomString(16)); jsonObject.put("objectId", RandomStringUtil.randomString(16));
jsonObject.put("depositCardId",depositCardId);//储值卡id jsonObject.put("depositCardId",depositCardId);//储值卡id
jsonObject.put("depositAmount",price); jsonObject.put("depositAmount",price);
jsonObject.put("commodityCardType",commodityCardType); jsonObject.put("commodityCardType",commodityCardType);
// jsonObject.put("activityId",null);//优惠券id // jsonObject.put("activityId",null);//优惠券id
// jsonObject.put("activityAmount",null);//优惠券抵扣金额 // jsonObject.put("activityAmount",null);//优惠券抵扣金额
//调用请求 //调用请求
xmAppApi.doRequest(RequestType.JSON,params,jsonObject.toString(),headers).assetsSuccess(true); xmAppApi.doRequest(RequestType.JSON,params,jsonObject.toString(),headers).assetsSuccess(true);
voucherId = xmAppApi.getBodyInJSON().getJSONObject("result").getString("voucherId");//订单ID voucherId = xmAppApi.getBodyInJSON().getJSONObject("result").getString("voucherId");//订单ID
Thread.sleep(3000);
//校验C端订单详情
Assert.assertEquals(XMJSONPath.readPath(orderCTools.getDetail(voucherId),"$.result.state"),"PAID","创建签单订单成功,但订单状态不是已完成");
Assert.assertEquals(XMJSONPath.readPath(orderCTools.getDetail(voucherId),"$.result.source"),"ONLINE_MALL","C端创建的签单订单,订单来源非会员创建");
Thread.sleep(3000); //检验储值卡的消耗记录新增1条
//校验C端订单详情 JSONObject body = minCardTools.fetchPageOfConsumeRecord(depositCardId,depositBenefitId);
Assert.assertEquals(XMJSONPath.readPath(orderCTools.getDetail(voucherId),"$.result.state"),"PAID","创建签单订单成功,但订单状态不是已完成"); Assert.assertTrue(Integer.parseInt(XMJSONPath.readPath(body,"$.result.total"))==total+1);
Assert.assertEquals(XMJSONPath.readPath(orderCTools.getDetail(voucherId),"$.result.source"),"ONLINE_MALL","C端创建的签单订单,订单来源非会员创建"); Assert.assertEquals(XMJSONPath.readPath(body,"$.result.records[0].consumeType"),"DEPOSIT_SIGN_ORDER");//消耗类型:签单
Assert.assertEquals(XMJSONPath.readPath(body,"$.result.records[0].changeOfGiveBalance"),"-"+price);//消耗赠送金额
//检验储值卡的消耗记录新增1条 //切换B端校验
JSONObject body = minCardTools.fetchPageOfConsumeRecord(depositCardId,depositBenefitId); info.setTerminal(Terminal.B);
Assert.assertTrue(Integer.parseInt(XMJSONPath.readPath(body,"$.result.total"))==total+1); info.setLoginUser(LoginAccount.GYM_PROD);
Assert.assertEquals(XMJSONPath.readPath(body,"$.result.records[0].consumeType"),"DEPOSIT_SIGN_ORDER");//消耗类型:签单
Assert.assertEquals(XMJSONPath.readPath(body,"$.result.records[0].changeOfGiveBalance"),"-"+price);//消耗赠送金额
//切换B端校验 //作废订单
info.setTerminal(Terminal.B); orderTools.discard(voucherId,"其他","自动化作废订单",info);
info.setLoginUser(LoginAccount.GYM_PROD); }
//作废订单
orderTools.discard(voucherId,"其他","自动化作废订单",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