Merge branch 'mabo' into qwj_181029

src/test/java/http/cases/DeveloperTest/新建活动测试_DuibaTest.java

@@ -58,8 +58,14 @@ public class 新建活动测试_DuibaTest extends DuibaTestBase{
 
             };
 
+        }else
+        if(method.getName().equals("新建自有手动开奖活动")){
+            result = new Object[][]{
+                    new Object[]{1,"10","everyday","5","everyday","//yun.duiba.com.cn/upload/mhty76ri9b.png","新建自有手动开奖--每日次数"},
 
+            };
         }
+
         return result;
     }
 
@@ -223,6 +229,52 @@ public class 新建活动测试_DuibaTest extends DuibaTestBase{
     }
 
 
+    /**
+     * @param caseNum             用例编号
+     * @param consumerDrawLimit   用户抽奖限制次数
+     * @param consumerDrawLimitScope   用户抽奖限制类型
+     * @param freeLimit           免费抽奖次数
+     * @param freeLimitScope       免费抽奖次数类型
+     * @param bannerImgNew    新版banner图
+     * @param caseName        用例名称
+     * @throws Exception
+     */
+    @Test(dataProvider = "providerMethod")
+    public void 新建自有手动开奖活动(int caseNum,String consumerDrawLimit,String consumerDrawLimitScope,String freeLimit,String freeLimitScope,String bannerImgNew,String caseName) throws Exception{
+
+        logger.info("-----------------------------"+caseName+"-----------------------------");
+        String data = PublicMethod.data();
+        String title = "【自动化】自有手动开奖"+data;
+
+        //新建自有手动开奖
+        developerService.saveManualLottery(title,consumerDrawLimit,consumerDrawLimitScope,freeLimit,freeLimitScope,bannerImgNew);
+
+        //获取活动id
+        Response listResponse = developerService.list2(title);
+        String id =  String.valueOf(listResponse.jsonPath().getString("data.list[0].activityId"));
+        //编辑活动，校验活动内容
+        Response editResponse = developerService.editManualLottery(id);
+
+        switch (caseNum){
+
+            case 1:
+                Assert.assertEquals(editResponse.jsonPath().getString("data.credits"),"50","校验活动积分失败");
+                Assert.assertEquals(editResponse.jsonPath().getString("data.freeLimit"),"5","校验活动免费抽奖次数失败");
+                Assert.assertEquals(editResponse.jsonPath().getString("data.freeLimitScope"),"everyday","校验活动免费抽奖次数类型失败");
+                Assert.assertEquals(editResponse.jsonPath().getString("data.consumerDrawLimit"),"10","校验用户抽奖限制次数失败");
+                Assert.assertEquals(editResponse.jsonPath().getString("data.consumerDrawLimitScope"),"everyday","校验用户抽奖限制类型失败");
+                Assert.assertEquals(editResponse.jsonPath().getString("data.bannerImgNew"),"//yun.duiba.com.cn/upload/mhty76ri9b.png","校验活动新版banner图失败");
+                logger.info("校验新建自有手动开奖-1内容成功");
+                break;
+            case 2:
+                break;
+        }
+
+        //删除测试数据
+        this.删除自有活动(title);
+
+
+    }
 
 
     //删除自有活动

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/GoodsAndTradeTest/异常订单测试_ExchangeTest.java

@@ -66,9 +66,9 @@ public class 异常订单测试_ExchangeTest extends DuibaTestBase {
 
     @Test(description = "实物兑换无库存")
     public void 无库存() throws Exception {
-        Response response = mobileService.detail(authorization.dafuwengLogin(3661), "31051");//uid3661
+        Response response = mobileService.detail(authorization.dafuwengLogin(4819), "31051");//uid3661
 //        response.prettyPrint();
-        Map<String, String> map = authorization.dafuwengLogin(3661, true);
+        Map<String, String> map = authorization.dafuwengLogin(4819);
         Assert.assertEquals(String.valueOf(response.getStatusCode()), "200", "活动详情页请求异常");
         //实物兑换
         Response response2 = couponExchangeService.objectExchange2(map, "179139", "null", "null", "z9sydmcs", "null");

src/test/java/http/cases/NewActivityTest/抽奖异常测试_DuibaTest.java

@@ -152,7 +152,11 @@ public class 抽奖异常测试_DuibaTest extends DuibaTestBase {
         //获取未登录场景cookie
         Response responses = authorization.autoLogin();
         //进行接口测试传参
-        Response response = newActivityService.doJoin(responses.getDetailedCookies(),data.get("token"),data.get("activityId"));
+        Map<String,String> map = responses.getCookies();
+        logger.info("cookies:"+map.toString());
+        if(responses.getDetailedCookies()==null)logger.info("cookies = = null");
+        Response response = newActivityService.doJoinMap(map,data.get("token"),data.get("activityId"));
+//        Response response = newActivityService.doJoin(responses.getDetailedCookies(),data.get("token"),data.get("activityId"));
         response.prettyPrint();
         String success = String.valueOf(response.jsonPath().getString("success"));
         //根据case选择校验项

src/test/java/http/cases/SignTest/周期签到测试_signTest.java

@@ -61,13 +61,15 @@ public class 周期签到测试_signTest extends DuibaTestBase {
 //    }
 
 
-    @Test(description = "活动id:79,规则：周期2天，签到第3天循环第一天奖励，加一次抽奖机会，加10积分")
+    //@Test(description = "活动id:79,规则：周期2天，签到第3天循环第一天奖励，加一次抽奖机会，加10积分")
     public void 周期签到测试() throws Exception {
         logger.info("Current Thread Id: " + Thread.currentThread().getId());
         //补签前天，凑足连续签到2天
         Response response_1 = this.resign("79",-2);
+        Thread.sleep(1000);
         Response response_2 = this.resign("79",-1);
-       // response_2.prettyPrint();
+        response_1.prettyPrint();
+        response_2.prettyPrint();
 
         //当日签到之前插件信息查询
         Response response_plug = activityPlugDrawInfoService.getPrizeInfo(map,"1179");
@@ -97,6 +99,7 @@ public class 周期签到测试_signTest extends DuibaTestBase {
         String lastDays = response.jsonPath().getString("signInfoVO.lastDays");//连续签到天数
         String todaySigned = response.jsonPath().getString("signInfoVO.todaySigned"); //今日是否签到
 
+        response.prettyPrint();
         Assert.assertEquals(acmDay,"2","历史累积签到次数不正确");
         Assert.assertEquals(acmDays,"2","周期内累计签到天数不正确");
         Assert.assertEquals(activityCount,"1","今日奖励抽奖次数不正确");

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

@@ -30,7 +30,7 @@ public class 种红包配置校验_AccessTest extends DuibaTestBase{
     //指定用户
     private static int uid = 4689;
     private static int uid2 = 4552;
-    private static int uid3 = 3590;
+    private static int uid3 = 4793;
     private static int uid4 = 4386;
     @Test
     public void 出券衰减开关校验_开() throws Exception {
@@ -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/cases/WalletTest/账户余额清零_AccessTest.java

@@ -108,11 +108,12 @@ public class 账户余额清零_AccessTest extends DuibaTestBase {
 
 
         //获取最新的提现记录
+        Thread.sleep(3000);
         Map cookies = authorization.dafuwengLogin(uid);
         Response response = walletAccountService.walletDetail(cookies);
-        String money = response.jsonPath().getString("data[1].money");
-        String subType = response.jsonPath().getString("data[1].subType");
-        String description = response.jsonPath().getString("data[1].description");
+        String money = response.jsonPath().getString("data[0].money");
+        String subType = response.jsonPath().getString("data[0].subType");
+        String description = response.jsonPath().getString("data[0].description");
 
         Assert.assertTrue(new BigDecimal(money).compareTo(new BigDecimal("100"))==0,"扣款金额校验失败");
         Assert.assertEquals(subType, "0", "日志类型校验失败");

src/test/java/http/cases/WalletTest/账户异常提现_AccessTest.java

@@ -42,10 +42,10 @@ public class 账户异常提现_AccessTest extends DuibaTestBase{
     //指定用户
     private static int uid = 4459;
     private static String consumerId = "100098000";
-    private static int uid2 = 4460;
-    private static String consumerId2 = "100098001";
-    private static int uid3 = 4461;
-    private static String consumerId3 = "100098002";
+    private static int uid2 = 4822;
+    private static String consumerId2 = "100108125";
+    private static int uid3 = 4793;
+    private static String consumerId3 = "100108076";
     private static int uid4 = 4474;
     private static String consumerId4 = "100098031";
     @AfterClass
@@ -103,9 +103,11 @@ public class 账户异常提现_AccessTest extends DuibaTestBase{
 
     @Test
     public void 提现账号已使用() throws Exception {
+        //修改账户过期时间，确保账户余额不会过期清零
+        jdbc.update("update consumer_account_log.tb_expire_consumer_account set gmt_modified ='"+getTime(1)+"' where account_id = '"+consumerId2+"_6_0'");
 
         //获取原账户余额
-        Map<String, Object> selectResult = jdbc.findSimpleResult("select * from consumer_accounts.tb_consumer_account_0977 where account_id = '"+consumerId2+"_6_0' ");
+        Map<String, Object> selectResult = jdbc.findSimpleResult("select * from consumer_accounts.tb_consumer_account_0861 where account_id = '"+consumerId2+"_6_0' ");
         int balance = Integer.parseInt(String.valueOf(selectResult.get("balance_amount")));
         logger.info("账户原有余额为"+balance);
 
@@ -119,7 +121,7 @@ public class 账户异常提现_AccessTest extends DuibaTestBase{
         Assert.assertEquals(response.jsonPath().getString("message"),"一个支付宝账户仅允许一个账户提现","/walletAccount/doTakePrize接口失败");
 
         //获取新账户余额
-        selectResult = jdbc.findSimpleResult("select * from consumer_accounts.tb_consumer_account_0977 where account_id = '"+consumerId2+"_6_0' ");
+        selectResult = jdbc.findSimpleResult("select * from consumer_accounts.tb_consumer_account_0861 where account_id = '"+consumerId2+"_6_0' ");
         int balanceNew = Integer.parseInt(String.valueOf(selectResult.get("balance_amount")));
         logger.info("账户新余额为"+balanceNew);
 
@@ -132,7 +134,7 @@ public class 账户异常提现_AccessTest extends DuibaTestBase{
     public void 开发者账户余额不足() throws Exception {
 
         //获取原账户余额
-        Map<String, Object> selectResult = jdbc.findSimpleResult("select * from consumer_accounts.tb_consumer_account_0978 where account_id = '"+consumerId3+"_6_0' ");
+        Map<String, Object> selectResult = jdbc.findSimpleResult("select * from consumer_accounts.tb_consumer_account_0812 where account_id = '"+consumerId3+"_6_0' ");
         int balance = Integer.parseInt(String.valueOf(selectResult.get("balance_amount")));
         logger.info("账户原有余额为"+balance);
 
@@ -147,14 +149,14 @@ public class 账户异常提现_AccessTest extends DuibaTestBase{
         Assert.assertEquals(response.jsonPath().getString("message"),"扣app余额失败","/walletAccount/doTakePrize接口失败");
 
         //获取新账户余额
-        selectResult = jdbc.findSimpleResult("select * from consumer_accounts.tb_consumer_account_0978 where account_id = '"+consumerId3+"_6_0' ");
+        selectResult = jdbc.findSimpleResult("select * from consumer_accounts.tb_consumer_account_0812 where account_id = '"+consumerId3+"_6_0' ");
         int balanceNew = Integer.parseInt(String.valueOf(selectResult.get("balance_amount")));
         logger.info("账户新余额为"+balanceNew);
 
         Assert.assertEquals(balanceNew,balance,"全局红包增加账户余额失败");
         logger.info("用户账户余额校验成功");
 
-        this.checkRecord(uid3,"0.01");
+        this.checkRecord(uid3,"100");
     }
 
     @Test
@@ -239,12 +241,21 @@ public class 账户异常提现_AccessTest extends DuibaTestBase{
         String description1 =  response.jsonPath().getString("data[1].description");
         String subType1 =  response.jsonPath().getString("data[1].subType");
 
+        if(subType.equals("0")){
             Assert.assertEquals(money,Exmoney,"扣款金额校验失败");
             Assert.assertEquals(description,"提现","明细描述失败");
-        Assert.assertEquals(subType,"0","日志类型校验失败");
+        }else{
+            Assert.assertEquals(money,Exmoney,"扣款金额校验失败");
+            Assert.assertEquals(description,"提现 - 返还","明细描述失败");
+        }
+        if(subType1.equals("0")){
+            Assert.assertEquals(money1,Exmoney,"扣款金额校验失败");
+            Assert.assertEquals(description1,"提现","明细描述失败");
+        }else{
             Assert.assertEquals(money1,Exmoney,"扣款金额校验失败");
             Assert.assertEquals(description1,"提现 - 返还","明细描述失败");
-        Assert.assertEquals(subType1,"1","日志类型校验失败");
+        }
+
 
         logger.info("账户余额明细校验成功");
     }

src/test/java/http/cases/WalletTest/账户正常提现_AccessTest.java

@@ -38,8 +38,8 @@ public class 账户正常提现_AccessTest extends DuibaTestBase{
     HbaseService hbaseService;
     private DuibaLog logger = DuibaLog.getLogger();
     //指定用户
-    private static int uid = 4244;
-    private static String consumerId = "100092758";
+    private static int uid = 4823;
+    private static String consumerId = "100108126";
     private static String orderId;
     @AfterClass
     public void afterclass()  {
@@ -77,7 +77,7 @@ public class 账户正常提现_AccessTest extends DuibaTestBase{
     public void a_提现失败_账户错误(int caseNum,String alipay,String realname) throws Exception {
 
         //获取原账户余额
-        Map<String, Object> selectResult = jdbc.findSimpleResult("select * from consumer_accounts.tb_consumer_account_0854 where account_id = '100092758_6_0' ");
+        Map<String, Object> selectResult = jdbc.findSimpleResult("select * from consumer_accounts.tb_consumer_account_0862 where account_id = '100108126_6_0' ");
         int balance = Integer.parseInt(String.valueOf(selectResult.get("balance_amount")));
         logger.info("账户原有余额为"+balance);
 
@@ -101,7 +101,7 @@ public class 账户正常提现_AccessTest extends DuibaTestBase{
         }
 
         //获取新账户余额
-        selectResult = jdbc.findSimpleResult("select * from consumer_accounts.tb_consumer_account_0854 where account_id = '100092758_6_0' ");
+        selectResult = jdbc.findSimpleResult("select * from consumer_accounts.tb_consumer_account_0862 where account_id = '100108126_6_0' ");
         int balanceNew = Integer.parseInt(String.valueOf(selectResult.get("balance_amount")));
         logger.info("账户新余额为"+balanceNew);
 
@@ -113,7 +113,7 @@ public class 账户正常提现_AccessTest extends DuibaTestBase{
     public void b_正常提现() throws Exception {
 
         //获取原账户余额
-        Map<String, Object> selectResult = jdbc.findSimpleResult("select * from consumer_accounts.tb_consumer_account_0854 where account_id = '100092758_6_0' ");
+        Map<String, Object> selectResult = jdbc.findSimpleResult("select * from consumer_accounts.tb_consumer_account_0862 where account_id = '100108126_6_0' ");
         int balance = Integer.parseInt(String.valueOf(selectResult.get("balance_amount")));
         logger.info("账户原有余额为"+balance);
         balance = balance - 1;
@@ -123,7 +123,7 @@ public class 账户正常提现_AccessTest extends DuibaTestBase{
         this.账户提现(cookies,"peeulk6392@sandbox.com","沙箱环境");
         Thread.sleep(2000);
         //获取新账户余额
-        selectResult = jdbc.findSimpleResult("select * from consumer_accounts.tb_consumer_account_0854 where account_id = '100092758_6_0' ");
+        selectResult = jdbc.findSimpleResult("select * from consumer_accounts.tb_consumer_account_0862 where account_id = '100108126_6_0' ");
         int balanceNew = Integer.parseInt(String.valueOf(selectResult.get("balance_amount")));
         logger.info("账户新余额为"+balanceNew);
         Assert.assertEquals(balanceNew,balance,"全局红包增加账户余额失败");
@@ -169,7 +169,7 @@ public class 账户正常提现_AccessTest extends DuibaTestBase{
     public void d_提现失败_登录次数不足() throws Exception {
 
         //获取原账户余额
-        Map<String, Object> selectResult = jdbc.findSimpleResult("select * from consumer_accounts.tb_consumer_account_0854 where account_id = '100092758_6_0' ");
+        Map<String, Object> selectResult = jdbc.findSimpleResult("select * from consumer_accounts.tb_consumer_account_0862 where account_id = '100108126_6_0' ");
         int balance = Integer.parseInt(String.valueOf(selectResult.get("balance_amount")));
         logger.info("账户原有余额为"+balance);
 
@@ -183,7 +183,7 @@ public class 账户正常提现_AccessTest extends DuibaTestBase{
         Assert.assertEquals(response.jsonPath().getString("message"),"连续登录天数不足","/walletAccount/doTakePrize接口失败");
 
         //获取新账户余额
-        selectResult = jdbc.findSimpleResult("select * from consumer_accounts.tb_consumer_account_0854 where account_id = '100092758_6_0' ");
+        selectResult = jdbc.findSimpleResult("select * from consumer_accounts.tb_consumer_account_0862 where account_id = '100108126_6_0' ");
         int balanceNew = Integer.parseInt(String.valueOf(selectResult.get("balance_amount")));
         logger.info("账户新余额为"+balanceNew);
 

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

@@ -68,6 +68,26 @@ public class NewActivityService {
         map.put("oaId",activityId);
 
         logger.info("请求/hdtool/doJoin接口，activityId="+activityId);
+        logger.info("url:"+url+"/hdtool/doJoin");
+        Response response = given().cookies(cookies).params(map).post(url+"/hdtool/doJoin");
+        try{
+            Assert.assertEquals(String.valueOf(response.getStatusCode()),"200");
+            logger.info("/hdtool/doJoin接口成功,返回信息："+response.asString());
+        }catch(Exception e){
+            throw new Exception("/hdtool/doJoin接口失败,返回信息："+response.asString());
+        }catch(Error er){
+            throw new Exception("/hdtool/doJoin接口失败,返回信息："+response.asString());
+        }
+        return response;
+    }
+    public Response doJoinMap(Map cookies, String token,String activityId) throws Exception {
+        Map<String,String> map = new HashMap<>();
+        map.put("token",token);
+        map.put("activityId",activityId);
+        map.put("oaId",activityId);
+
+        logger.info("请求/hdtool/doJoin接口，activityId="+activityId);
+        logger.info("url:"+url+"/hdtool/doJoin");
         Response response = given().cookies(cookies).params(map).post(url+"/hdtool/doJoin");
         try{
             Assert.assertEquals(String.valueOf(response.getStatusCode()),"200");

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");

src/test/java/http/service/Authorization.java

@@ -167,6 +167,9 @@ public class Authorization {
         String url=tool.buildUrlWithSign("http://activity.m.duibatest.com.cn/autoLogin/autologin?",params);
         logger.info("dafuweng免登陆url为："+url);
             Response response=given().redirects().follow(false).get(url);
+            logger.info("dafuweng免登陆，响应数据："+response.asString());
+            logger.info("dafuweng免登陆，响应状态码："+response.getStatusCode());
+
         return response;
     }
     public Map generateSignAutoLogin(String appKey, int uid){

src/test/java/http/service/Saas/SignService.java

@@ -142,6 +142,7 @@ public class SignService {
         map.put("cirReward","{\"rwType\":\"CIRCLE\",\"plActSkinId\":100,\"plActId\":null,\"items\":[{\"days\":null,\"credits\":1,\"activityCount\":1}],\"plSkinOpen2Dev\":true,\"open\":true}");
         map.put("acmReward","{\"rwType\":\"ACCUMULATE\",\"plActSkinId\":100,\"plActId\":null,\"items\":[{\"days\":1,\"credits\":1,\"activityCount\":1}],\"plSkinOpen2Dev\":true,\"open\":true}");
         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\":100,\"plActId\":null,\"items\":[{\"days\":1,\"credits\":100,\"activityCount\":100}],\"plSkinOpen2Dev\":true,\"open\":true}");
         map.put("firstSignReward","[]");
 

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

@@ -915,7 +915,7 @@ public class DeveloperService {
     }
 
 
-    //创建自有活动工具-所有字段
+    //保存自有活动工具-所有字段
     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";
@@ -976,7 +976,7 @@ public class DeveloperService {
         return response;
     }
 
-    //创建保存自有单品抽奖
+    //保存自有单品抽奖--所有字段
     public Response saveDpAll(String id,String title,String mainAppItemId,String appItemTitle,String appItemType, String mainAppItemRemaining,String freeDrawLimit,String freeDrawLimitScope,String bannerImgNew,String vipLimitType,String vipLimits,String exchangeLimit) throws Exception {
 
         String url=hdHost+"/appSingleLottery/saveOrUpdate";
@@ -1053,5 +1053,61 @@ public class DeveloperService {
         return response;
     }
 
+    //保存自有手动开奖--所有字段
+    public Response saveManualLottery(String title,String consumerDrawLimit,String consumerDrawLimitScope,String freeLimit,String freeLimitScope,String bannerImgNew) throws Exception {
+
+        String url=hdHost+"/appManualLottery/create";
+
+        Map<String,String> map = new HashMap<>();
+        map.put("title",title);
+        map.put("credits","50");
+        map.put("bannerImage","//yun.duiba.com.cn/upload/buctmou88a.png");
+        map.put("smallImage","//yun.duiba.com.cn/upload/wf0u6dtq7e.png");
+        map.put("image","//yun.duiba.com.cn/upload/nwmcomavqu.png");
+        map.put("bannerImgNew",bannerImgNew);
+        map.put("appId","2239");
+        map.put("marketPrice","10");
+        map.put("introduction","测试奖品说明");
+        map.put("consumerDrawLimit",consumerDrawLimit);
+        map.put("consumerDrawLimitScope",consumerDrawLimitScope);
+        map.put("freeLimit",freeLimit);
+        map.put("freeLimitScope",freeLimitScope);
+        map.put("overDate","2020-11-01");
+
+        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 editManualLottery(String manualLotteryId) throws Exception {
+
+        String url=hdHost+"/appManualLottery/edit";
+
+        Map<String,String> map = new HashMap<>();
+        map.put("appId","2239");
+        map.put("manualLotteryId",manualLotteryId);
+
+        logger.info("请求编辑自有手动开奖url:"+url);
+        Response response=given().contentType("application/x-www-form-urlencoded;charset=UTF-8").cookies(authorization.hdLogin()).params(map).get("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;
+    }
 
 }

src/test/java/ui/cases/Exchange/优惠券_ExchangeTest_ui.java

@@ -13,7 +13,7 @@ import static com.codeborne.selenide.Selenide.open;
 public class 优惠券_ExchangeTest_ui extends DuibaBaseUi{
     @Test
     public void 优惠券兑换_正常流程() throws Exception {
-        open("http://47.97.214.108/user/index");
+        open("http://dafuweng.duibatest.com.cn/user/index");
         clickByTextEqual("4762");
         switchWindow();
         sleep(2);