Merge branch 'master' into mabo

src/test/java/http/cases/ExchangeTest/ObjectExchange_ExchangeTest.java

@@ -47,9 +47,9 @@ public class ObjectExchange_ExchangeTest extends CheckTemplet {
 
     @BeforeClass
     public void before() {
-       managerService.update(uid,"5555555");
 //        jdbc = MysqlUtils.mysqlDuiba("orders_consumer");
         try {
+            managerService.update(uid,"5555555");
             jdbc.update("delete  from orders_consumer.orders_0614 where  consumer_id = 100011622 and  biz_params = 'DUIBA_SELF'", null);
         } catch (Exception e) {
             e.printStackTrace();

src/test/java/http/cases/SignTest/补签测试_signTest.java

@@ -265,6 +265,7 @@ public class 补签测试_signTest extends DuibaTestBase {
         map.put("cirReward","{\"rwType\":\"CIRCLE\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":null,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":true}");
         map.put("acmReward","{\"rwType\":\"ACCUMULATE\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":1,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":false}");
         map.put("firstSignReward","{\"rwType\":\"FIRST_SIGN\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":1,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":false}");
+        map.put("cntOnceReward", "{\"rwType\":null,\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":1,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":null,\"open\":false}");
         map.put("fullSignReward", "{\"rwType\":\"FULL_SIGN\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":1,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":false}");
         map.put("operatingPositions","[]");
         logger.info("请求configEdit接口");
@@ -318,6 +319,7 @@ public class 补签测试_signTest extends DuibaTestBase {
         map.put("cirReward", "{\"rwType\":\"CIRCLE\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":null,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":true}");
         map.put("acmReward", "{\"rwType\":\"ACCUMULATE\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":1,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":false}");
         map.put("firstSignReward", "{\"rwType\":\"FIRST_SIGN\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":1,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":false}");
+        map.put("cntOnceReward", "{\"rwType\":null,\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":1,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":null,\"open\":false}");
         map.put("fullSignReward","{\"rwType\":\"FULL_SIGN\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":1,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":false}");
         map.put("operatingPositions","[]");
         logger.info("请求configEdit接口");
@@ -366,6 +368,7 @@ public class 补签测试_signTest extends DuibaTestBase {
         map.put("cirReward", "{\"rwType\":\"CIRCLE\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":null,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":true}");
         map.put("acmReward", "{\"rwType\":\"ACCUMULATE\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":1,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":false}");
         map.put("firstSignReward", "{\"rwType\":\"FIRST_SIGN\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":1,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":false}");
+        map.put("cntOnceReward", "{\"rwType\":null,\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":1,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":null,\"open\":false}");
         map.put("fullSignReward","{\"rwType\":\"FULL_SIGN\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":1,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":false}");
         map.put("operatingPositions","[]");
         logger.info("请求configEdit接口");

src/test/java/http/cases/WalletTest/种红包配置校验_AccessTest.java

@@ -108,13 +108,11 @@ public class 种红包配置校验_AccessTest extends DuibaTestBase{
         //dafuweng登陆获取cookies
         Map cookies = authorization.dafuwengLogin(uid4);
         //调用种植seed
-        Response response = seedRedPacketService.seed(cookies,"1","424","1");
+        Response response = seedRedPacketService.seed(cookies,"6","424","1");
         //种子号
         String orderId = response.jsonPath().getString("data.orderNum");
         Assert.assertNotNull(orderId,"订单号为空");
         logger.info("红包订单为："+orderId);
-        //红包衰减
-        Thread.sleep(65000);
         //获取种植结果状态getOrderStatus，异步接口，while循环，status为2处理完成，1处理中
         response = seedRedPacketService.getOrderStatus(cookies,orderId);
         String status = response.jsonPath().getString("data");
@@ -125,7 +123,9 @@ public class 种红包配置校验_AccessTest extends DuibaTestBase{
             i--;
         }
         //获取种植获得金额
-        response = seedRedPacketService.reap(cookies,"1",orderId);
+        //红包衰减
+        Thread.sleep(70000);
+        response = seedRedPacketService.reap(cookies,"6",orderId);
         response.prettyPrint();
         String isDecr = response.jsonPath().getString("data.isDecr");
         Assert.assertEquals(isDecr,"true","红包衰减标识校验失败");

src/test/java/http/service/Activity/SignactivityService.java

@@ -164,6 +164,7 @@ public class SignactivityService {
         map.put("cirReward","{\"rwType\":\"CIRCLE\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":null,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":false}");
         map.put("acmReward","{\"rwType\":\"ACCUMULATE\",\"plActSkinId\":100,\"plActId\":1154,\"items\":[{\"days\":2,\"credits\":10,\"activityCount\":1}],\"plSkinOpen2Dev\":false,\"open\":true}");
         map.put("firstSignReward","{\"rwType\":\"FIRST_SIGN\",\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":1,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":null,\"open\":false}");
+        map.put("cntOnceReward", "{\"rwType\":null,\"plActSkinId\":null,\"plActId\":null,\"items\":[{\"days\":1,\"credits\":0,\"activityCount\":1}],\"plSkinOpen2Dev\":null,\"open\":false}");
         map.put("operatingPositions","[]");
         logger.info("请求configEdit接口");
         Response response = given().contentType("application/x-www-form-urlencoded;charset=UTF-8").cookies(authorization.hdLogin()).params(map).post("http://"+hdHost+"/signin/configEdit");