Merge branch 'develop'

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

@@ -271,7 +271,7 @@ public class 优惠券_兑换流程测试_ExchangeTest extends CheckTemplet {
         String exchangeText =  MatcherString.getString(detailResponse.asString(), "\"exchangeText\":\"(.*?)\",", 1);
 
         Assert.assertEquals(response.jsonPath().getString("message"),"今日已兑完，明天再来哦(14)","校验message失败");
-        Assert.assertEquals(exchangeText,"已兑完","校验马上兑换按钮状态失败");
+        Assert.assertEquals(exchangeText,"商品售罄","校验马上兑换按钮状态失败");
         logger.info("校验优惠券商品库存不足和预分配库存不足场景成功");
 
     }
@@ -401,7 +401,7 @@ public class 优惠券_兑换流程测试_ExchangeTest extends CheckTemplet {
             String exchangeText =  MatcherString.getString(detailResponse.asString(), "\"exchangeText\":\"(.*?)\",", 1);
 
             Assert.assertEquals(response.jsonPath().getString("message"),"已兑换","校验用户兑换限制失败");
-            Assert.assertEquals(exchangeText,"已兑换","校验马上兑换按钮状态失败");
+            Assert.assertEquals(exchangeText,"已达兑换次数上限","校验马上兑换按钮状态失败");
             logger.info("校验优惠券用户永久兑换限制成功");
 
         }catch (Exception e){
@@ -443,7 +443,7 @@ public class 优惠券_兑换流程测试_ExchangeTest extends CheckTemplet {
             String exchangeText =  MatcherString.getString(detailResponse.asString(), "\"exchangeText\":\"(.*?)\",", 1);
 
             Assert.assertEquals(response.jsonPath().getString("message"),"今日已兑换","校验用户兑换限制失败");
-            Assert.assertEquals(exchangeText,"今日已兑换","校验马上兑换按钮状态失败");
+            Assert.assertEquals(exchangeText,"今日已达兑换上限","校验马上兑换按钮状态失败");
             logger.info("校验优惠券用户每天兑换限制成功");
 
         }catch (Exception e){

src/test/java/http/cases/ExchangeTest/实物_兑换异常测试_ExchangeTest.java

@@ -112,7 +112,7 @@ public class 实物_兑换异常测试_ExchangeTest extends CheckTemplet {
 //        }
         //校验messaga字段返回值
         String message2 = response1.jsonPath().getString("message");
-        Assert.assertEquals(message2,"已兑换","message字段校验失败-期望是已兑换");
+        Assert.assertEquals(message2,"已达兑换次数上限","message字段校验失败-期望是已兑换");
     }
 
     @Test

src/test/java/http/cases/ExchangeTest/虚拟商品_兑换异常测试_ExchangeTest.java

@@ -79,7 +79,7 @@ public class 虚拟商品_兑换异常测试_ExchangeTest extends CheckTemplet {
         response.prettyPrint();
         String exchangeText = MatcherString.getString(response.asString(), "\"exchangeText\":\"(.*?)\",", 1);
         logger.info("exchangeText" + exchangeText);
-        Assert.assertEquals(exchangeText, "已兑完", "页面数据返回错误");
+        Assert.assertEquals(exchangeText, "商品售罄", "页面数据返回错误");
         logger.info("校验 页面数据文本信息 成功");
         response = virtualExchangeService.exchange2(authorization.dafuwengLogin(uid), "185535", "123");
         response.prettyPrint();
@@ -519,7 +519,7 @@ public class 虚拟商品_兑换异常测试_ExchangeTest extends CheckTemplet {
         String exchangeText = MatcherString.getString(response.asString(), "\"exchangeText\":(.*?),", 1);
         logger.info("exchangeText:" + exchangeText);
 
-        Assert.assertEquals(exchangeText, "\"已下架\"", "页面数据返回错误");
+        Assert.assertEquals(exchangeText, "\"商品已下架\"", "页面数据返回错误");
         logger.info("校验 页面数据文本信息 成功");
         //自有虚拟商品兑换
         response = virtualExchangeService.exchange2(authorization.dafuwengLogin(uid), "186459", "123");

src/test/java/http/cases/GoodsAndTradeTest/异常订单测试_ExchangeTest.java

@@ -60,7 +60,7 @@ public class 异常订单测试_ExchangeTest extends DuibaTestBase {
         response1.prettyPrint();
 
         String message2 = response1.jsonPath().getString("message");
-        Assert.assertEquals(message2, "已兑换", "message字段校验失败-期望是已兑换");
+        Assert.assertEquals(message2, "已达兑换次数上限", "message字段校验失败-期望是已兑换");
     }