Merge branch 'develop' into qwj_181029

src/test/java/http/cases/DeveloperTest/创建自有活动_DuibaTest.java

@@ -267,7 +267,6 @@ public class 创建自有活动_DuibaTest extends DuibaTestBase {
     }
 
 
-
     //删除自有活动
     public void 删除自有活动(String title) throws Exception{
         //开发者删除自有活动

src/test/java/http/service/hd/DeveloperService.java

@@ -912,4 +912,67 @@ public class DeveloperService {
         return response;
     }
 
+
+    //创建自有活动工具-所有字段
+    public Response saveHdAll(String id,String creditsType,String title,String limitCount,String limitScope,String freeLimit,String freeScope,String awards,String bannerImgNew) throws Exception {
+
+        String url=hdHost+"/launch/save";
+
+        Map<String,String> map = new HashMap<>();
+        map.put("id",id);
+        map.put("subType","turntable_circle");
+        map.put("creditsType",creditsType);
+        map.put("title",title);
+        map.put("credits","10");
+        map.put("limitCount",limitCount);
+        map.put("limitScope",limitScope);
+        map.put("freeLimit",freeLimit);
+        map.put("freeScope",freeScope);
+        map.put("optionNum","");
+        map.put("anticheatExchangeLimit","true");
+        map.put("autoOffDate","2030-12-01 00:00");
+        map.put("banner","//yun.duiba.com.cn/upload/r1u3O1460639179556.png");
+        map.put("thumbnail","//yun.duiba.com.cn/upload/R8Hac1467009242903.png");
+        map.put("questionRecord","[]");
+        map.put("awards",awards);
+        map.put("appId","2239");
+        map.put("bannerImgNew",bannerImgNew);
+
+        logger.info("请求创建自有活动工具url:"+url);
+        Response response=given().contentType("application/x-www-form-urlencoded;charset=UTF-8").cookies(authorization.hdLogin()).params(map).post("http://"+url);
+        response.prettyPrint();
+        try{
+            Assert.assertEquals(response.jsonPath().getString("desc"),"成功");
+        }catch(Exception e){
+            throw new Exception("创建自有活动接口失败,返回信息："+response.asString());
+        }catch(Error er){
+            throw new Exception("创建自有活动接口失败,返回信息："+response.asString());
+        }
+        return response;
+    }
+
+    //开发者后台编辑自有活动
+    public Response editData(String actId,String type,String appId) throws Exception {
+
+        String url=hdHost+"/launch/editData";
+
+        Map<String,String> map = new HashMap<>();
+        map.put("actId",actId);
+        map.put("type",type);
+        map.put("appId",appId);
+
+        logger.info("请求编辑自有活动url:"+url);
+        Response response=given().contentType("application/x-www-form-urlencoded;charset=UTF-8").cookies(authorization.hdLogin()).params(map).post("http://"+url);
+        response.prettyPrint();
+        try{
+            Assert.assertEquals(response.jsonPath().getString("desc"),"成功");
+        }catch(Exception e){
+            throw new Exception("编辑自有活动接口失败,返回信息："+response.asString());
+        }catch(Error er){
+            throw new Exception("编辑自有活动接口失败,返回信息："+response.asString());
+        }
+        return response;
+    }
+
+
 }