Merge branch 'master' into develop

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

@@ -27,7 +27,7 @@ import java.sql.SQLException;
 import java.util.Map;
 
 
-public class 瓜分积分_作弊瓜分_AccessTest extends DuibaTestBase {
+public class 瓜分积分_作弊瓜分 extends DuibaTestBase {
 
     @Autowired
     PkDevelopService pkDevelopService;

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

@@ -29,7 +29,7 @@ import java.util.List;
 import java.util.Map;
 
 
-public class 瓜分积分_实际瓜分_AccessTest extends DuibaTestBase {
+public class 瓜分积分_实际瓜分 extends DuibaTestBase {
 
     @Autowired
     PkDevelopService pkDevelopService;

src/test/java/http/cases/PkMoudleTest/瓜分积分_实际瓜分_主胜方_AccessTest.java → src/test/java/http/cases/PkMoudleTest/瓜分积分_实际瓜分_主胜方.java

@@ -27,7 +27,7 @@ import java.sql.SQLException;
 import java.util.Map;
 
 
-public class 瓜分积分_实际瓜分_主胜方_AccessTest extends DuibaTestBase {
+public class 瓜分积分_实际瓜分_主胜方 extends DuibaTestBase {
 
     @Autowired
     PkDevelopService pkDevelopService;

src/test/java/http/cases/PkMoudleTest/瓜分红包_作弊瓜分_AccessTest.java → src/test/java/http/cases/PkMoudleTest/瓜分红包_作弊瓜分.java

@@ -29,7 +29,7 @@ import java.text.DecimalFormat;
 import java.util.Map;
 
 
-public class 瓜分红包_作弊瓜分_AccessTest extends DuibaTestBase {
+public class 瓜分红包_作弊瓜分 extends DuibaTestBase {
 
     @Autowired
     PkDevelopService pkDevelopService;

src/test/java/http/cases/PkMoudleTest/瓜分红包_实际瓜分_AccessTest.java → src/test/java/http/cases/PkMoudleTest/瓜分红包_实际瓜分.java

@@ -29,7 +29,7 @@ import java.text.DecimalFormat;
 import java.util.Map;
 
 
-public class 瓜分红包_实际瓜分_AccessTest extends DuibaTestBase {
+public class 瓜分红包_实际瓜分 extends DuibaTestBase {
 
     @Autowired
     PkDevelopService pkDevelopService;

src/test/java/http/cases/WalletTest/账户余额清零_AccessTest.java

@@ -56,7 +56,9 @@ public class 账户余额清零_AccessTest extends DuibaTestBase {
     @Test(description = "过期日前账户余额>0")
     public void a_账户过期余额清零() throws Exception {
         //修改账户过期时间，确保账户始终处于过期状态
-        jdbc.update("update consumer_account_log.tb_expire_consumer_account set gmt_modified ='" + getTime(-1) + "' where account_id = '"+consumerId+"_6_0'");
+        //jdbc.update("update consumer_account_log.tb_expire_consumer_account set gmt_modified ='" + getTime(-1) + "' where account_id = '"+consumerId+"_6_0'");
+        jdbc.update("update consumer_account_log.tb_expire_consumer_account set gmt_modified ='2018-12-31 08:00:00' where account_id = '"+consumerId+"_6_0'");
+
         //删除过期记录
         jdbc.update("delete from consumer_account_log.tb_consumer_accounts_log where account_id = '"+consumerId+"_6_0' and biz_type='10'");
         //删除自动化充值记录
@@ -140,7 +142,8 @@ public class 账户余额清零_AccessTest extends DuibaTestBase {
     @Test(description = "过期日前账户余额=0")
     public void d_账户过期余额清零2() throws Exception {
         //修改账户过期时间，确保账户始终处于过期状态
-        jdbc.update("update consumer_account_log.tb_expire_consumer_account set gmt_modified ='" + getTime(-1) + "' where account_id = '"+consumerId2+"_6_0'");
+        //jdbc.update("update consumer_account_log.tb_expire_consumer_account set gmt_modified ='" + getTime(-1) + "' where account_id = '"+consumerId2+"_6_0'");
+        jdbc.update("update consumer_account_log.tb_expire_consumer_account set gmt_modified ='2018-12-31 08:00:00' where account_id = '"+consumerId2+"_6_0'");
 
         Map<String, Object> sqlResult = jdbc.findSimpleResult("select * from consumer_account_log.tb_expire_consumer_account where account_id = '"+consumerId2+"_6_0' ");
         String gmt_modified1 = String.valueOf(sqlResult.get("gmt_modified"));

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

@@ -201,7 +201,7 @@ public class CouponExchangeService {
         map.put("appItemId",appItemId);
         map.put("itemId",itemId);
         map.put("dba","null");
-        map.put("token","69xjl0a");
+        map.put("token","yrJRr7Cddp2YeQd");
         logger.info("请求/couponExchange/exchange接口");
 
         Response response = given().contentType("application/x-www-form-urlencoded;charset=UTF-8").cookies(cookies).params(map).post("http://"+goodsHost+"/couponExchange/exchange");//couponExchange