Skip to content

X
xm-sportstest
Commit 695e0af7 by yangfangfang
Options

物品

parent 5e953052
Showing with 5 additions and 19 deletions
src/main/java/com/xiaomai/cases/polar/goods/TestGoodsOrder.java
...@@ -95,10 +95,6 @@ public class TestGoodsOrder extends XMBaseTest { ...@@ -95,10 +95,6 @@ public class TestGoodsOrder extends XMBaseTest {
JSONObject beforeGetCostData_type=financeDataTools.getCostData_type("DAY","GOODS", TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime()); JSONObject beforeGetCostData_type=financeDataTools.getCostData_type("DAY","GOODS", TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime());
BigDecimal beforeConfirmedAmount=new BigDecimal(beforeGetCostData_type.getJSONObject("result").getString("confirmedAmount"));//确认收入 BigDecimal beforeConfirmedAmount=new BigDecimal(beforeGetCostData_type.getJSONObject("result").getString("confirmedAmount"));//确认收入
boolean checkAllowPurchase=Boolean.parseBoolean(goodCTools.checkAllowPurchase(id,memberId,price,beforeInventory,info).getJSONObject("result").getString("success"));
//校验一下物品购买是否可以通过，为true才可以
if(checkAllowPurchase==true) {
JSONObject purchaseGoods = goodCTools.purchaseGoods("0.00", null,memberId,"",price.toString(),id,price,1,info); JSONObject purchaseGoods = goodCTools.purchaseGoods("0.00", null,memberId,"",price.toString(),id,price,1,info);
String orderId1=purchaseGoods.getJSONObject("result").getString("id"); String orderId1=purchaseGoods.getJSONObject("result").getString("id");
...@@ -157,10 +153,7 @@ public class TestGoodsOrder extends XMBaseTest { ...@@ -157,10 +153,7 @@ public class TestGoodsOrder extends XMBaseTest {
Assert.assertEquals(lastConfirmedAmount,afterConfirmedAmount,"取消购买1个物品的待支付订单后，财务中心-营收明细-物品的确认收入应无变化"); Assert.assertEquals(lastConfirmedAmount,afterConfirmedAmount,"取消购买1个物品的待支付订单后，财务中心-营收明细-物品的确认收入应无变化");
}
else {
System.out.println("物品购买校验未通过，不能下单");
}
} }
@Test(description = "签单单规格:待支付->待补交->作废订单") @Test(description = "签单单规格:待支付->待补交->作废订单")
...@@ -202,10 +195,6 @@ public class TestGoodsOrder extends XMBaseTest { ...@@ -202,10 +195,6 @@ public class TestGoodsOrder extends XMBaseTest {
JSONObject beforeGetCostData_type=financeDataTools.getCostData_type("DAY","GOODS", TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime()); JSONObject beforeGetCostData_type=financeDataTools.getCostData_type("DAY","GOODS", TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime());
BigDecimal beforeConfirmedAmount=new BigDecimal(beforeGetCostData_type.getJSONObject("result").getString("confirmedAmount"));//确认收入 BigDecimal beforeConfirmedAmount=new BigDecimal(beforeGetCostData_type.getJSONObject("result").getString("confirmedAmount"));//确认收入
boolean checkAllowPurchase=Boolean.parseBoolean(goodCTools.checkAllowPurchase(id,memberId,price,beforeInventory,info).getJSONObject("result").getString("success"));
//校验一下物品购买是否可以通过，为true才可以
if(checkAllowPurchase==true) {
JSONObject purchaseGoods = goodCTools.purchaseGoods("0.00", null,memberId,"",price.toString(),id,price,1,info); JSONObject purchaseGoods = goodCTools.purchaseGoods("0.00", null,memberId,"",price.toString(),id,price,1,info);
String orderId2=purchaseGoods.getJSONObject("result").getString("id"); String orderId2=purchaseGoods.getJSONObject("result").getString("id");
...@@ -294,10 +283,7 @@ public class TestGoodsOrder extends XMBaseTest { ...@@ -294,10 +283,7 @@ public class TestGoodsOrder extends XMBaseTest {
BigDecimal discardConfirmedAmount=new BigDecimal(discardGetCostData_type.getJSONObject("result").getString("confirmedAmount"));//确认收入 BigDecimal discardConfirmedAmount=new BigDecimal(discardGetCostData_type.getJSONObject("result").getString("confirmedAmount"));//确认收入
Assert.assertEquals(discardConfirmedAmount,lastConfirmedAmount.subtract(unpaidAmount.setScale(2, RoundingMode.HALF_UP)),"B端作废订单后，财务中心-营收明细-物品的确认收入应减少"); Assert.assertEquals(discardConfirmedAmount,lastConfirmedAmount.subtract(unpaidAmount.setScale(2, RoundingMode.HALF_UP)),"B端作废订单后，财务中心-营收明细-物品的确认收入应减少");
}
else {
System.out.println("物品购买校验未通过，不能下单");
}
} }
......
src/main/java/com/xiaomai/cases/polar/goods/TestModifyGoods.java
...@@ -598,7 +598,7 @@ public class TestModifyGoods extends XMBaseTest { ...@@ -598,7 +598,7 @@ public class TestModifyGoods extends XMBaseTest {
} }
String name3="自动化多规格编辑成单"; String name3="自动化多规格编辑为单";
//case4：多规格改单规格 //case4：多规格改单规格
...@@ -648,7 +648,7 @@ public class TestModifyGoods extends XMBaseTest { ...@@ -648,7 +648,7 @@ public class TestModifyGoods extends XMBaseTest {
//校验1：修改后字段：获取B端物品详情 //校验1：修改后字段：获取B端物品详情
JSONObject getDetail_goods3 = goodTools.getDetail_goods(createGoodsId).getJSONObject("result"); JSONObject getDetail_goods3 = goodTools.getDetail_goods(createGoodsId).getJSONObject("result");
Assert.assertEquals(getDetail_goods3.getString("name"), "自动化多规格编辑成单", "编辑物品名称但详情非编辑后的物品名称"); Assert.assertEquals(getDetail_goods3.getString("name"), "自动化多规格编辑为单", "编辑物品名称但详情非编辑后的物品名称");
Assert.assertEquals(getDetail_goods3.getJSONObject("group").getString("id"), "1873903328974499841", "编辑物品分组但详情非编辑后的分组"); Assert.assertEquals(getDetail_goods3.getJSONObject("group").getString("id"), "1873903328974499841", "编辑物品分组但详情非编辑后的分组");
Assert.assertEquals(getDetail_goods3.getBoolean("multiSpec").booleanValue(), false, "编辑成单规格但详情非编辑后的单规格"); Assert.assertEquals(getDetail_goods3.getBoolean("multiSpec").booleanValue(), false, "编辑成单规格但详情非编辑后的单规格");
Assert.assertEquals(getDetail_goods3.getString("state"), "YES", "编辑成单规格成功后但详情非编辑后的启用状态"); Assert.assertEquals(getDetail_goods3.getString("state"), "YES", "编辑成单规格成功后但详情非编辑后的启用状态");
...@@ -660,7 +660,7 @@ public class TestModifyGoods extends XMBaseTest { ...@@ -660,7 +660,7 @@ public class TestModifyGoods extends XMBaseTest {
//校验2：修改后字段：获取C端物品详情 //校验2：修改后字段：获取C端物品详情
JSONObject getDetail_goodsC3 = goodCTools.getDetail_goods_C(createGoodsId, info).getJSONObject("result"); JSONObject getDetail_goodsC3 = goodCTools.getDetail_goods_C(createGoodsId, info).getJSONObject("result");
Assert.assertEquals(getDetail_goodsC3.getString("name"), "自动化多规格编辑成单", "编辑物品名称但详情非编辑后的物品名称"); Assert.assertEquals(getDetail_goodsC3.getString("name"), "自动化多规格编辑为单", "编辑物品名称但详情非编辑后的物品名称");
Assert.assertEquals(getDetail_goodsC3.getJSONObject("group").getString("id"), "1873903328974499841", "编辑物品分组但详情非编辑后的分组"); Assert.assertEquals(getDetail_goodsC3.getJSONObject("group").getString("id"), "1873903328974499841", "编辑物品分组但详情非编辑后的分组");
Assert.assertEquals(getDetail_goodsC3.getBoolean("multiSpec").booleanValue(), false, "编辑成单规格但详情非编辑后的单规格"); Assert.assertEquals(getDetail_goodsC3.getBoolean("multiSpec").booleanValue(), false, "编辑成单规格但详情非编辑后的单规格");
Assert.assertEquals(getDetail_goodsC3.getString("state"), "YES", "编辑成单规格成功后但详情非编辑后的启用状态"); Assert.assertEquals(getDetail_goodsC3.getString("state"), "YES", "编辑成单规格成功后但详情非编辑后的启用状态");
......
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