Merge remote-tracking branch 'origin/master'

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

@@ -40,6 +40,8 @@ public class TestGoodsOrderByDeposit extends XMBaseTest {
 
     String memberId;
 
+    String voucherId;
+
 
 
     @BeforeMethod
@@ -96,7 +98,7 @@ public class TestGoodsOrderByDeposit extends XMBaseTest {
 
 
         //1.购储值卡,获取购卡订单id
-        String voucherId = cardTools.signOrderDeposit(cardId,latestSnapshotId,memberId,String.valueOf(cardPrice),String.valueOf(cardBalance));
+        voucherId = cardTools.signOrderDeposit(cardId,latestSnapshotId,memberId,String.valueOf(cardPrice),String.valueOf(cardBalance));
 
         //获取已售储值卡ID，使用储值卡抵扣的时候需要的ID
         JSONObject listUserUsableDepositCardB=cardTools.listUserUsableDepositCardB(memberId,"GOODS").getJSONObject("result").getJSONArray("applicableList").getJSONObject(0);
@@ -305,4 +307,13 @@ public class TestGoodsOrderByDeposit extends XMBaseTest {
 
 
     }
+
+    @Test(description ="作废签单订单",priority = 1)
+    public void  discard(){
+        //作废储值卡签单订单
+        orderTools.discard(voucherId, "重复录入", "已作废储值卡签单订单" + RandomStringUtil.randomString(10));
+
+
+    }
+
     }