Skip to content

X
xm-sportstest
Commit aa214646 by yangfangfang
Options

解决报错

parent a0da933d
Showing with 71 additions and 86 deletions
src/main/java/com/xiaomai/cases/polar/data/financeData/TestGetCostData.java
......@@ -56,11 +56,6 @@ public class TestGetCostData extends XMBaseTest {
BigDecimal beforeConfirmedAmountMember_card=new BigDecimal(beforeGetCostDataMember_card.getJSONObject("result").getString("confirmedAmount"));//确认收入
BigDecimal beforeLeftAmountMember_card=new BigDecimal(beforeGetCostDataMember_card.getJSONObject("result").getString("leftAmount"));//待消耗金额
try {
Thread.sleep(3000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//①创建已支付订单，筛选全部和会员卡的确认收入无变化，待消耗金额增加对应的金额
//造订单相关数据
......@@ -125,9 +120,9 @@ public class TestGetCostData extends XMBaseTest {
try {
Thread.sleep(30000);
Thread.sleep(200000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
e.printStackTrace();
}
......@@ -143,12 +138,6 @@ public class TestGetCostData extends XMBaseTest {
try {
Thread.sleep(25000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//校验1：
//校验已支付订单对于营收数据-全部的确认收入无变化,待消耗金额增加对应的金额
......@@ -223,9 +212,9 @@ public class TestGetCostData extends XMBaseTest {
try {
Thread.sleep(20000);
Thread.sleep(200000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
e.printStackTrace();
}
......
src/main/java/com/xiaomai/cases/polar/goods/TestGoodsOrder.java
......@@ -266,9 +266,9 @@ public class TestGoodsOrder extends XMBaseTest {
JSONObject discard=orderTools.discard(orderId2, "重复录入", "已作废签单订单" + RandomStringUtil.randomString(10));
try {
Thread.sleep(250000);
Thread.sleep(200000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
e.printStackTrace();
}
......
src/main/java/com/xiaomai/cases/polar/goods/TestGoodsOrderByDeposit.java
......@@ -112,11 +112,6 @@ public class TestGoodsOrderByDeposit extends XMBaseTest {
BigDecimal price=new BigDecimal(getDetail_goods.getJSONObject("result").getJSONObject("singleSpecInfo").getString("price"));
int beforeInventory=Integer.parseInt(getDetail_goods.getJSONObject("result").getJSONObject("singleSpecInfo").getString("inventory"));
try {
Thread.sleep(8000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//获取数据中心-财务中心-营收明细-物品的确认收入
JSONObject beforeGetCostData_type=financeDataTools.getCostData_type("DAY","GOODS", TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime());
......@@ -129,9 +124,9 @@ public class TestGoodsOrderByDeposit extends XMBaseTest {
try {
Thread.sleep(30000);
Thread.sleep(200000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
e.printStackTrace();
}
......@@ -154,12 +149,6 @@ public class TestGoodsOrderByDeposit extends XMBaseTest {
Assert.assertEquals(afterConfirmedAmount,beforeConfirmedAmount.add(cardPrice.setScale(2,RoundingMode.HALF_UP)),"使用储值卡全额抵扣购买物品，确认收入增加储值卡充值金额");
try {
Thread.sleep(3000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//校验4：储值卡额度减少，剩余充值金额+赠送金额为0
//获取储值卡详情
JSONObject fetchDetailById1=cardTools.memberCardFindDetailById(cardId1);
......@@ -195,6 +184,13 @@ public class TestGoodsOrderByDeposit extends XMBaseTest {
JSONObject refundGoods=goodTools.refundGoods(xmAppApi.getLoginInfo().getAdminId(),ownerName,quantity,refundAmount,true,voucherItemId,memberId,receivableAmount,amount,"1",cardPrice,cardBalance,cardId1,0,amount,amount);
String refundOrderId1=refundGoods.getString("result");
try {
Thread.sleep(200000);
} catch (InterruptedException e) {
e.printStackTrace();
}
//校验：
//校验1：获取B端订单详情：退单已完成状态
......@@ -209,12 +205,6 @@ public class TestGoodsOrderByDeposit extends XMBaseTest {
Assert.assertEquals(refundInventory,signInventory+1,"使用储值卡全额抵扣购买物品退货退款成功后，物品库存数应增加1个");
try {
Thread.sleep(25000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//校验3：数据中心-财务中心-营收明细-物品的确认收入应减少充值金额
......@@ -238,6 +228,14 @@ public class TestGoodsOrderByDeposit extends XMBaseTest {
JSONObject discardRefundOrder=orderTools.discard(refundOrderId1, "重复录入", "已作废物品退货退款订单" + RandomStringUtil.randomString(10));
try {
Thread.sleep(200000);
} catch (InterruptedException e) {
e.printStackTrace();
}
//校验：
//校验1：获取B端订单详情：退单已作废状态
JSONObject getDetailResult_discardRefund = orderTools.getDetail(refundOrderId1);
......@@ -251,12 +249,6 @@ public class TestGoodsOrderByDeposit extends XMBaseTest {
int disRefundInventory=Integer.parseInt(disRefundGetDetail_goods.getJSONObject("result").getJSONObject("singleSpecInfo").getString("inventory"));
Assert.assertEquals(disRefundInventory,refundInventory-1,"B端作废退货退款订单后，物品库存数应减少1个");
try {
Thread.sleep(25000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//校验3：数据中心-财务中心-营收明细-物品的确认收入应增加充值金额
JSONObject disRefundAfterGetCostData_type = financeDataTools.getCostData_type("DAY", "GOODS", TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime());
......@@ -278,6 +270,13 @@ public class TestGoodsOrderByDeposit extends XMBaseTest {
JSONObject discardSignOrder=orderTools.discard(signOrderId1, "重复录入", "已作废物品购买订单" + RandomStringUtil.randomString(10));
try {
Thread.sleep(200000);
} catch (InterruptedException e) {
e.printStackTrace();
}
//校验：
//校验1：获取B端订单详情：购买订单已作废状态
JSONObject getDetailResult_discardSign = orderTools.getDetail(signOrderId1);
......@@ -291,12 +290,6 @@ public class TestGoodsOrderByDeposit extends XMBaseTest {
int disSignInventory=Integer.parseInt(disSignGetDetail_goods.getJSONObject("result").getJSONObject("singleSpecInfo").getString("inventory"));
Assert.assertEquals(disSignInventory,disRefundInventory+1,"B端作废购买订单后，物品库存数应增加1个");
try {
Thread.sleep(25000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//校验3：数据中心-财务中心-营收明细-物品的确认收入应减少充值金额
JSONObject disSignAfterGetCostData_type = financeDataTools.getCostData_type("DAY", "GOODS", TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime());
......
src/main/java/com/xiaomai/cases/polar/goods/TestRefundGoods.java
......@@ -89,11 +89,6 @@ public class TestRefundGoods extends XMBaseTest {
BigDecimal price=new BigDecimal(getDetail_goods.getJSONObject("result").getJSONObject("multiSpecInfo").getJSONArray("specCombinationList").getJSONObject(0).getString("price"));
int beforeInventory=Integer.parseInt(getDetail_goods.getJSONObject("result").getJSONObject("multiSpecInfo").getJSONArray("specCombinationList").getJSONObject(0).getString("inventory"));
try {
Thread.sleep(8000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//获取数据中心-财务中心-营收明细-物品的确认收入
JSONObject beforeGetCostData_type=financeDataTools.getCostData_type("DAY","GOODS", TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime());
......@@ -107,6 +102,13 @@ public class TestRefundGoods extends XMBaseTest {
JSONObject purchaseGoods = goodCTools.purchaseGoods("0.00", null, memberId, "", String.valueOf(price), id, price, 1, info);
String signOrderId1 = purchaseGoods.getJSONObject("result").getString("id");
try {
Thread.sleep(200000);
} catch (InterruptedException e) {
e.printStackTrace();
}
//生成待支付订单后，去B端继续收款
//获取B端订单详情：待支付状态
......@@ -130,11 +132,6 @@ public class TestRefundGoods extends XMBaseTest {
JSONObject lastGetDetail_goods = goodTools.getDetail_goods(goodsId1);
int refundBeforeInventory = Integer.parseInt(lastGetDetail_goods.getJSONObject("result").getJSONObject("multiSpecInfo").getJSONArray("specCombinationList").getJSONObject(0).getString("inventory"));
try {
Thread.sleep(20000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//获取数据中心-财务中心-营收明细-物品的确认收入
JSONObject refundBeforeGetCostData_type = financeDataTools.getCostData_type("DAY", "GOODS", TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime());
......@@ -148,6 +145,9 @@ public class TestRefundGoods extends XMBaseTest {
JSONObject listLeftGoodsItem=goodTools.listLeftGoodsItem(memberId);
String refundId=listLeftGoodsItem.getJSONArray("result").getJSONObject(0).getString("id");
//B端退单时获取订单可退物品（退单界面）
JSONObject getLeftGoodsItem=goodTools.getLeftGoodsItem(refundId);
int quantity=Integer.parseInt(getLeftGoodsItem.getJSONObject("result").getString("leftQuantity"));
......@@ -168,6 +168,13 @@ public class TestRefundGoods extends XMBaseTest {
JSONObject refundGoods=goodTools.refundGoods(xmAppApi.getLoginInfo().getAdminId(),ownerName,quantity,refundAmount,true,voucherItemId,memberId,receivableAmount,amount,"1",new BigDecimal("0.00"),new BigDecimal("0.00"),"",0,amount,amount);
String refundOrderId1=refundGoods.getString("result");
try {
Thread.sleep(200000);
} catch (InterruptedException e) {
e.printStackTrace();
}
//校验：
//校验1：获取B端订单详情：退单已完成状态
JSONObject getDetailResult_refund = orderTools.getDetail(refundOrderId1);
......@@ -180,14 +187,6 @@ public class TestRefundGoods extends XMBaseTest {
int refundAfterInventory = Integer.parseInt(refundAfterGetDetail_goods.getJSONObject("result").getJSONObject("multiSpecInfo").getJSONArray("specCombinationList").getJSONObject(0).getString("inventory"));
Assert.assertEquals(refundAfterInventory,refundBeforeInventory+1,"退货退款成功后，库存数应+1");
try {
Thread.sleep(25000);
} 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());
......@@ -202,6 +201,12 @@ public class TestRefundGoods extends XMBaseTest {
JSONObject discardRefundOrder=orderTools.discard(refundOrderId1, "重复录入", "已作废物品退货退款订单" + RandomStringUtil.randomString(10));
try {
Thread.sleep(200000);
} catch (InterruptedException e) {
e.printStackTrace();
}
//校验：
//校验1：获取B端订单详情：退单已作废状态
JSONObject getDetailResult_discardRefund = orderTools.getDetail(refundOrderId1);
......@@ -214,11 +219,6 @@ public class TestRefundGoods extends XMBaseTest {
int discardRefundAfterInventory = Integer.parseInt(discardRefundAfterGetDetail_goods.getJSONObject("result").getJSONObject("multiSpecInfo").getJSONArray("specCombinationList").getJSONObject(0).getString("inventory"));
Assert.assertEquals(discardRefundAfterInventory,refundAfterInventory-1,"作废退货退款订单成功后，库存数应-1");
try {
Thread.sleep(25000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//校验3：数据中心-财务中心-营收明细-物品的确认收入应增加
JSONObject discardRefundAfterGetCostData_type = financeDataTools.getCostData_type("DAY", "GOODS", TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime());
......@@ -249,6 +249,12 @@ public class TestRefundGoods extends XMBaseTest {
JSONObject refundGoods_onlyAmount = goodTools.refundGoods(xmAppApi.getLoginInfo().getAdminId(), ownerName, quantity_onlyAmount, refundAmount_onlyAmount, false, voucherItemId_onlyAmount, memberId, receivableAmount_onlyAmount, amount_onlyAmount, "1", new BigDecimal("0.00"), new BigDecimal("0.00"), "", 0, amount_onlyAmount, amount_onlyAmount);
String refundOrderId2_onlyAmount = refundGoods_onlyAmount.getString("result");
try {
Thread.sleep(200000);
} catch (InterruptedException e) {
e.printStackTrace();
}
//校验：
//校验1：获取B端订单详情：退单已完成状态
......@@ -262,11 +268,6 @@ public class TestRefundGoods extends XMBaseTest {
int refundAfterInventory_onlyAmount = Integer.parseInt(refundAfterGetDetail_goods_onlyAmount.getJSONObject("result").getJSONObject("multiSpecInfo").getJSONArray("specCombinationList").getJSONObject(0).getString("inventory"));
Assert.assertEquals(refundAfterInventory_onlyAmount, discardRefundAfterInventory, "仅退款成功后，库存数应不变");
try {
Thread.sleep(20000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//校验3：数据中心-财务中心-营收明细-物品的确认收入应减少
JSONObject refundAfterGetCostData_type_onlyAmount = financeDataTools.getCostData_type("DAY", "GOODS", TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime());
......@@ -279,6 +280,12 @@ public class TestRefundGoods extends XMBaseTest {
JSONObject discardRefundOrder_onlyAmount = orderTools.discard(refundOrderId2_onlyAmount, "重复录入", "已作废物品仅退款订单" + RandomStringUtil.randomString(10));
try {
Thread.sleep(200000);
} catch (InterruptedException e) {
e.printStackTrace();
}
//校验：
//校验1：获取B端订单详情：退单已作废状态
JSONObject getDetailResult_discardRefund_onlyAmount = orderTools.getDetail(refundOrderId2_onlyAmount);
......@@ -291,11 +298,6 @@ public class TestRefundGoods extends XMBaseTest {
int discardRefundAfterInventory_onlyAmount = Integer.parseInt(discardRefundAfterGetDetail_goods_onlyAmount.getJSONObject("result").getJSONObject("multiSpecInfo").getJSONArray("specCombinationList").getJSONObject(0).getString("inventory"));
Assert.assertEquals(discardRefundAfterInventory_onlyAmount, refundAfterInventory_onlyAmount, "作废仅退款订单成功后，库存数应不变");
try {
Thread.sleep(20000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//校验3：数据中心-财务中心-营收明细-物品的确认收入应增加
JSONObject discardRefundAfterGetCostData_type_onlyAmount = financeDataTools.getCostData_type("DAY", "GOODS", TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime());
......@@ -308,6 +310,12 @@ public class TestRefundGoods extends XMBaseTest {
JSONObject discardSignOrder = orderTools.discard(signOrderId1, "重复录入", "已作废物品购买订单" + RandomStringUtil.randomString(10));
try {
Thread.sleep(200000);
} catch (InterruptedException e) {
e.printStackTrace();
}
//校验：
//校验1：获取B端订单详情：购买订单已作废状态
JSONObject getDetailResult_discardSign = orderTools.getDetail(signOrderId1);
......@@ -320,11 +328,6 @@ public class TestRefundGoods extends XMBaseTest {
int discardSignAfterInventory = Integer.parseInt(discardSignAfterGetDetail_goods.getJSONObject("result").getJSONObject("multiSpecInfo").getJSONArray("specCombinationList").getJSONObject(0).getString("inventory"));
Assert.assertEquals(discardSignAfterInventory, discardRefundAfterInventory_onlyAmount + 1, "作废购买订单成功后，库存数应+1");
try {
Thread.sleep(20000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//校验3：数据中心-财务中心-营收明细-物品的确认收入应减少
JSONObject discardSignAfterGetCostData_type = financeDataTools.getCostData_type("DAY", "GOODS", TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime());
......
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