Merge remote-tracking branch 'origin/master'

src/main/java/com/xiaomai/cases/polar/data/salesData/TestCenterData.java

@@ -55,25 +55,25 @@ public class TestCenterData extends XMBaseTest {
 
         //先查一下当前今天的销售数据-数据分析-汇总
         JSONObject beforeAnalysis=salesDataTools.centerData("DAY",TimeUtils.getTodayEndTime(),TimeUtils.getTodayTime());
-        int beforeNewMemberCount=Integer.parseInt(beforeAnalysis.getJSONObject("result").getString("newMemberCount"));//新增会员数
+        int beforeNewMemberCount=Integer.parseInt(beforeAnalysis.getJSONObject("result").getString("newMemberClueCount"));//新增会员数
         BigDecimal beforeActualAmount=new BigDecimal(beforeAnalysis.getJSONObject("result").getString("actualAmount"));//签单实收金额
 
 
         //先查一下当前今天的销售数据-按照来源是无筛选数据明细的数据
-        JSONObject beforeResourceDataDetail=salesDataTools.resourceDataDetail(TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(),"-1","DAY","NEW_MEMBER_COUNT_DESC");
-        int beforeResourceDataDetailNewMemberCount=Integer.parseInt(beforeResourceDataDetail.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("newMemberCount"));
+        JSONObject beforeResourceDataDetail=salesDataTools.resourceDataDetail(TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(),"-1","DAY","NEW_MEMBER_CLUE_COUNT_DESC");
+        int beforeResourceDataDetailNewMemberCount=Integer.parseInt(beforeResourceDataDetail.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("newMemberClueCount"));
         BigDecimal beforeResourceDataDetailActualAmount=new BigDecimal(beforeResourceDataDetail.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("actualAmount"));
 
 
         //先查一下当前今天的销售数据-按照添加人是当前人筛选数据明细的数据
         JSONObject beforeCreatorDataDetail=salesDataTools.creatorDataDetail(TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(),xmAppApi.getLoginInfo().getAdminId(),"DAY","NEW_MEMBER_COUNT_DESC");
-        int beforeCreatorDataDetailNewMemberCount=Integer.parseInt(beforeCreatorDataDetail.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("newMemberCount"));
+        int beforeCreatorDataDetailNewMemberCount=Integer.parseInt(beforeCreatorDataDetail.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("newMemberClueCount"));
         BigDecimal beforeCreatorDataDetailActualAmount=new BigDecimal(beforeCreatorDataDetail.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("actualAmount"));
 
 
         //先查一下当前今天的销售数据-按照跟进销售是无筛选数据明细的数据
         JSONObject beforeSalesDataDetail=salesDataTools.salesDataDetail(TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(),"-1","DAY","NEW_MEMBER_COUNT_DESC");
-        int beforeSalesDataDetailNewMemberCount=Integer.parseInt(beforeSalesDataDetail.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("newMemberCount"));
+        int beforeSalesDataDetailNewMemberCount=Integer.parseInt(beforeSalesDataDetail.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("newMemberClueCount"));
         BigDecimal beforeSalesDataDetailActualAmount=new BigDecimal(beforeSalesDataDetail.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("actualAmount"));
 
 
@@ -159,7 +159,7 @@ public class TestCenterData extends XMBaseTest {
         xmAppApi.doRequest(RequestType.JSON,params,analysis.toJSONString(),headers).assetsSuccess(true);
         JSONObject analysisResult=xmAppApi.getBodyInJSON();
         Assert.assertEquals(analysisResult.getString("success"),"true","获取销售数据-数据分析-汇总失败");
-        int newMemberCount=Integer.parseInt(analysisResult.getJSONObject("result").getString("newMemberCount"));//新增会员数
+        int newMemberCount=Integer.parseInt(analysisResult.getJSONObject("result").getString("newMemberClueCount"));//新增会员数
         BigDecimal actualAmount=new BigDecimal(analysisResult.getJSONObject("result").getString("actualAmount"));//签单实收金额
 //        BigDecimal qoqOfActualAmount=new BigDecimal(analysisResult.getJSONObject("result").getString("qoqOfActualAmount"));//签单实收金额环比
 //        BigDecimal qoqOfNewMemberCount=new BigDecimal(analysisResult.getJSONObject("result").getString("qoqOfNewMemberCount"));//新增会员数环比
@@ -187,7 +187,7 @@ public class TestCenterData extends XMBaseTest {
 
         //3.校验销售数据-按照来源为无筛选数据明细-有无上述新增会员数和签单实收金额
         JSONObject resourceDataDetail=salesDataTools.resourceDataDetail(TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(),"-1","DAY","NEW_MEMBER_COUNT_DESC");
-        int resourceDataDetailNewMemberCount=Integer.parseInt(resourceDataDetail.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("newMemberCount"));
+        int resourceDataDetailNewMemberCount=Integer.parseInt(resourceDataDetail.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("newMemberClueCount"));
         BigDecimal resourceDataDetailActualAmount=new BigDecimal(resourceDataDetail.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("actualAmount"));
         Assert.assertEquals(resourceDataDetailNewMemberCount,beforeResourceDataDetailNewMemberCount+1,"新建一个来源为无的线索之后，销售数据明细筛选来源为无的新增会员数未加1");
         Assert.assertEquals(resourceDataDetailActualAmount,beforeResourceDataDetailActualAmount.add(BigDecimal.valueOf(paidAmount)),"签单完成之后，销售数据明细来源为无的签单实收金额未增加对应的签单实收金额");
@@ -196,7 +196,7 @@ public class TestCenterData extends XMBaseTest {
         //4.校验销售数据-按照添加人是当前人筛选数据明细-有无上述新增会员数和签单实收金额
 
         JSONObject creatorDataDetail=salesDataTools.creatorDataDetail(TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(),xmAppApi.getLoginInfo().getAdminId(),"DAY","NEW_MEMBER_COUNT_DESC");
-        int creatorDataDetailNewMemberCount=Integer.parseInt(creatorDataDetail.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("newMemberCount"));
+        int creatorDataDetailNewMemberCount=Integer.parseInt(creatorDataDetail.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("newMemberClueCount"));
         BigDecimal creatorDataDetailActualAmount=new BigDecimal(creatorDataDetail.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("actualAmount"));
         Assert.assertEquals(creatorDataDetailNewMemberCount,beforeCreatorDataDetailNewMemberCount+1,"新建一个线索之后，销售数据明细筛选添加人是当前人的新增会员数未加1");
         Assert.assertEquals(creatorDataDetailActualAmount,beforeCreatorDataDetailActualAmount.add(BigDecimal.valueOf(paidAmount)),"签单完成之后，销售数据明细筛选添加人是当前人的签单实收金额未增加对应的签单实收金额");
@@ -205,7 +205,7 @@ public class TestCenterData extends XMBaseTest {
 
         //5.校验销售数据-按照跟进销售为无筛选数据明细-有无上述新增会员数和签单实收金额
         JSONObject salesDataDetail=salesDataTools.salesDataDetail(TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(),"-1","DAY","NEW_MEMBER_COUNT_DESC");
-        int salesDataDetailNewMemberCount=Integer.parseInt(salesDataDetail.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("newMemberCount"));
+        int salesDataDetailNewMemberCount=Integer.parseInt(salesDataDetail.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("newMemberClueCount"));
         BigDecimal salesDataDetailActualAmount=new BigDecimal(salesDataDetail.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("actualAmount"));
         Assert.assertEquals(salesDataDetailNewMemberCount,beforeSalesDataDetailNewMemberCount+1,"新建一个线索之后，销售数据明细筛选跟进销售为无的新增会员数未加1");
         Assert.assertEquals(salesDataDetailActualAmount,beforeSalesDataDetailActualAmount.add(BigDecimal.valueOf(paidAmount)),"签单完成之后，销售数据明细筛选跟进销售为无的签单实收金额未增加对应的签单实收金额");

src/main/java/com/xiaomai/cases/polar/data/salesData/TestTrend.java

@@ -29,7 +29,7 @@ public class TestTrend extends XMBaseTest {
     public Object[][] dataProvider(){
         return new Object[][]{
 
-                {"DAY","NEW_MEMBER_COUNT",TimeUtils.getTodayEndTime(),TimeUtils.getTodayTime()},//新增会员数,今天
+                {"DAY","NEW_MEMBER_CLUE_COUNT",TimeUtils.getTodayEndTime(),TimeUtils.getTodayTime()},//新增会员数,今天
                 {"MONTH","SIGN_ORDER_ACTUAL_AMOUNT",TimeUtils.getMonthLastDay(),TimeUtils.getMonthFristDay()},//签单实收金额,本月
 
         };
@@ -57,7 +57,7 @@ public class TestTrend extends XMBaseTest {
     @DataProvider
     public Object[][] dataProvider1(){
         return new Object[][]{
-                {"WEEK","NEW_MEMBER_COUNT",TimeUtils.getWeekLastTime(),TimeUtils.getWeekFirstTime()},//新增会员数，本周
+                {"WEEK","NEW_MEMBER_CLUE_COUNT",TimeUtils.getWeekLastTime(),TimeUtils.getWeekFirstTime()},//新增会员数，本周
                 {"WEEK","SIGN_ORDER_ACTUAL_AMOUNT",TimeUtils.getWeekLastTime(),TimeUtils.getWeekFirstTime()},//签单实收金额，本周
         };
     }

src/main/java/com/xiaomai/cases/polar/points/TestFindStatementPagePermission.java

@@ -166,7 +166,7 @@ public class TestFindStatementPagePermission extends XMBaseTest {
 
         
         String categoryId1 = courseCategoryTools.getCourseCategoryPage("健美操");
-        String courseId1 = courseTools.getPersonalOrGroupCourseId("PERSONAL", "自动化私教课", categoryId1, "STUDIO", "ONE_TO_MANY", 1, 1).getString(0);
+        String courseId1 = courseTools.getPersonalOrGroupCourseId("PERSONAL", "积分自动化私教课", categoryId1, "STUDIO", "ONE_TO_MANY", 1, 1).getString(0);
 
         JSONArray personalCoachTime = reserveTools.getPersonalTimeBlocks(xmAppApi.getLoginInfo().getAdminId(),courseId1,TimeUtils.getTodayTime());
 

src/main/java/com/xiaomai/cases/polar/reserve/personal/TestSignReservePerson.java

@@ -3,6 +3,7 @@ package com.xiaomai.cases.polar.reserve.personal;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.xiaomai.basetest.BaseTestImpl;
+import com.xiaomai.cases.polar.admin.AdminTools;
 import com.xiaomai.cases.polar.clue.MemberTools;
 import com.xiaomai.cases.polar.course.CourseTools;
 import com.xiaomai.cases.polar.finance.order.OrderTools;
@@ -46,7 +47,8 @@ public class TestSignReservePerson extends BaseTestImpl {
 
     @Resource(name = "groupScheduleTools")
     GroupScheduleTools groupScheduleTools;
-
+    @Resource(name="adminTools")
+    AdminTools adminTools;
 
     MemberTools memberTools = new MemberTools();
 
@@ -92,11 +94,17 @@ public class TestSignReservePerson extends BaseTestImpl {
         // 第三步：查询存量的私教教练，并将教练添加到课程中
         // 获取到员工
         // 获取教练列表
-        JSONObject pageStudioPersonalCoach = reserveTools.pageStudioPersonalCoach("");
-        int total = pageStudioPersonalCoach.getInteger("total");
-        Random rand = new Random();
-        // 随机取1个教练
-        coachedId = pageStudioPersonalCoach.getJSONArray("records").getJSONObject(rand.nextInt(total > 10 ? 10 : total)).getString("id");
+        JSONObject pageStudioPersonalCoach = reserveTools.pageStudioPersonalCoach("1V1约课签到教练");
+        if (pageStudioPersonalCoach.getJSONArray("records").size()==0){
+            adminTools.addStudioAdmin("教练","1V1约课签到教练");
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+            pageStudioPersonalCoach = reserveTools.pageStudioPersonalCoach("1V1约课签到教练");
+        }
+        coachedId = pageStudioPersonalCoach.getJSONArray("records").getJSONObject(0).getString("id");
         // 编辑私教课程教练添加到课程中
         courseTools.editPersonalCourse(categoryId, courseId, courseName, 10, coachedId, "1");