Skip to content

X
xm-sportstest
Commit 501d4781 by yangfangfang
Options

解决数据报错

parent 04b348e3
Showing with 26 additions and 73 deletions
src/main/java/com/xiaomai/cases/polar/data/financeData/TestGetCostData.java
...@@ -62,7 +62,7 @@ public class TestGetCostData extends XMBaseTest { ...@@ -62,7 +62,7 @@ public class TestGetCostData extends XMBaseTest {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
//①创建部分支付订单，筛选全部和会员卡的确认收入和待消耗金额都无变化 //①创建已支付订单，筛选全部和会员卡的确认收入无变化，待消耗金额增加对应的金额
//造订单相关数据 //造订单相关数据
String name = "创建订单潜在会员"+ RandomStringUtil.randomString(3); String name = "创建订单潜在会员"+ RandomStringUtil.randomString(3);
String phone = RandomStringUtil.randomMobile("666"); String phone = RandomStringUtil.randomMobile("666");
...@@ -118,23 +118,14 @@ public class TestGetCostData extends XMBaseTest { ...@@ -118,23 +118,14 @@ public class TestGetCostData extends XMBaseTest {
if(limitResult == true) { if(limitResult == true) {
//创建部分支付订单 //创建已支付订单
JSONObject orderResult = orderTools.signOrder(cardId, latestSnapshotId, quantity, price, validPeriod, latestSnapshotId, 0, "PURCHASE", JSONObject orderResult = orderTools.signOrder(cardId, latestSnapshotId, quantity, price, validPeriod, latestSnapshotId, 0, "PURCHASE",
"MEMBER_CARD", memberId, price, price / 2, "1",false); "MEMBER_CARD", memberId, price, price, "1",false);
String getDetailId = orderResult.getString("result"); String getDetailId = orderResult.getString("result");
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//获取订单详情
JSONObject getDetailResult = orderTools.getDetail(getDetailId);
BigDecimal unpaidAmount = new BigDecimal(getDetailResult.getJSONObject("result").getString("unpaidAmount"));//欠费金额
try { try {
Thread.sleep(15000); Thread.sleep(8000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
...@@ -152,43 +143,15 @@ public class TestGetCostData extends XMBaseTest { ...@@ -152,43 +143,15 @@ public class TestGetCostData extends XMBaseTest {
//校验1： //校验1：
//校验部分支付订单对于营收数据-全部的确认收入和待消耗金额无变化 //校验已支付订单对于营收数据-全部的确认收入无变化,待消耗金额增加对应的金额
Assert.assertEquals(afterConfirmedAmount, beforeConfirmedAmount,"创建部分支付订单，数据中心-营收数据汇总-全部-确认收入应该无变化"); Assert.assertEquals(afterConfirmedAmount, beforeConfirmedAmount,"创建已支付订单，数据中心-营收数据汇总-全部-确认收入应该无变化");
Assert.assertEquals(afterLeftAmount,beforeLeftAmount,"创建部分支付订单，数据中心-营收数据汇总-全部-待消耗金额应该无变化"); Assert.assertEquals(afterLeftAmount,beforeLeftAmount.add(new BigDecimal(price).setScale(2, RoundingMode.HALF_UP)),"创建已支付订单，数据中心-营收数据汇总-全部-待消耗金额应该增加对应的金额");
//校验部分支付订单对于营收数据-会员卡的确认收入和待消耗金额无变化
Assert.assertEquals(afterConfirmedAmountMember_card, beforeConfirmedAmountMember_card,"创建部分支付订单，数据中心-营收数据汇总-会员卡-确认收入应该无变化");
Assert.assertEquals(afterLeftAmountMember_card,beforeLeftAmountMember_card,"创建部分支付订单，数据中心-营收数据汇总-会员卡-待消耗金额应该无变化");
//②继续收款，订单变成已支付，待消耗金额应该增加
//继续收款
JSONObject pay=orderTools.pay(unpaidAmount,"1",getDetailId);
//获取订单详情
JSONObject getDetailResult1 = orderTools.getDetail(getDetailId);
BigDecimal receivableAmount1 = new BigDecimal(getDetailResult1.getJSONObject("result").getString("receivableAmount"));//应收金额
BigDecimal paidAmount1 = new BigDecimal(getDetailResult1.getJSONObject("result").getString("paidAmount"));//已支付金额
try {
Thread.sleep(3000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//校验部已支付订单对于营收数据-会员卡的确认收入无变化,待消耗金额增加对应的金额
//再查一下当前营收数据-全部 Assert.assertEquals(afterConfirmedAmountMember_card, beforeConfirmedAmountMember_card,"创建已支付订单，数据中心-营收数据汇总-会员卡-确认收入应该无变化");
JSONObject afterGetCostData1=financeDataTools.getCostData_all("DAY",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime()); Assert.assertEquals(afterLeftAmountMember_card,beforeLeftAmountMember_card.add(new BigDecimal(price).setScale(2, RoundingMode.HALF_UP)),"创建已支付订单，数据中心-营收数据汇总-会员卡-待消耗金额应该增加对应的金额");
BigDecimal afterConfirmedAmount1=new BigDecimal(afterGetCostData1.getJSONObject("result").getString("confirmedAmount"));//确认收入
BigDecimal afterLeftAmount1=new BigDecimal(afterGetCostData1.getJSONObject("result").getString("leftAmount"));//待消耗金额
try {
Thread.sleep(3000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//根据商品类型全部加起来的确认收入查全部(覆盖一下商品类型的新接口) //根据商品类型全部加起来的确认收入查全部(覆盖一下商品类型的新接口)
JSONObject getCommodityTypeCostDetail=financeDataTools.getCommodityTypeCostDetail("DAY","LEFT_AMOUNT_DESC",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime()); JSONObject getCommodityTypeCostDetail=financeDataTools.getCommodityTypeCostDetail("DAY","LEFT_AMOUNT_DESC",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime());
...@@ -218,7 +181,7 @@ public class TestGetCostData extends XMBaseTest { ...@@ -218,7 +181,7 @@ public class TestGetCostData extends XMBaseTest {
// BigDecimal leftAmount6=new BigDecimal(getCommodityTypeCostDetail_result.getJSONArray("records").getJSONObject(5).getString("leftAmount")); // BigDecimal leftAmount6=new BigDecimal(getCommodityTypeCostDetail_result.getJSONArray("records").getJSONObject(5).getString("leftAmount"));
try { try {
Thread.sleep(15000); Thread.sleep(8000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
...@@ -227,7 +190,7 @@ public class TestGetCostData extends XMBaseTest { ...@@ -227,7 +190,7 @@ public class TestGetCostData extends XMBaseTest {
Assert.assertEquals(confirmedAmount1.setScale(2, RoundingMode.HALF_UP).add(confirmedAmount2.setScale(2, RoundingMode.HALF_UP)).add(confirmedAmount3.setScale(2, RoundingMode.HALF_UP)) Assert.assertEquals(confirmedAmount1.setScale(2, RoundingMode.HALF_UP).add(confirmedAmount2.setScale(2, RoundingMode.HALF_UP)).add(confirmedAmount3.setScale(2, RoundingMode.HALF_UP))
.add(confirmedAmount4.setScale(2, RoundingMode.HALF_UP)).add(confirmedAmount5.setScale(2, RoundingMode.HALF_UP)) .add(confirmedAmount4.setScale(2, RoundingMode.HALF_UP)).add(confirmedAmount5.setScale(2, RoundingMode.HALF_UP))
.add(confirmedAmount6.setScale(2, RoundingMode.HALF_UP)).add(confirmedAmount7.setScale(2, RoundingMode.HALF_UP)) .add(confirmedAmount6.setScale(2, RoundingMode.HALF_UP)).add(confirmedAmount7.setScale(2, RoundingMode.HALF_UP))
.add(confirmedAmount8.setScale(2, RoundingMode.HALF_UP)).add(confirmedAmount9.setScale(2, RoundingMode.HALF_UP)),afterConfirmedAmount1,"营收明细所有商品类型的确认收入加起来不等于营收数据全部的确认收入"); .add(confirmedAmount8.setScale(2, RoundingMode.HALF_UP)).add(confirmedAmount9.setScale(2, RoundingMode.HALF_UP)),afterConfirmedAmount,"营收明细所有商品类型的确认收入加起来应该等于营收数据全部的确认收入");
// //校验所有商品类型的待消耗金额加起来=全部的待消耗金额 // //校验所有商品类型的待消耗金额加起来=全部的待消耗金额
// Assert.assertEquals(leftAmount1.setScale(2, RoundingMode.HALF_UP).add(leftAmount2.setScale(2, RoundingMode.HALF_UP)).add(leftAmount3.setScale(2, RoundingMode.HALF_UP)) // Assert.assertEquals(leftAmount1.setScale(2, RoundingMode.HALF_UP).add(leftAmount2.setScale(2, RoundingMode.HALF_UP)).add(leftAmount3.setScale(2, RoundingMode.HALF_UP))
...@@ -240,17 +203,7 @@ public class TestGetCostData extends XMBaseTest { ...@@ -240,17 +203,7 @@ public class TestGetCostData extends XMBaseTest {
BigDecimal afterLeftAmountMember_card1=new BigDecimal(afterGetCostDataMember_card1.getJSONObject("result").getString("leftAmount"));//待消耗金额 BigDecimal afterLeftAmountMember_card1=new BigDecimal(afterGetCostDataMember_card1.getJSONObject("result").getString("leftAmount"));//待消耗金额
//校验2： //②消耗之后，筛选全部和会员卡的待消耗金额减少，确认收入增加
//校验已支付订单对于营收数据-全部的待消耗金额应该增加对应的金额，确认收入应该无变化
Assert.assertEquals(afterConfirmedAmount1,afterConfirmedAmount ,"创建已支付订单，数据中心-营收数据汇总-全部-确认收入应该无变化");
Assert.assertEquals(afterLeftAmount1,afterLeftAmount.add(paidAmount1.setScale(2, RoundingMode.HALF_UP)),"创建已支付订单，数据中心-营收数据汇总-全部-待消耗金额应该增加对应的金额");
//校验已支付订单对于营收数据-会员卡的待消耗金额应该增加对应的金额，确认收入应该无变化
Assert.assertEquals(afterConfirmedAmountMember_card1, afterConfirmedAmountMember_card,"创建已支付订单，数据中心-营收数据汇总-会员卡-确认收入应该无变化");
Assert.assertEquals(afterLeftAmountMember_card1,afterLeftAmountMember_card.add(paidAmount1.setScale(2, RoundingMode.HALF_UP)),"创建已支付订单，数据中心-营收数据汇总-会员卡-待消耗金额应该增加对应的金额");
//③消耗之后，筛选全部和会员卡的待消耗金额减少，确认收入增加
//获取会员下的购买的会员卡 //获取会员下的购买的会员卡
JSONObject fetchUserCardListResult=orderTools.fetchUserCardList("MEMBER",memberId,"NORMAL"); JSONObject fetchUserCardListResult=orderTools.fetchUserCardList("MEMBER",memberId,"NORMAL");
String memberCardId=fetchUserCardListResult.getJSONArray("result").getJSONObject(0).getString("id");//memberCardId String memberCardId=fetchUserCardListResult.getJSONArray("result").getJSONObject(0).getString("id");//memberCardId
...@@ -262,7 +215,7 @@ public class TestGetCostData extends XMBaseTest { ...@@ -262,7 +215,7 @@ public class TestGetCostData extends XMBaseTest {
try { try {
Thread.sleep(15000); Thread.sleep(8000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
...@@ -281,12 +234,12 @@ public class TestGetCostData extends XMBaseTest { ...@@ -281,12 +234,12 @@ public class TestGetCostData extends XMBaseTest {
//校验3： //校验3：
//校验手动扣次之后营收数据-筛选全部的待消耗金额应该减少对应的金额，确认收入应该增加对应的金额 //校验手动扣次之后营收数据-筛选全部的待消耗金额应该减少对应的金额，确认收入应该增加对应的金额
Assert.assertEquals(afterConfirmedAmount2,afterConfirmedAmount1.add(paidAmount1.setScale(2, RoundingMode.HALF_UP)),"手动扣完所有次数之后，数据中心-营收数据汇总-全部-确认收入应该增加对应的金额"); Assert.assertEquals(afterConfirmedAmount2,afterConfirmedAmount.add(new BigDecimal(price).setScale(2, RoundingMode.HALF_UP)),"手动扣完所有次数之后，数据中心-营收数据汇总-全部-确认收入应该增加对应的金额");
Assert.assertEquals(afterLeftAmount2,afterLeftAmount1.subtract(paidAmount1.setScale(2, RoundingMode.HALF_UP)),"手动扣完所有次数，数据中心-营收数据汇总-全部-待消耗金额应该减少对应的金额"); Assert.assertEquals(afterLeftAmount2,afterLeftAmount.subtract(new BigDecimal(price).setScale(2, RoundingMode.HALF_UP)),"手动扣完所有次数，数据中心-营收数据汇总-全部-待消耗金额应该减少对应的金额");
//校验手动扣次之后营收数据-筛选会员卡的待消耗金额应该减少对应的金额，确认收入应该增加对应的金额 //校验手动扣次之后营收数据-筛选会员卡的待消耗金额应该减少对应的金额，确认收入应该增加对应的金额
Assert.assertEquals(afterConfirmedAmountMember_card2, afterConfirmedAmountMember_card1.add(paidAmount1.setScale(2, RoundingMode.HALF_UP)),"手动扣完所有次数之后，数据中心-营收数据汇总-会员卡-确认收入应该增加对应的金额"); Assert.assertEquals(afterConfirmedAmountMember_card2, afterConfirmedAmountMember_card1.add(new BigDecimal(price).setScale(2, RoundingMode.HALF_UP)),"手动扣完所有次数之后，数据中心-营收数据汇总-会员卡-确认收入应该增加对应的金额");
Assert.assertEquals(afterLeftAmountMember_card2,afterLeftAmountMember_card1.subtract(paidAmount1.setScale(2, RoundingMode.HALF_UP)),"手动扣完所有次数，数据中心-营收数据汇总-会员卡-待消耗金额应该减少对应的金额"); Assert.assertEquals(afterLeftAmountMember_card2,afterLeftAmountMember_card1.subtract(new BigDecimal(price).setScale(2, RoundingMode.HALF_UP)),"手动扣完所有次数，数据中心-营收数据汇总-会员卡-待消耗金额应该减少对应的金额");
......
src/main/java/com/xiaomai/cases/polar/goods/TestRefundGoods.java
...@@ -70,7 +70,7 @@ public class TestRefundGoods extends XMBaseTest { ...@@ -70,7 +70,7 @@ public class TestRefundGoods extends XMBaseTest {
info.setLoginUser(LoginAccount.GYM_MINIAPPC); info.setLoginUser(LoginAccount.GYM_MINIAPPC);
try { try {
Thread.sleep(5000); Thread.sleep(3000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
...@@ -90,7 +90,7 @@ public class TestRefundGoods extends XMBaseTest { ...@@ -90,7 +90,7 @@ public class TestRefundGoods extends XMBaseTest {
int beforeInventory=Integer.parseInt(getDetail_goods.getJSONObject("result").getJSONObject("multiSpecInfo").getJSONArray("specCombinationList").getJSONObject(0).getString("inventory")); int beforeInventory=Integer.parseInt(getDetail_goods.getJSONObject("result").getJSONObject("multiSpecInfo").getJSONArray("specCombinationList").getJSONObject(0).getString("inventory"));
try { try {
Thread.sleep(5000); Thread.sleep(3000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
...@@ -131,7 +131,7 @@ public class TestRefundGoods extends XMBaseTest { ...@@ -131,7 +131,7 @@ public class TestRefundGoods extends XMBaseTest {
int refundBeforeInventory = Integer.parseInt(lastGetDetail_goods.getJSONObject("result").getJSONObject("multiSpecInfo").getJSONArray("specCombinationList").getJSONObject(0).getString("inventory")); int refundBeforeInventory = Integer.parseInt(lastGetDetail_goods.getJSONObject("result").getJSONObject("multiSpecInfo").getJSONArray("specCombinationList").getJSONObject(0).getString("inventory"));
try { try {
Thread.sleep(15000); Thread.sleep(5000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
...@@ -181,7 +181,7 @@ public class TestRefundGoods extends XMBaseTest { ...@@ -181,7 +181,7 @@ public class TestRefundGoods extends XMBaseTest {
Assert.assertEquals(refundAfterInventory,refundBeforeInventory+1,"退货退款成功后，库存数应+1"); Assert.assertEquals(refundAfterInventory,refundBeforeInventory+1,"退货退款成功后，库存数应+1");
try { try {
Thread.sleep(15000); Thread.sleep(20000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
...@@ -212,7 +212,7 @@ public class TestRefundGoods extends XMBaseTest { ...@@ -212,7 +212,7 @@ public class TestRefundGoods extends XMBaseTest {
Assert.assertEquals(discardRefundAfterInventory,refundAfterInventory-1,"作废退货退款订单成功后，库存数应-1"); Assert.assertEquals(discardRefundAfterInventory,refundAfterInventory-1,"作废退货退款订单成功后，库存数应-1");
try { try {
Thread.sleep(15000); Thread.sleep(5000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
...@@ -260,7 +260,7 @@ public class TestRefundGoods extends XMBaseTest { ...@@ -260,7 +260,7 @@ public class TestRefundGoods extends XMBaseTest {
Assert.assertEquals(refundAfterInventory_onlyAmount, discardRefundAfterInventory, "仅退款成功后，库存数应不变"); Assert.assertEquals(refundAfterInventory_onlyAmount, discardRefundAfterInventory, "仅退款成功后，库存数应不变");
try { try {
Thread.sleep(15000); Thread.sleep(5000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
...@@ -289,7 +289,7 @@ public class TestRefundGoods extends XMBaseTest { ...@@ -289,7 +289,7 @@ public class TestRefundGoods extends XMBaseTest {
Assert.assertEquals(discardRefundAfterInventory_onlyAmount, refundAfterInventory_onlyAmount, "作废仅退款订单成功后，库存数应不变"); Assert.assertEquals(discardRefundAfterInventory_onlyAmount, refundAfterInventory_onlyAmount, "作废仅退款订单成功后，库存数应不变");
try { try {
Thread.sleep(15000); Thread.sleep(5000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
...@@ -318,7 +318,7 @@ public class TestRefundGoods extends XMBaseTest { ...@@ -318,7 +318,7 @@ public class TestRefundGoods extends XMBaseTest {
Assert.assertEquals(discardSignAfterInventory, discardRefundAfterInventory_onlyAmount + 1, "作废购买订单成功后，库存数应+1"); Assert.assertEquals(discardSignAfterInventory, discardRefundAfterInventory_onlyAmount + 1, "作废购买订单成功后，库存数应+1");
try { try {
Thread.sleep(15000); Thread.sleep(5000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException(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