Merge remote-tracking branch 'origin/master'

src/main/java/com/xiaomai/cases/polar/goods/TestGoodsOrder.java

@@ -107,17 +107,19 @@ public class TestGoodsOrder extends XMBaseTest {
 
             Assert.assertEquals(state,"WAITING","未生成待支付物品订单");
 
+            try {
+                Thread.sleep(15000);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+
 
             //校验1：B端商品详情库存数-1
             JSONObject afterGetDetail_goods=goodTools.getDetail_goods(goodsId1);
             int afterInventory=Integer.parseInt(afterGetDetail_goods.getJSONObject("result").getJSONObject("singleSpecInfo").getString("inventory"));
             Assert.assertEquals(afterInventory,beforeInventory-1,"购买1个物品生成待支付订单后，应扣除1个库存数");
 
-            try {
-                Thread.sleep(8000);
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
+
             //校验2：权益未到，数据中心的确认收入没有增加
             //获取数据中心-财务中心-营收明细-物品的确认收入
             JSONObject afterGetCostData_type=financeDataTools.getCostData_type("DAY","GOODS", TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime());
@@ -129,6 +131,12 @@ public class TestGoodsOrder extends XMBaseTest {
 
             JSONObject cancel=orderTools.cancel(orderId1);
 
+            try {
+                Thread.sleep(15000);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+
             //校验1：获取B端订单详情：已取消状态
             JSONObject getDetailResult_cancel = orderTools.getDetail(orderId1);
             String state_cancel=getDetailResult_cancel.getJSONObject("result").getString("state");
@@ -140,11 +148,6 @@ public class TestGoodsOrder extends XMBaseTest {
             int lastInventory=Integer.parseInt(lastGetDetail_goods.getJSONObject("result").getJSONObject("singleSpecInfo").getString("inventory"));
             Assert.assertEquals(lastInventory,afterInventory+1,"取消购买1个物品的待支付订单后，应返回1个库存数");
 
-            try {
-                Thread.sleep(8000);
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
 
             //校验3：权益未涉及，数据中心的确认收入没有变化
             //获取数据中心-财务中心-营收明细-物品的确认收入
@@ -156,7 +159,7 @@ public class TestGoodsOrder extends XMBaseTest {
 
 
     }
-    @Test(description = "签单单规格:待支付->待补交->作废订单")
+    @Test(description = "签单单规格:待支付->继续收款为已完成->作废订单")
     public void testSignGoods_single1() {
 
         //case1：购买非0订单->待支付->带补交->作废订单
@@ -199,6 +202,12 @@ public class TestGoodsOrder extends XMBaseTest {
             JSONObject purchaseGoods = goodCTools.purchaseGoods("0.00", null,memberId,"",String.valueOf(price),id,price,1,info);
             String orderId2=purchaseGoods.getJSONObject("result").getString("id");
 
+            try {
+                Thread.sleep(15000);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+
             //生成待支付订单后，去B端继续收款
 
             //获取B端订单详情：待支付状态
@@ -208,16 +217,13 @@ public class TestGoodsOrder extends XMBaseTest {
             Assert.assertEquals(state,"WAITING","未生成待支付物品订单");
 
 
+
             //校验1：B端商品详情库存数-1
             JSONObject afterGetDetail_goods=goodTools.getDetail_goods(goodsId1);
             int afterInventory=Integer.parseInt(afterGetDetail_goods.getJSONObject("result").getJSONObject("singleSpecInfo").getString("inventory"));
             Assert.assertEquals(afterInventory,beforeInventory-1,"购买1个物品生成待支付订单后，应扣除1个库存数");
 
-            try {
-                Thread.sleep(8000);
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
+
             //校验2：权益未到，数据中心的确认收入没有增加
             //获取数据中心-财务中心-营收明细-物品的确认收入
             JSONObject afterGetCostData_type=financeDataTools.getCostData_type("DAY","GOODS", TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime());
@@ -225,28 +231,27 @@ public class TestGoodsOrder extends XMBaseTest {
             Assert.assertEquals(afterConfirmedAmount,beforeConfirmedAmount,"购买1个物品生成待支付订单后，财务中心-营收明细-物品的确认收入应无变化");
 
 
-            //B端变更为待补交物品订单
+            //B端变更为已完成物品订单
 
-            BigDecimal num=new BigDecimal(2);
+            //继续收款为已完成
+            JSONObject pay_unpaid=orderTools.pay_unpaid(unpaidAmount,"1",orderId2,true);
 
-            //继续收款为待补交
-            JSONObject pay_unpaid=orderTools.pay_unpaid(unpaidAmount.divide(num),"1",orderId2,true);
+            try {
+                Thread.sleep(20000);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
 
-            //校验1：获取B端订单详情：待补交状态
+            //校验1：获取B端订单详情：已完成状态
             JSONObject getDetailResult_delinquent = orderTools.getDetail(orderId2);
             String state_delinquent=getDetailResult_delinquent.getJSONObject("result").getString("state");
-            Assert.assertEquals(state_delinquent,"DELINQUENT","B端继续收款后订单状态由待支付变为待补交");
+            Assert.assertEquals(state_delinquent,"PAID","B端继续收款后订单状态由待支付变为已完成");
 
-            //校验2：B端商品详情库存数不变
+            //校验2：继续收款后，B端商品详情库存数应不变
             JSONObject lastGetDetail_goods=goodTools.getDetail_goods(goodsId1);
             int lastInventory=Integer.parseInt(lastGetDetail_goods.getJSONObject("result").getJSONObject("singleSpecInfo").getString("inventory"));
-            Assert.assertEquals(lastInventory,afterInventory,"B端继续收款后订单状态由待支付变为待补交，库存数应不变");
+            Assert.assertEquals(lastInventory,afterInventory,"B端继续收款后订单状态由待支付变为已完成，库存数应不变");
 
-            try {
-                Thread.sleep(20000);
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
 
             //校验3：权益到，数据中心的确认收入应增加
             //获取数据中心-财务中心-营收明细-物品的确认收入
@@ -256,10 +261,16 @@ public class TestGoodsOrder extends XMBaseTest {
 
 
 
-            //作废待补交订单
+            //作废已完成订单
 
             JSONObject discard=orderTools.discard(orderId2, "重复录入", "已作废签单订单" + RandomStringUtil.randomString(10));
 
+            try {
+                Thread.sleep(15000);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+
 
             //校验1：获取B端订单详情：已作废状态
             JSONObject getDetailResult_discard = orderTools.getDetail(orderId2);