Merge remote-tracking branch 'origin/master'

src/test/java/http/cases/ExchangeTest/兑吧老优惠券_兑换流程测试_ExchangeTest.java

@@ -589,6 +589,7 @@ public class 兑吧老优惠券_兑换流程测试_ExchangeTest extends CheckTem
     @Test
     public void 优惠券限时兑换测试() throws Exception{
 
+        int uid = 7113;
         Map<String,String> map = new HashMap<>();
         map.put("appItemId","172079");
         map.put("itemId","29667");
@@ -600,7 +601,7 @@ public class 兑吧老优惠券_兑换流程测试_ExchangeTest extends CheckTem
 
         //获取按钮状态
         Response detailResponse = mobileService.detail(authorization.dafuwengLogin(uid),"29667");
-        detailResponse.prettyPrint();
+//        detailResponse.prettyPrint();
         String exchangeText =  MatcherString.getString(detailResponse.asString(), "\"exchangeText\":\"(.*?)\",", 1);
 
 

src/test/java/http/cases/ExchangeTest/多档位话费_兑换流程测试_ExchangeTest.java

@@ -63,7 +63,7 @@ public class 多档位话费_兑换流程测试_ExchangeTest extends CheckTemple
 
             //获取按钮状态
             Response detailResponse = mobileService.detail(authorization.dafuwengLogin(uid),"1");
-            String exchangeText =  MatcherString.getString(detailResponse.asString(), "\"10\":\\{\"btnText\":\"(.*?)\",\"credits\":\"1000\",\"limitCount\":\"1\",\"limitScope\":\"everyday\",\"tipText\":\"此选项每日只能兑换1次\",\"status\":false}}", 1);
+            String exchangeText =  MatcherString.getString(detailResponse.asString(), "\"10\":\\{\"btnText\":\"(.*?)\",\"credits\":\"1\",\"limitCount\":\"1\",\"limitScope\":\"everyday\",\"tipText\":\"此选项每日只能兑换1次\",\"status\":false}}", 1);
             logger.info("兑换按钮："+ exchangeText);
 
             Assert.assertTrue(message.contains("已兑完"),"校验message失败");
@@ -107,7 +107,7 @@ public class 多档位话费_兑换流程测试_ExchangeTest extends CheckTemple
 
             //获取按钮状态
             Response detailResponse = mobileService.detail(authorization.dafuwengLogin(uid),"1");
-            String exchangeText =  MatcherString.getString(detailResponse.asString(), "\"20\":\\{\"btnText\":\"(.*?)\",\"credits\":\"2000\",\"limitCount\":\"1\",\"limitScope\":\"month\",\"tipText\":\"此选项每月只能兑换1次\",\"status\":false}", 1);
+            String exchangeText =  MatcherString.getString(detailResponse.asString(), "\"20\":\\{\"btnText\":\"(.*?)\",\"credits\":\"2\",\"limitCount\":\"1\",\"limitScope\":\"month\",\"tipText\":\"此选项每月只能兑换1次\",\"status\":false}", 1);
             logger.info("兑换按钮："+ exchangeText);
 
             Assert.assertTrue(message.contains("已兑完"),"校验message失败");
@@ -150,7 +150,7 @@ public class 多档位话费_兑换流程测试_ExchangeTest extends CheckTemple
 
             //获取按钮状态
             Response detailResponse = mobileService.detail(authorization.dafuwengLogin(uid),"1");
-            String exchangeText =  MatcherString.getString(detailResponse.asString(), "\"50\":\\{\"btnText\":\"(.*?)\",\"credits\":\"5000\",\"limitCount\":\"1\",\"limitScope\":\"forever\",\"tipText\":\"此选项只能兑换1次\",\"status\":false}", 1);
+            String exchangeText =  MatcherString.getString(detailResponse.asString(), "\"50\":\\{\"btnText\":\"(.*?)\",\"credits\":\"3\",\"limitCount\":\"1\",\"limitScope\":\"forever\",\"tipText\":\"此选项只能兑换1次\",\"status\":false}", 1);
             logger.info("兑换按钮："+ exchangeText);
 
             Assert.assertTrue(message.contains("已兑完"),"校验message失败");