Merge branch 'master' of ssh://xmgit.ixm5.cn:10022/xiamai-test/xm-sportstest

src/main/java/com/xiaomai/cases/lunar/reserve/TestAddToQueue.java

@@ -231,7 +231,7 @@ public class TestAddToQueue extends BaseTestImpl {
                 groupScheduleTools.editGroupSchedule(scheduleId,startTime,chiefCoachId,1,2,dataUserInfo);
 
                 try {
-                    Thread.sleep(5000);
+                    Thread.sleep(10000);
                 } catch (InterruptedException e) {
                     throw new RuntimeException(e);
                 }

src/main/java/com/xiaomai/cases/polar/admin/TestReinStateStudioAdmin.java

@@ -37,7 +37,7 @@ public class TestReinStateStudioAdmin extends BaseTestImpl {
     @Test
     public void testReinStateStudioAdmin() {
         // 获取离职员工
-        String body = "{\"size\":10,\"current\":0,\"state\":\"LEFT\"}";
+        String body = "{\"size\":20,\"current\":0,\"state\":\"LEFT\"}";
         JSONObject adminPage = adminTools.pageStudioAdmin(body);
         int total = Integer.parseInt(adminPage.getJSONObject("result").getString("total"));
         if (total>1){
@@ -57,23 +57,23 @@ public class TestReinStateStudioAdmin extends BaseTestImpl {
             body = "{\"id\":\""+adminId+"\"}";
             xmAppApi.doRequest(RequestType.JSON,params,body,headers).assetsSuccess(true);
             try {
-                Thread.sleep(1000);
+                Thread.sleep(2000);
             } catch (InterruptedException e) {
                 throw new RuntimeException(e);
             }
             // check 1：用手机号查询离职员工是否有这个员工
-            body = "{\"size\":10,\"current\":0,\"state\":\"DUTY\",\"searchContext\":\""+phone+"\"}";
+            body = "{\"size\":20,\"current\":0,\"state\":\"DUTY\",\"searchContext\":\""+phone+"\"}";
             adminPage = adminTools.pageStudioAdmin(body);
             total = Integer.parseInt(adminPage.getJSONObject("result").getString("total"));
             Assert.assertEquals(total,1,"员工离职失败,用手机号查询离职员工未返回数据");
 
             try {
-                Thread.sleep(12000);
+                Thread.sleep(15000);
             } catch (InterruptedException e) {
                 throw new RuntimeException(e);
             }
             // check 2: 生成对应的操作日志
-            body = "{\"current\":0,\"size\":10,\"domainId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"content\": \""+name+"\",\"brandId\":\""+xmAppApi.getLoginInfo().getBrandId()+"\",\"studioId\": \""+xmAppApi.getLoginInfo().getStudioId()+"\",\"opEventKey\":\"RESTORE_ADMIN\"}";
+            body = "{\"current\":0,\"size\":20,\"domainId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"content\": \""+name+"\",\"brandId\":\""+xmAppApi.getLoginInfo().getBrandId()+"\",\"studioId\": \""+xmAppApi.getLoginInfo().getStudioId()+"\",\"opEventKey\":\"RESTORE_ADMIN\"}";
             JSONObject response = configTools.getOpauditPage(body);
             Assert.assertEquals(response.getJSONObject("result").getJSONArray("records").getJSONObject(0).getJSONObject("target").getString("targetId"),adminId,"员工离职未生成操作日志");
 

src/main/java/com/xiaomai/cases/polar/applet/TestSetStyleConfig.java

@@ -32,7 +32,7 @@ public class TestSetStyleConfig extends XMBaseTest {
         super.beforeTest();
     }
 
-    @Test(description = "修改小程序全局配置")
+    //@Test(description = "修改小程序全局配置")
     public void testSetStyleConfig(){
         Random random = new Random();
         String[] themeColor = {"132, 111, 234","40, 115, 255","51, 202, 105"};//紫、蓝、绿

src/main/java/com/xiaomai/cases/polar/config/TestGetSmsRechargeOrderStatus.java

@@ -6,11 +6,11 @@ import com.xiaomai.enums.LoginAccount;
 import com.xiaomai.enums.RequestType;
 import com.xiaomai.enums.Terminal;
 import com.xiaomai.utils.RandomStringUtil;
+import com.xiaomai.utils.XMBaseTest;
 import com.xiaomai.utils.XMJSONPath;
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
-import com.xiaomai.utils.XMBaseTest;
 
 /**
  * @Author: xyy
@@ -44,9 +44,13 @@ public class TestGetSmsRechargeOrderStatus extends XMBaseTest {
         object.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
 
         //调用请求
-        xmAppApi.doRequest(RequestType.JSON,params,object.toJSONString(),headers).assetsSuccess(false);
-        JSONObject response = xmAppApi.getBodyInJSON();
-        Assert.assertEquals(XMJSONPath.readPath(response,"$.message"),"充值订单不存在");
+        xmAppApi.doRequest(RequestType.JSON,params,object.toJSONString(),headers);
+        boolean flag = Boolean.parseBoolean(XMJSONPath.readPath(xmAppApi.getBodyInJSON(),"$.success"));
+        if(flag==false){
+            Assert.assertEquals(XMJSONPath.readPath(xmAppApi.getBodyInJSON(),"$.message"),"充值订单不存在");
+        }else {
+            Assert.assertEquals(XMJSONPath.readPath(xmAppApi.getBodyInJSON(),"$.result.status"),"0");
+        }
     }
 }
 

src/main/java/com/xiaomai/cases/polar/goods/TestGoodsOrderByDeposit.java

@@ -40,6 +40,8 @@ public class TestGoodsOrderByDeposit extends XMBaseTest {
 
     String memberId;
 
+    String voucherId;
+
 
 
     @BeforeMethod
@@ -96,7 +98,7 @@ public class TestGoodsOrderByDeposit extends XMBaseTest {
 
 
         //1.购储值卡,获取购卡订单id
-        String voucherId = cardTools.signOrderDeposit(cardId,latestSnapshotId,memberId,String.valueOf(cardPrice),String.valueOf(cardBalance));
+        voucherId = cardTools.signOrderDeposit(cardId,latestSnapshotId,memberId,String.valueOf(cardPrice),String.valueOf(cardBalance));
 
         //获取已售储值卡ID，使用储值卡抵扣的时候需要的ID
         JSONObject listUserUsableDepositCardB=cardTools.listUserUsableDepositCardB(memberId,"GOODS").getJSONObject("result").getJSONArray("applicableList").getJSONObject(0);
@@ -305,4 +307,13 @@ public class TestGoodsOrderByDeposit extends XMBaseTest {
 
 
     }
+
+    @Test(description ="作废签单订单",priority = 1)
+    public void  discard(){
+        //作废储值卡签单订单
+        orderTools.discard(voucherId, "重复录入", "已作废储值卡签单订单" + RandomStringUtil.randomString(10));
+
+
+    }
+
     }

src/main/java/com/xiaomai/cases/polar/importExcel/TestImportDeposit.java

@@ -2,6 +2,7 @@ package com.xiaomai.cases.polar.importExcel;
 
 import com.alibaba.fastjson.JSONObject;
 import com.xiaomai.cases.polar.enums.ExcelImportEnum;
+import com.xiaomai.cases.polar.memberCard.CardTools;
 import com.xiaomai.cases.polar.utils.Entity.SignatureVO;
 import com.xiaomai.cases.polar.utils.ModifyExcelContentUtil;
 import com.xiaomai.cases.polar.utils.ResourceUtil;
@@ -15,12 +16,16 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import javax.annotation.Resource;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
 public class TestImportDeposit extends XMBaseTest {
     ImportTools importTools = new ImportTools();
+
+    @Resource(name="cardTools")
+    CardTools cardTools;
     @BeforeMethod
     public void beforeTest(){
 
@@ -97,7 +102,5 @@ public class TestImportDeposit extends XMBaseTest {
         Assert.assertEquals(Integer.parseInt(res.getString("total")),total+1);
         Assert.assertEquals(res.getJSONArray("records").getJSONObject(0).getString("resourceId"),resourceId);
         Assert.assertEquals(res.getJSONArray("records").getJSONObject(0).getString("state"),"SUCCESS");
-
     }
-
 }

src/main/java/com/xiaomai/cases/polar/luckyDraw/LuckyDrawTools.java

@@ -303,7 +303,7 @@ public class LuckyDrawTools extends BaseTestImpl {
         body.put("noWinName", "谢谢惠顾");
         body.put("publish",publish);//是否发布
         body.put("actDescribe","自动化脚本edit幸运抽奖");
-        body.put("startTime",System.currentTimeMillis());//活动开始时间：当前时间
+        body.put("startTime",TimeUtils.getTodayTime());//活动开始时间：获取当天0点
         body.put("prizeList",prizeList);
         body.put("id",activityId);
         body.put("brandId", dataApi.getLoginInfo().getBrandId());

src/main/java/com/xiaomai/cases/polar/memberCard/TestCreateTerm.java

@@ -52,7 +52,7 @@ public class TestCreateTerm extends XMBaseTest {
         Object.put("price","1");
         benefitList.add(Object);
 
-        String title="期限-自动化会员卡"+RandomStringUtil.randomString(3);
+        String title="期限-自动化会员卡"+RandomStringUtil.randomString(4);
 
 
         JSONObject jsonObject = new JSONObject();