Merge branch 'duiba_wenyan'

src/test/java/http/cases/ExchangeTest/兑吧_直充类商品兑换/Qb_兑换限制测试_ExchangeTest.java

@@ -179,10 +179,10 @@ public class Qb_兑换限制测试_ExchangeTest extends CheckTemplet {
         int uid = 6569;
         int vipUid = 6705;
 
-        //会员等级无法兑换
+        //会员等级无法兑换，vip=5
         try{
             Thread.sleep(4000);
-            Response response =  qbExchangeService.doTakePrize(authorization.dafuwengLogin(uid),"1234345554",degreeId);
+            Response response =  qbExchangeService.doTakePrize(authorization.generateSignAutoLogin("42vkFzeLnoNjXt6AhMM7LPj4G8pT",vipUid),"1234345554",degreeId);
             response.prettyPrint();
 
         }catch (Exception e){
@@ -190,9 +190,9 @@ public class Qb_兑换限制测试_ExchangeTest extends CheckTemplet {
         }
         logger.info(message);
 
-        //会员等级可兑换，vip=5
+        //会员等级可兑换，vip=0
         Thread.sleep(4000);
-        Response response = qbExchangeService.doTakePrize(authorization.generateSignAutoLogin("42vkFzeLnoNjXt6AhMM7LPj4G8pT",vipUid),"1234345554",degreeId);
+        Response response = qbExchangeService.doTakePrize(authorization.dafuwengLogin(uid),"1234345554",degreeId);
         response.prettyPrint();
 
         Assert.assertTrue(message.contains("会员等级不符，请挑选其他吧(15)"),"校验message失败");

src/test/java/http/cases/VisualEditorTest/商品分组组件_DuibaTest.java

@@ -266,38 +266,46 @@ public class 商品分组组件_DuibaTest extends DuibaTestBase {
 
             case 1:
                 //手机端接口排序与前端不一致
-                Assert.assertEquals(response.jsonPath().getString("data.list[0].title"),"【自动化勿动】兑吧新优惠券普通券码跳转","校验第一个商品title失败");
-                Assert.assertEquals(response.jsonPath().getString("data.list[0].titleDownTxt"),"100积分","校验第一个商品credits失败");
+                Assert.assertEquals(response.jsonPath().getString("data.list[0].title"),"支付宝充值","校验第一个商品title失败");
+                Assert.assertEquals(response.jsonPath().getString("data.list[0].titleDownTxt"),"1000积分","校验第一个商品credits失败");
+                Assert.assertEquals(response.jsonPath().getString("data.list[0].smallImage"),"//yun.dui88.com/images/201610/txqn3qz6o9.jpg","校验第一个商品smallImage失败");
 
-                Assert.assertEquals(response.jsonPath().getString("data.list[1].title"),"【自动化勿动】兑吧卡密跳转按钮","校验第二个商品title失败");
-                Assert.assertEquals(response.jsonPath().getString("data.list[1].titleDownTxt"),"200积分","校验第二个商品credits失败");
+                Assert.assertEquals(response.jsonPath().getString("data.list[1].title"),"Q币充值","校验第二个商品title失败");
+                Assert.assertEquals(response.jsonPath().getString("data.list[1].titleDownTxt"),"700积分","校验第二个商品credits失败");
+                Assert.assertEquals(response.jsonPath().getString("data.list[1].smallImage"),"//yun.dui88.com/images/201610/9qawkmx7eh.jpg","校验第二个商品smallImage失败");
 
-                Assert.assertEquals(response.jsonPath().getString("data.list[2].title"),"【自动化勿动】兑吧新实物","校验第三个商品title失败");
-                Assert.assertEquals(response.jsonPath().getString("data.list[2].titleDownTxt"),"300积分","校验第三个商品credits失败");
+                Assert.assertEquals(response.jsonPath().getString("data.list[2].title"),"5元话费","校验第三个商品title失败");
+                Assert.assertEquals(response.jsonPath().getString("data.list[2].titleDownTxt"),"3500积分","校验第三个商品credits失败");
+                Assert.assertEquals(response.jsonPath().getString("data.list[2].smallImage"),"//yun.duiba.com.cn/images/5ayvpsoncj.jpg","校验第三个商品smallImage失败");
 
-                Assert.assertEquals(response.jsonPath().getString("data.list[3].title"),"支付宝充值","校验第四个商品title失败");
-                Assert.assertEquals(response.jsonPath().getString("data.list[3].titleDownTxt"),"10万积分","校验第四个商品credits失败");
 
-                Assert.assertEquals(response.jsonPath().getString("data.list[4].title"),"10元话费","校验第五个商品title失败");
-                Assert.assertEquals(response.jsonPath().getString("data.list[4].titleDownTxt"),"1000积分","校验第五个商品credits失败");
+                Assert.assertEquals(response.jsonPath().getString("data.list[3].title"),"【自动化勿动】兑吧实物日期兑换限制进行中","校验第四个商品title失败");
+                Assert.assertEquals(response.jsonPath().getString("data.list[3].titleDownTxt"),"700积分","校验第四个商品credits失败");
+                Assert.assertEquals(response.jsonPath().getString("data.list[3].smallImage"),"//yun.dui88.com/images/201806/28m2esmi0d.jpg","校验第四商品smallImage失败");
 
-                logger.info("校验商品分组1-兑吧新商品成功");
+
+                Assert.assertEquals(response.jsonPath().getString("data.list[4].title"),"【勿动】兑吧优惠券共享库存测试","校验第五个商品title失败");
+                Assert.assertEquals(response.jsonPath().getString("data.list[4].titleDownTxt"),"140积分","校验第五个商品credits失败");
+                Assert.assertEquals(response.jsonPath().getString("data.list[4].smallImage"),"//yun.dui88.com/images/201807/79r9bwt2my.png","校验第五个商品smallImage失败");
+
+
+                logger.info("校验商品分组1-兑吧老商品成功");
                 break;
 
             case 2:
-                Assert.assertEquals(response.jsonPath().getString("data.list[0].title"),"【自动化勿动】自有新优惠券跳转链接","校验第一个商品title失败");
+                Assert.assertEquals(response.jsonPath().getString("data.list[0].title"),"【自动化勿动】自有优惠券","校验第一个商品title失败");
                 Assert.assertEquals(response.jsonPath().getString("data.list[0].titleDownTxt"),"100积分","校验第一个商品credits失败");
+                Assert.assertEquals(response.jsonPath().getString("data.list[0].smallImage"),"//yun.dui88.com/images/201904/5h0skt3nqp.png","校验第一个商品smallImage失败");
 
-                Assert.assertEquals(response.jsonPath().getString("data.list[1].title"),"【自动化勿动】自有新实物加钱购","校验第二个商品title失败");
-                Assert.assertEquals(response.jsonPath().getString("data.list[1].titleDownTxt"),"150积分 + 10.00元","校验第二个商品credits失败");
-
-                Assert.assertEquals(response.jsonPath().getString("data.list[2].title"),"【自动化勿动】自有充值商品","校验第三个商品title失败");
-                Assert.assertEquals(response.jsonPath().getString("data.list[2].titleDownTxt"),"300积分","校验第三个商品credits失败");
+                Assert.assertEquals(response.jsonPath().getString("data.list[1].title"),"【自动化勿动】自有实物","校验第二个商品title失败");
+                Assert.assertEquals(response.jsonPath().getString("data.list[1].titleDownTxt"),"200积分","校验第二个商品credits失败");
+                Assert.assertEquals(response.jsonPath().getString("data.list[1].smallImage"),"//yun.dui88.com/images/201904/a410736wql.gif","校验第二个商品smallImage失败");
 
-                Assert.assertEquals(response.jsonPath().getString("data.list[3].title"),"【自动化勿动】自有卡密","校验第四个商品title失败");
-                Assert.assertEquals(response.jsonPath().getString("data.list[3].titleDownTxt"),"550积分","校验第四个商品credits失败");
+                Assert.assertEquals(response.jsonPath().getString("data.list[2].title"),"【自动化勿动】自有虚拟商品","校验第三个商品title失败");
+                Assert.assertEquals(response.jsonPath().getString("data.list[2].titleDownTxt"),"1000积分","校验第三个商品credits失败");
+                Assert.assertEquals(response.jsonPath().getString("data.list[2].smallImage"),"//yun.dui88.com/images/201904/n71mi1ixwf.gif","校验第二个商品smallImage失败");
 
-                logger.info("校验商品分组2-自有新商品成功");
+                logger.info("校验商品分组2-自有老商品成功");
                 break;