Skip to content

X
xm-sportstest
Commit 75ebf9c3 by yangjian
Options

Merge remote-tracking branch 'origin/master'

parents 3017584a e525892f
Showing with 58 additions and 52 deletions
src/main/java/com/xiaomai/cases/polar/data/financeData/TestGetCostData.java
......@@ -125,7 +125,7 @@ public class TestGetCostData extends XMBaseTest {
try {
Thread.sleep(25000);
Thread.sleep(30000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
......@@ -144,7 +144,7 @@ public class TestGetCostData extends XMBaseTest {
try {
Thread.sleep(20000);
Thread.sleep(25000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
......
src/main/java/com/xiaomai/cases/polar/export/TestExportVoucher.java
......@@ -44,7 +44,7 @@ public class TestExportVoucher extends XMBaseTest {
xmAppApi.doRequest(RequestType.JSON,params,object.toString(),headers).assetsSuccess(true);
try {
Thread.sleep(3000);
Thread.sleep(6000);
} catch (InterruptedException e) {
e.printStackTrace();
}
......
src/main/java/com/xiaomai/cases/polar/finance/cashier/TestRefundByRecord.java
......@@ -33,43 +33,43 @@ public class TestRefundByRecord extends XMBaseTest {
//目前1808757176611880962这笔流水是已经结算过的收款流水，商户号下没有钱退，但是当商户号下有钱可退的时候，这个case会报错，因为可以退成功
//乐动收银退款预校验-检查流水是否可退
String checkBeforeRefundCode=cashierTools.checkBeforeRefund("1808757176611880962", BigDecimal.valueOf(0.01)).getJSONObject("result").getString("code");
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//如果校验为可退
if("SUCCESS".equals(checkBeforeRefundCode)){
//流水退款
JSONObject refundByRecordResult=new JSONObject();
refundByRecordResult.put("transAmount",0.01);
refundByRecordResult.put("refundReason", RandomStringUtil.randomString(6));
refundByRecordResult.put("orderType","PAY_QR_CODE");
refundByRecordResult.put("payTransNo","1808757176611880962");
refundByRecordResult.put("brandId", xmAppApi.getLoginInfo().getBrandId());
refundByRecordResult.put("studioId", xmAppApi.getLoginInfo().getStudioId());
refundByRecordResult.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
xmAppApi.doRequest(RequestType.JSON, params, refundByRecordResult.toJSONString(), headers).assetsSuccess(true);
String success = xmAppApi.getBodyInJSON().getString("success");
String failCode = xmAppApi.getBodyInJSON().getJSONObject("result").getString("failCode");
Assert.assertEquals(success, "true", "获取流水退款失败");
Assert.assertEquals(failCode, "OTHER_ERROR", "当前乐动收银余额不足，无法退款，请在线收款后再次发起退款或者线下处理退款");
// String checkBeforeRefundCode=cashierTools.checkBeforeRefund("1808757176611880962", BigDecimal.valueOf(0.01)).getJSONObject("result").getString("code");
//
// try {
// Thread.sleep(1000);
// } catch (InterruptedException e) {
// throw new RuntimeException(e);
// }
//
// //如果校验为可退
// if("SUCCESS".equals(checkBeforeRefundCode)){
//
// //流水退款
// JSONObject refundByRecordResult=new JSONObject();
// refundByRecordResult.put("transAmount",0.01);
// refundByRecordResult.put("refundReason", RandomStringUtil.randomString(6));
// refundByRecordResult.put("orderType","PAY_QR_CODE");
// refundByRecordResult.put("payTransNo","1808757176611880962");
// refundByRecordResult.put("brandId", xmAppApi.getLoginInfo().getBrandId());
// refundByRecordResult.put("studioId", xmAppApi.getLoginInfo().getStudioId());
// refundByRecordResult.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
//
// xmAppApi.doRequest(RequestType.JSON, params, refundByRecordResult.toJSONString(), headers).assetsSuccess(true);
// String success = xmAppApi.getBodyInJSON().getString("success");
// String failCode = xmAppApi.getBodyInJSON().getJSONObject("result").getString("failCode");
// Assert.assertEquals(success, "true", "获取流水退款失败");
// Assert.assertEquals(failCode, "OTHER_ERROR", "当前乐动收银余额不足，无法退款，请在线收款后再次发起退款或者线下处理退款");
//
// }
//
// else{
// Assert.assertEquals(checkBeforeRefundCode,"AMOUNT_LIMIT","订单关联流水可退金额不足，请修改退款金额后重试");
// }
//
//
}
else{
Assert.assertEquals(checkBeforeRefundCode,"AMOUNT_LIMIT","订单关联流水可退金额不足，请修改退款金额后重试");
}
}
}
//
//
//
//
src/main/java/com/xiaomai/cases/polar/goods/TestGoodsOrderByDeposit.java
......@@ -127,6 +127,14 @@ public class TestGoodsOrderByDeposit extends XMBaseTest {
cardId1, memberId, "", String.valueOf(price.subtract(cardPrice.add(cardBalance.setScale(2, RoundingMode.HALF_UP)))), id, price, 1, info);
String signOrderId1 = purchaseGoods.getJSONObject("result").getString("id");
try {
Thread.sleep(30000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//校验1：获取B端订单详情：已完成状态
JSONObject getDetailResult_delinquent = orderTools.getDetail(signOrderId1);
String state_delinquent = getDetailResult_delinquent.getJSONObject("result").getString("state");
......@@ -139,11 +147,6 @@ public class TestGoodsOrderByDeposit extends XMBaseTest {
int signInventory=Integer.parseInt(signGetDetail_goods.getJSONObject("result").getJSONObject("singleSpecInfo").getString("inventory"));
Assert.assertEquals(signInventory,beforeInventory-1,"使用储值卡全额抵扣购买物品成功后，物品库存数应减少1个");
try {
Thread.sleep(8000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//校验3：数据中心-财务中心-营收明细-物品的确认收入增加对应的充值金额
JSONObject afterGetCostData_type = financeDataTools.getCostData_type("DAY", "GOODS", TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime());
......@@ -207,7 +210,7 @@ public class TestGoodsOrderByDeposit extends XMBaseTest {
try {
Thread.sleep(15000);
Thread.sleep(25000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
......@@ -249,7 +252,7 @@ public class TestGoodsOrderByDeposit extends XMBaseTest {
Assert.assertEquals(disRefundInventory,refundInventory-1,"B端作废退货退款订单后，物品库存数应减少1个");
try {
Thread.sleep(10000);
Thread.sleep(25000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
......@@ -289,7 +292,7 @@ public class TestGoodsOrderByDeposit extends XMBaseTest {
Assert.assertEquals(disSignInventory,disRefundInventory+1,"B端作废购买订单后，物品库存数应增加1个");
try {
Thread.sleep(10000);
Thread.sleep(25000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
......
src/main/java/com/xiaomai/cases/polar/goods/TestRefundGoods.java
......@@ -185,6 +185,9 @@ public class TestRefundGoods extends XMBaseTest {
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
System.out.println(TimeUtils.getTodayTime());
System.out.println(TimeUtils.getTodayEndTime());
//校验3：数据中心-财务中心-营收明细-物品的确认收入应减少
JSONObject refundAfterGetCostData_type = financeDataTools.getCostData_type("DAY", "GOODS", TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime());
......@@ -212,7 +215,7 @@ public class TestRefundGoods extends XMBaseTest {
Assert.assertEquals(discardRefundAfterInventory,refundAfterInventory-1,"作废退货退款订单成功后，库存数应-1");
try {
Thread.sleep(10000);
Thread.sleep(25000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
......@@ -260,7 +263,7 @@ public class TestRefundGoods extends XMBaseTest {
Assert.assertEquals(refundAfterInventory_onlyAmount, discardRefundAfterInventory, "仅退款成功后，库存数应不变");
try {
Thread.sleep(10000);
Thread.sleep(20000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
......@@ -289,7 +292,7 @@ public class TestRefundGoods extends XMBaseTest {
Assert.assertEquals(discardRefundAfterInventory_onlyAmount, refundAfterInventory_onlyAmount, "作废仅退款订单成功后，库存数应不变");
try {
Thread.sleep(10000);
Thread.sleep(20000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
......
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