Merge branch 'develop' of http://gitlab2.dui88.com/mabo/test-platform into develop

src/test/java/base/TestReport.java

@@ -47,6 +47,11 @@ public class TestReport implements IReporter{
             }
 
         }
+        total=passCount+skipCount+failCount;
+        System.out.println("~~~~~~~~~~~~~~~~~~~~~total:"+total);
+        System.out.println("~~~~~~~~~~~~~~~~~~~~~failCount:"+failCount);
+        System.out.println("~~~~~~~~~~~~~~~~~~~~~skipCount:"+skipCount);
+        System.out.println("~~~~~~~~~~~~~~~~~~~~~passCount"+passCount);
         DingdingResult ddResult=null;
         try{
             ddResult=new DingdingResult(total,passCount,skipCount,failCount);

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

+package http.cases.ExchangeTest;
+
+public class Database {
+
+    //主订单库
+    public static String orders_consumer = "orders_consumer";
+    //主订单分表
+    public static String orders = "orders_0614";
+    public static String orders2 = "orders_0874";
+    public static String orders3 = "orders_0693";
+    public static String orders4 = "orders_0208";
+    public static String orders5 = "orders_0209";
+    public static String orders6 = "orders_0210";
+    public static String orders7 = "orders_0211";
+    public static String orders8 = "orders_0090";
+}

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

+package http.cases.ExchangeTest;
+
+
+import base.DuibaTestBase;
+import http.service.Activity.ManagerService;
+import http.service.Authorization;
+import http.service.app.CouponExchangeService;
+import http.service.app.MobileService;
+import http.service.app.SeckillService;
+import http.service.hd.PlatformCouponService;
+import base.DuibaLog;
+import io.restassured.response.Response;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.util.Map;
+
+//@ContextConfiguration(classes = DuibaConfig.class)
+public class Exchange_ExchangeTest extends DuibaTestBase{
+    @Value("${manager.host}")
+    String ManagerHost;
+    @Autowired
+    private MobileService mobileService;
+    @Autowired
+    private Authorization authorization;
+    @Autowired
+    private CouponExchangeService couponExchangeService;
+    @Autowired
+    private PlatformCouponService platformCouponService;
+    @Autowired
+    private SeckillService SeckillService;
+    @Autowired
+    ManagerService managerService;
+
+    private DuibaLog logger = DuibaLog.getLogger();
+//    private MysqlUtils jdbc;
+    //指定用户
+    private static int uid = 3766;
+
+//    @BeforeClass
+//    public void before(){
+//        jdbc = MysqlUtils.mysqlDuiba("dafuweng");
+//    }
+//    @AfterClass
+//    public void after(){
+//        jdbc.releaseConn();
+//
+//    }
+
+
+    //实物兑换并发货
+    @Test(description = "实物兑换")
+    public void goods() throws Exception {
+
+       //查询数据库，当前积分
+        Map<String,Object> mapuser = jdbc.findSimpleResult("select * from dafuweng.user where id="+uid);
+        String credits = String.valueOf(mapuser.get("credits"));
+        logger.info("兑换前积分："+credits);
+        //扣去100积分
+        credits = String.valueOf(Integer.valueOf(credits)-100);
+        //活动详情页
+        Response response =mobileService.detail(authorization.dafuwengLogin(uid),"26762");
+        Map<String,String> map = authorization.dafuwengLogin(uid);
+        Assert.assertEquals(String.valueOf(response.getStatusCode()),"200","活动详情页请求异常");
+        //实物兑换
+        response = couponExchangeService.objectExchange(map,"159143","2619","null","z9sydmcs","null");
+//        response.prettyPrint();
+        //校验兑换成功
+//        Assert.assertEquals(response.jsonPath().getString("success"),"true");
+        //获取orderId
+         String orderId = response.jsonPath().getString("orderId");
+        //获取兑换结果
+        response = mobileService.orderAmbStatusQuery(uid,orderId);
+        response.prettyPrint();
+        String message = response.jsonPath().getString("data.message");
+
+        int i=10;
+        //异步接口，直到兑换成功
+        while(i>0&&"兑换正在处理中...".equals(message)){
+            Thread.sleep(1000);
+            response = mobileService.orderAmbStatusQuery(uid,orderId);
+            response.prettyPrint();
+            message = response.jsonPath().getString("data.message");
+            i--;
+        }
+        //查询数据库，获取当前积分
+        Thread.sleep(3000);
+        mapuser = jdbc.findSimpleResult("select * from dafuweng.user where id="+uid);
+        String creditsNew = String.valueOf(mapuser.get("credits"));
+        logger.info("兑换后积分："+creditsNew);
+        //校验比较，兑换前后积分
+        Assert.assertEquals(credits,creditsNew);
+        logger.info("校验兑换前后积分正确");
+
+        //兑吧管理后台发货
+        managerService.expressSend(orderId);
+        logger.info("实物兑换订单成功");
+    }
+
+
+    //秒杀
+    @Test(description = "秒杀兑换")
+    public void seckill(){
+
+        Response response = SeckillService.ajaxSubmit("18556");
+        response.prettyPrint();
+        Assert.assertEquals(response.jsonPath().getString("success"),"true");
+
+    }
+    //优惠券兑换
+    @Test(description = "优惠券兑换")
+    public void coupon() throws Exception {
+
+
+        //查询数据库，当前积分
+        Map<String,Object> mapuser = jdbc.findSimpleResult("select * from dafuweng.user where id="+uid);
+        String credits = String.valueOf(mapuser.get("credits"));
+        logger.info("兑换前积分："+credits);        //扣去100积分
+        credits = String.valueOf(Integer.valueOf(credits)-100);
+        //优惠券兑换
+        Response response = couponExchangeService.couponExchange(authorization.dafuwengLogin(uid),"157070","27050");
+        String orderId = response.jsonPath().getString("orderId");
+        //查看兑换结果
+        response = mobileService.orderStatusQuery(response.getDetailedCookies(),uid,orderId);
+
+        String status = response.jsonPath().getString("status");
+        //异步接口
+        int i=10;
+        while(i>0&&"processing".equals(status)){
+            Thread.sleep(1000);
+            response = mobileService.orderStatusQuery(response.getDetailedCookies(),uid,orderId);
+            response.prettyPrint();
+            status = response.jsonPath().getString("status");
+            i--;
+        }
+
+        //查询数据库，获取当前积分
+        Thread.sleep(3000);
+        mapuser = jdbc.findSimpleResult("select * from dafuweng.user where id="+uid);
+        String creditsNew = String.valueOf(mapuser.get("credits"));
+        logger.info("兑换后积分："+creditsNew);
+
+        //校验比较，兑换前后积分
+        Assert.assertEquals(credits.trim(),creditsNew,"优惠券兑换后积分扣除异常");
+        logger.info("校验兑换前后积分正确");
+
+
+    }
+}

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

+package http.cases.ExchangeTest;
+
+import base.DuibaTestBase;
+import http.service.Activity.ManagerService;
+import http.service.Authorization;
+import http.service.app.CouponExchangeService;
+import http.service.app.CrecordService;
+import http.service.app.MobileService;
+import http.service.app.VirtualExchangeService;
+import http.service.hd.DeveloperAccountService;
+import utils.MatcherString;
+import base.DuibaLog;
+import io.restassured.response.Response;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.util.Map;
+
+
+/**
+ * Created by yeqinqin on 2018/6/11.
+ */
+public class 实物_兑换异常测试_ExchangeTest extends DuibaTestBase {
+
+    @Autowired
+    private MobileService mobileService;
+    @Autowired
+    private Authorization authorization;
+    @Autowired
+    private CouponExchangeService couponExchangeService;
+    @Autowired
+    private CrecordService crecordService;
+    @Autowired
+    ManagerService managerService;
+    @Autowired
+    VirtualExchangeService virtualExchangeService;
+    @Autowired
+    DeveloperAccountService developerAccountService;
+
+
+    private DuibaLog logger = DuibaLog.getLogger();
+    //指定用户
+    private static int uid = 3770;
+
+    //实物兑换积分不足
+    @Test(description = "实物兑换积分不足")
+    public void 积分不足() throws Exception {
+
+
+        //活动详情页
+        Response response = mobileService.detail(authorization.dafuwengLogin(3086), "28515");
+        Map<String, String> map = authorization.dafuwengLogin(3086);
+        Assert.assertEquals(String.valueOf(response.getStatusCode()), "200", "活动详情页请求异常");
+        //实物兑换
+        response = couponExchangeService.objectExchange(map, "167141", "28515", "null", "z9sydmcs", "null");
+        response.prettyPrint();
+        //校验兑换成功
+//        Assert.assertEquals(response.jsonPath().getString("success"),"true");
+        //获取orderId
+        String orderId = response.jsonPath().getString("orderId");
+        //获取兑换结果
+        response = mobileService.orderAmbStatusQuery(3086,orderId);
+        response.prettyPrint();
+        String message = response.jsonPath().getString("data.message");
+        int i = 10;
+        //异步接口，直到兑换成功
+        while (i > 0 && "兑换正在处理中...".equals(message)) {
+            Thread.sleep(1000);
+            response = mobileService.orderAmbStatusQuery(3086,orderId);
+            response.prettyPrint();
+            message = response.jsonPath().getString("data.message");
+            i--;
+        }
+        //校验messaga字段返回值
+        String message2 = response.jsonPath().getString("data.message");
+        Assert.assertEquals(message2,"兑换失败，用户积分余额不足","message字段校验失败-期望是积分不足");
+
+       // authorization.dafuwengLogin(2720,true);
+    }
+
+    //实物兑换限制消费
+    @Test(description = "实物兑换已兑换")
+    public void 已兑换() throws Exception {
+
+
+        //活动详情页
+        Response response = mobileService.detail(authorization.dafuwengLogin(uid), "28633");
+//        response.prettyPrint();
+        Map<String, String> map = authorization.dafuwengLogin(uid);
+        Assert.assertEquals(String.valueOf(response.getStatusCode()), "200", "活动详情页请求异常");
+        //实物兑换
+        Response response1 = couponExchangeService.objectExchange1(map, "167611", "28633", "null", "z9sydmcs", "null");
+        response1.prettyPrint();
+        //校验兑换成功
+//        Assert.assertEquals(response.jsonPath().getString("success"),"true");
+        //获取orderId
+//        String orderId = response1.jsonPath().getString("orderId");
+//        //获取兑换结果
+//        Response response3 = mobileService.orderAmbStatusQuery(orderId);
+//        response3.prettyPrint();
+//        String message = response3.jsonPath().getString("data.message");
+//        int i = 10;
+//        //异步接口，直到兑换成功
+//        while (i > 0 && "兑换正在处理中...".equals(message)) {
+//            Thread.sleep(1000);
+//            response3 = mobileService.orderAmbStatusQuery(orderId);
+//            response3.prettyPrint();
+//            message = response3.jsonPath().getString("data.message");
+//            i--;
+//        }
+        //校验messaga字段返回值
+        String message2 = response1.jsonPath().getString("message");
+        Assert.assertEquals(message2,"已兑换","message字段校验失败-期望是已兑换");
+    }
+
+    @Test
+    public void 开发者余额不足测试() throws Exception{
+        int uid = 3490;
+        //开发者余额， 开发者账户：xuyan_8707@163.com
+        Response accountResponse = developerAccountService.accountInfoCommon("xuyan_8707@163.com");
+        String remainMoney = accountResponse.jsonPath().getString("data.remainMoney");
+        logger.info("兑换前的开发者账户余额：" + remainMoney);
+
+        Response detailResponse = mobileService.detail(authorization.dafuwengLogin(uid),"31050");
+        String exchangeText =  MatcherString.getString(detailResponse.asString(), "\"exchangeText\":\"(.*?)\",", 1);
+
+
+        logger.info("~~~"+exchangeText);
+        Assert.assertTrue(exchangeText.contains("已兑完"));
+        String message=null;
+        String succcess = null;
+        try{
+            Response response = couponExchangeService.objectExchange1(authorization.dafuwengLogin(uid), "178880", "31050", "null", "z9sydmcs", "null");
+
+            message = response.jsonPath().getString("message");
+        }catch (Exception e){
+            message = e.toString();
+        }
+        logger.info(message);
+        Assert.assertTrue(message.contains("没有兑换成功"));
+
+
+    }
+//    @Test
+    public void 每日兑换限制() throws Exception {
+        int uid = 3490;
+
+        //第一次兑换
+        Response response = couponExchangeService.objectExchange(authorization.dafuwengLogin(uid), "178879", "31049", "null", "z9sydmcs", "null");
+
+        response.prettyPrint();
+        String orderId = response.jsonPath().getString("orderId");
+        //获取兑换结果
+        response = mobileService.orderAmbStatusQuery(uid,orderId);
+        response.prettyPrint();
+        String message = response.jsonPath().getString("data.message");
+        int i = 10;
+        //异步接口，直到兑换成功
+        while (i > 0 && "兑换正在处理中...".equals(message)) {
+            Thread.sleep(1000);
+            response = mobileService.orderAmbStatusQuery(uid,orderId);
+            response.prettyPrint();
+            message = response.jsonPath().getString("data.message");
+            i--;
+        }
+        //第二次兑换
+        try{
+            response = couponExchangeService.objectExchange(authorization.dafuwengLogin(uid), "178879", "31049", "null", "z9sydmcs", "null");
+            response.prettyPrint();
+
+        }catch (Exception e){
+//            message = e.toString();
+        }
+//        logger.info(message);
+//        Assert.assertTrue(message.contains("已兑完"));
+//        Assert.assertTrue(message.contains("\"success\":false"));
+
+    }
+
+}

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

+package http.cases.ExchangeTest;
+
+import base.DuibaTestBase;
+import http.service.Activity.ManagerService;
+import http.service.Authorization;
+import http.service.app.MobileService;
+import http.service.app.VirtualExchangeService;
+import base.DuibaLog;
+import io.restassured.response.Response;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.util.Map;
+
+
+/**
+ * Created by yeqinqin on 2018/6/11.
+ */
+public class 虚拟商品_兑换异常测试 extends DuibaTestBase {
+
+    @Autowired
+    private MobileService mobileService;
+    @Autowired
+    private Authorization authorization;
+    @Autowired
+    ManagerService managerService;
+    @Autowired
+    VirtualExchangeService virtualExchangeService;
+
+
+    private DuibaLog logger = DuibaLog.getLogger();
+    //指定用户
+    private static int uid = 0;
+
+    //实物兑换积分不足
+    @Test(description = "自有虚拟商品积分不足")
+    public void 积分不足() throws Exception {
+        //活动详情页
+        Response response = mobileService.appItemDetail(authorization.dafuwengLogin(uid), "181159");
+        Map<String, String> map = authorization.dafuwengLogin(uid,true);
+       Assert.assertEquals(String.valueOf(response.getStatusCode()), "200", "商品详情页面");
+       response.prettyPrint();
+       System.out.println(response.asString());
+       System.out.println("女汉子");
+
+
+        //自有虚拟商品兑换
+         response = virtualExchangeService.exchange(authorization.dafuwengLogin(uid), "181159", "123");
+
+        //获取orderId
+        String orderId = response.jsonPath().getString("orderId");
+        response = mobileService.orderAmbStatusQuery(uid,orderId);
+        response.prettyPrint();
+        String message = response.jsonPath().getString("data.message");
+        //异步接口，直到兑换成功
+        int i=10;
+        //异步接口，直到兑换成功
+        while(i>0&&"兑换正在处理中...".equals(message)){
+            Thread.sleep(1000);
+            response = mobileService.orderAmbStatusQuery(uid,orderId);
+            response.prettyPrint();
+            message = response.jsonPath().getString("data.message");
+            i--;
+        }
+
+        Assert.assertEquals(message.trim(),"兑换失败，用户积分余额不足","校验自有虚拟商品积分不足");
+    }
+
+
+}

src/test/java/http/cases/GameTest/Game_AccessTest.java

 package http.cases.GameTest;
 
 
+import base.Config;
 import base.DuibaLog;
 import http.service.Activity.ManagerService;
 import http.service.Activity.NgapiService;
@@ -33,6 +34,7 @@ import static org.hamcrest.Matchers.equalTo;
  * case3:游戏测试：马上使用跳转优惠券兑换记录页的链接
  * case4:游戏测试：马上使用跳转福袋的链接
  */
+@ContextConfiguration(classes = Config.class)
 public class Game_AccessTest extends AbstractTestNGSpringContextTests {
 
     @Autowired

src/test/java/http/cases/GameTest/游戏_中奖优惠券_AccessTest.java

@@ -34,9 +34,10 @@ public class 游戏_中奖优惠券_AccessTest extends DuibaTestBase {
     private static DuibaLog logger = DuibaLog.getLogger();
 
     private String virtualOrderIds = null;
-    private static final Integer uid_Nomal = 2708;
-    private static final String consumerId = "100011623";
-
+//    private static final Integer uid_Nomal = 2708;
+//    private static final String consumerId = "100011623";
+    private static final Integer uid_Nomal = 4390;
+    private static final String consumerId = "100094047";
 
 
 

src/test/java/http/cases/GameTest/游戏_中奖异常流程测试_AccessTest.java

@@ -33,7 +33,8 @@ public class 游戏_中奖异常流程测试_AccessTest extends DuibaTestBase {
     NewGameService newGameService;
 
     private static DuibaLog logger = DuibaLog.getLogger();
-    private static final Integer uid_Nomal = 2708;
+    //private static final Integer uid_Nomal = 2708;
+    private static final Integer uid_Nomal = 4389;
 
     //ok
 

src/test/java/http/cases/GameTest/游戏_中奖限制测试_AccessTest.java

@@ -36,8 +36,10 @@ public class 游戏_中奖限制测试_AccessTest extends DuibaTestBase {
     NewGameService newGameService;
 
 
-    private static final Integer uid_Nomal = 2708;
-    private static final String consumerId_Nomal = "100011623";
+//    private static final Integer uid_Nomal = 2708;
+//    private static final String consumerId_Nomal = "100011623";
+    private static final Integer uid_Nomal = 4388;
+    private static final String consumerId_Nomal = "100094045";
 
     private static DuibaLog logger = DuibaLog.getLogger();
 

src/test/java/http/cases/GameTest/游戏_奖项限制测试_AccessTest.java

@@ -35,9 +35,10 @@ public class 游戏_奖项限制测试_AccessTest extends DuibaTestBase {
     NewGameService newGameService;
 
     private static DuibaLog logger = DuibaLog.getLogger();
-    private static final Integer uid_Nomal = 2708;
-    private static final String consumerId = "100011623";
-
+//    private static final Integer uid_Nomal = 2708;
+//    private static final String consumerId = "100011623";
+    private static final Integer uid_Nomal = 4387;
+    private static final String consumerId = "100094044";
 
 
 

src/test/java/http/cases/PluginActivityTest/Server.java

-package http.cases.PluginActivityTest;
-
-
-import base.DuibaLog;
-import base.SFExpress;
-import base.ServiceDoctor;
-import org.testng.SkipException;
-import org.testng.annotations.BeforeSuite;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by hanzhanli on 2017/9/21.
- */
-
-public class Server {
-    private DuibaLog logger = DuibaLog.getLogger();
-    private Map<String,String> fromMap=new HashMap<>();
-    private Map<String,List<String>> logMap=new HashMap<>();
-    @BeforeSuite
-    public void onStart() {
-        //logger.info("job-name:"+System.getProperty("JOB_NAME"));
-        //logger.info("属性:"+System.getProperties());
-        logger.info("duiba-server开始检测");
-        ServiceDoctor serviceDoctor=new ServiceDoctor("duiba-server.properties");
-        SFExpress.addToBeTestedServices(serviceDoctor.getToBeTestedServices());
-        //fromMap.putAll(serviceDoctor.getLogLenth());
-        SFExpress.addExceptionService(serviceDoctor.getExceptionService(60*2));
-        logger.info("duiba-server检测完毕");
-        logger.info("duiba-server-center开始检测");
-        serviceDoctor=new ServiceDoctor("duiba-server-center.properties");
-        SFExpress.addToBeTestedServices(serviceDoctor.getToBeTestedServices());
-        //fromMap.putAll(serviceDoctor.getLogLenth());
-        SFExpress.addExceptionService(serviceDoctor.getExceptionService(60*2));
-        logger.info("duiba-server-center检测完毕");
-        if(SFExpress.getExceptionServices().size()>0){
-            logger.info("服务未启动:"+SFExpress.getExceptionServices().toString());
-            throw new SkipException("被测服务未全部启动");
-        }
-
-    }
-
-    public static void main(String[] args) {
-//        String s = "最近变更：2018-1-3 13:48:07-activity-access-web:疯狂打气球—jiangxixi/疯狂打气球—jiangxixi/\n";
-//        String name = s.split("—")[1].split("/")[0];
-//        System.out.println(name);
-//        List<String> list = new ArrayList<>();
-//        list.clear();
-//        Map<String,Object> map = new HashMap<>();
-//        map.put("name",list);
-        ServiceDoctor serviceDoctor=new ServiceDoctor("duiba-server.properties");
-
-
-    }
-}

src/test/java/http/cases/SaasDeveloperTest/自定义分类.java → src/test/java/http/cases/SaasDeveloperTest/自定义分类_DuibaTest.java

@@ -19,7 +19,7 @@ import java.util.List;
  * Created by humengxin on 2018/8/21.
  */
 @ContextConfiguration(classes = Config.class)
-public class 自定义分类 extends AbstractTestNGSpringContextTests {
+public class 自定义分类_DuibaTest extends AbstractTestNGSpringContextTests {
 
     @Autowired
     ZdyflService zdyflService;

src/test/java/http/cases/SingleLotteryTest/单品抽奖_出奖限制_AccessTest.java

+package http.cases.SingleLotteryTest;
+
+import base.DuibaTestBase;
+import utils.PublicMethod;
+import http.service.Activity.ManagerService;
+import http.service.Activity.SingleLotteryService;
+import http.service.Authorization;
+import http.service.hd.ActivityService;
+import http.service.hd.DeveloperService;
+import utils.MatcherString;
+import base.DuibaLog;
+import io.restassured.response.Response;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by zhaoran on 2018/4/17.
+ */
+public class 单品抽奖_出奖限制_AccessTest extends DuibaTestBase {
+    @Autowired
+    SingleLotteryService singleLotteryService;
+    @Autowired
+    DeveloperService developerService;
+    @Autowired
+    Authorization authorization;
+    @Autowired
+    ManagerService managerService;
+    @Autowired
+    ActivityService activityService;
+
+    @Value("${activity.host}")
+    String activityHost;
+    private static DuibaLog logger = DuibaLog.getLogger();
+    private static String actId;
+    private static String data;
+
+    //指定用户
+    private static int uid = 3777;
+
+    @AfterClass
+    public void after() throws Exception{
+        //数据库删除
+        try {
+            jdbc.update("delete  from credits_dev.operating_activity where title=?","【自动化】出奖限制"+data);
+            jdbc.update("delete  from credits_dev.duiba_single_lottery where title=?","【自动化】出奖限制"+data);
+        } catch (Exception e) {
+            System.out.println(e);
+        }
+    }
+
+    @Test(description = "每个用户可抽中奖品数上限为1")
+    public void 出奖限制测试() throws Exception {
+
+        this.创建并上架活动();
+
+        Response response =  developerService.list2("【自动化】出奖限制"+data);
+        String activityId = response.jsonPath().getString("data.list[0].id");
+        //当天首次抽奖
+        response = this.单品抽奖入参(activityId,activityId,"asdsad");
+        Assert.assertEquals(response.jsonPath().getString("descrption"),"支付宝充值","校验优惠券标题失败");
+        Assert.assertEquals(response.jsonPath().getString("lotteryType"), "alipay", "校验奖品类型失败");
+        Assert.assertEquals(response.jsonPath().getString("message"), "成功", "校验message失败");
+        Assert.assertEquals(response.jsonPath().getString("status"), "1", "校验status失败");
+        logger.info("第一次抽奖，校验descrption，lotteryType，message，status成功");
+        //当天第二次抽奖
+        response = this.单品抽奖入参(activityId,activityId,"asdsad");
+
+        logger.info("tuia-engine服务启动成功");
+        Assert.assertEquals(response.jsonPath().getString("lotteryType"), "lucky", "校验奖品类型失败");
+        Assert.assertEquals(response.jsonPath().getString("lottery.useBtnText"), "马上使用", "校验是否展示马上使用失败");
+        Assert.assertEquals(response.jsonPath().getString("success"), "true", "校验success失败");
+        logger.info("第二次抽奖lotteryType，useBtnText，success");
+
+        this.删除活动();
+    }
+
+    public Response 单品抽奖入参(String operationAcitvityId,String oaId,String token)  throws Exception {
+        //进行接口测试传参
+        Response response =singleLotteryService.doJoin(uid,operationAcitvityId,oaId,token);
+        //response.prettyPrint();
+        String id =MatcherString.getString(response.asString(), "singleLotteryOrderId\":(.*?),", 1);
+        response = singleLotteryService.getOrderStatus(uid,id,"iOS");
+        int i = 10;
+        while ("处理中".equals(response.jsonPath().getString("message")) && i > 0) {
+            Thread.sleep(500);
+            response = singleLotteryService.getOrderStatus(uid,id,"iOS");
+            i--;
+        }
+        return response;
+    }
+
+
+    public void 创建并上架活动() throws Exception {
+        data = PublicMethod.data();
+        String title = "【自动化】出奖限制"+data;
+        //创建单品抽奖活动
+        //构建鼓励奖
+        Map<String,String> incite = new HashMap<>();
+        incite.put("inciteItemId","");
+        incite.put("inciteItemRate","");
+        incite.put("inciteItemRemaining","");
+        incite.put("preInciteItemRemaining","");
+        incite.put("inciteItemConsumerWinLimit","");
+        incite.put("inciteItemMinComein","");
+        singleLotteryService.SingleLottery_create(title,incite);
+        //获取新建活动id
+        Response response = singleLotteryService.manager_index();
+        actId =  MatcherString.getString(response.asString(), "<td>(.*?)</td>\n", 1);
+        //管理后台开启活动
+        singleLotteryService.changeStatus(actId,"1");
+        //开发者上架活动
+        developerService.joinIn(actId,"2");
+        logger.info("创建活动并上架成功");
+    }
+
+
+    public void 删除活动() throws Exception{
+        //管理后台删除单品抽奖活动
+        singleLotteryService.delete(actId);
+        //开发者删除推荐位活动
+        Response response =  developerService.list2("【自动化】出奖限制"+data);
+        String actId = response.jsonPath().getString("data.list[0].id");
+        developerService.delActivity(actId);
+    }
+}
+

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

@@ -834,7 +834,7 @@ public class ManagerService {
         map.put("expressId","123123213213");
         map.put("expressName","圆通速递");
         map.put("orderId",orderId);
-        Response response = given().contentType("application/x-www-form-urlencoded;charset=UTF-8").cookies(authorization.ssoLogin()).params(map).post("http://"+url);
+        Response response = given().relaxedHTTPSValidation().contentType("application/x-www-form-urlencoded;charset=UTF-8").cookies(authorization.ssoLogin()).params(map).post("https://"+url);
         try {
             Assert.assertEquals(response.jsonPath().getString("success"), "true");
         } catch (Exception e) {

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

@@ -76,7 +76,7 @@ public class DeveloperAccountService {
         map.put("mode","two");
         map.put("orderId",orderId);
         map.put("rowId","1");
-        Response response=given().cookies(authorization.hdLogin()).params(map).get("http://"+url);
+        Response response=given().cookies(authorization.hdLoginCommon("zhaoran@duiba.com.cn")).params(map).get("http://"+url);
         try{
             Assert.assertEquals(response.jsonPath().getString("success"),"true","/developerAccount/cashDetail接口失败");