Merge branch 'zr' into develop

src/test/java/http/cases/PkMoudleTest/瓜分积分_作弊瓜分.java

@@ -36,9 +36,9 @@ public class 瓜分积分_作弊瓜分 extends DuibaTestBase {
 
     private DuibaLog logger = DuibaLog.getLogger();
 
-    private static Integer uid1 = 5029;
-    private static Integer uid2 = 5058;
-    private static Integer uid3 = 5059;
+    private static Integer uid1 = 5080;
+    private static Integer uid2 = 5081;
+    private static Integer uid3 = 5086;
     private static String betId;
     private static String optionId1;
     private static String optionId2;
@@ -46,7 +46,7 @@ public class 瓜分积分_作弊瓜分 extends DuibaTestBase {
 
     @Test
     public void 创建PK活动() throws Exception{
-        Response response = pkDevelopService.betEditor("21771","4",null,"30");
+        Response response = pkDevelopService.betEditor("21827","4","1","1","30");
         Assert.assertEquals(response.jsonPath().getString("desc"),"成功","创建组件化pk活动失败");
 
         response = pkService.getBetList(uid1);
@@ -129,9 +129,9 @@ public class 瓜分积分_作弊瓜分 extends DuibaTestBase {
         logger.info("用户2开奖前积分："+credits2);
         logger.info("用户3开奖前积分："+credits3);
 
-        //增加积分： 30/(2+2)
-        credits1 = String.valueOf(Integer.valueOf(credits1)+7);
-        credits2 = String.valueOf(Integer.valueOf(credits2)+7);
+        //增加积分：设置实际每人瓜分1积分
+        credits1 = String.valueOf(Integer.valueOf(credits1)+1);
+        credits2 = String.valueOf(Integer.valueOf(credits2)+1);
 
         //修改开奖时间
         this.modifyOpenPrizeTime(betId,60);
@@ -170,9 +170,9 @@ public class 瓜分积分_作弊瓜分 extends DuibaTestBase {
         Assert.assertEquals(betGroupRelation.get("config_status").toString(),"4","pk关系表开奖状态更新失败");
         logger.info("pk活动配置表状态更新为："+betConfig.get("config_status").toString()+"，pk关系表活动状态更新为："+betGroupRelation.get("config_status").toString());
 
-        Map<String,Object> user01_order = jdbc.findSimpleResult("select * from activity_order_con.tb_trade_center_activity_order_0661 where consumer_id = '100112021' and duiba_activity_id = ?\n",betId);
-        Assert.assertEquals(user01_order.get("add_credits").toString(),"7","开奖后发奖值校验失败");
-        Map<String,Object> user02_order = jdbc.findSimpleResult("select * from activity_order_con.tb_trade_center_activity_order_0691 where consumer_id = '100112051' and duiba_activity_id = ?\n",betId);
+        Map<String,Object> user01_order = jdbc.findSimpleResult("select * from activity_order_con.tb_trade_center_activity_order_0723 where consumer_id = '100112083' and duiba_activity_id = ?\n",betId);
+        Assert.assertEquals(user01_order.get("add_credits").toString(),"1","开奖后发奖值校验失败");
+        Map<String,Object> user02_order = jdbc.findSimpleResult("select * from activity_order_con.tb_trade_center_activity_order_0724 where consumer_id = '100112084' and duiba_activity_id = ?\n",betId);
         Assert.assertEquals(user02_order.get("add_credits").toString(),"","开奖后发奖值校验失败");
         logger.info("用户01获取的积分值为："+user01_order.get("add_credits").toString()+",用户03获取的积分值为："+user02_order.get("add_credits").toString());
 

src/test/java/http/cases/PkMoudleTest/瓜分积分_实际瓜分.java

@@ -48,7 +48,7 @@ public class 瓜分积分_实际瓜分 extends DuibaTestBase {
 
     @Test
     public void 创建PK活动() throws Exception{
-        Response response = pkDevelopService.betEditor("21771","4",null,"30");
+        Response response = pkDevelopService.betEditor("21771","4",null,"1","30");
         Assert.assertEquals(response.jsonPath().getString("desc"),"成功","创建组件化pk活动失败");
 
         response = pkService.getBetList(uid1);

src/test/java/http/service/app/SupplierExchangeTemplateService.java

@@ -13,7 +13,7 @@ import static io.restassured.RestAssured.given;
  */
 @Service
 public class SupplierExchangeTemplateService {
-    private String dafuwengHost = "47.97.214.108";
+    private String dafuwengHost = "dafuweng.duibatest.com.cn";
     public Response use(String id){
         String url = "http://"+dafuwengHost+"/supplierExchangeTemplate/use";
 

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

@@ -42,7 +42,7 @@ public class PkDevelopService {
 
     private DuibaLog logger = DuibaLog.getLogger();
 
-    public Response betEditor(String appId,String bonusType,String bonusAmount,String shareExp) throws Exception{
+    public Response betEditor(String appId,String bonusType,String bonusAmount,String creditsValue,String shareExp) throws Exception{
         String data = PublicMethod.data();
 
         String url = "http://" + hdHost + "/visual-editor/bet/post";
@@ -74,7 +74,7 @@ public class PkDevelopService {
         }
         betDevelopVo.setBonusAmount(bonusAmount);
         betDevelopVo.setConfigStatus("3");
-        betDevelopVo.setCreditsValue("1");
+        betDevelopVo.setCreditsValue(creditsValue);
         betDevelopVo.setEndTime("2029-12-31 00:00");
         betDevelopVo.setShareExp(shareExp);