Merge remote-tracking branch 'origin/master'

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

@@ -500,4 +500,46 @@ public class ReserveCTools extends XMBaseTest {
         return dataApi.getBodyInJSON();
         return dataApi.getBodyInJSON();
     }
     }
 
 
+    /**
+     * @description:创建单次约课订单使用储值卡
+     * @author: xuyamei
+     * @date:  2024/7/30 11:48
+     * @param addToQueue 是否排队
+     * @param chiefCoachId 主教id
+     * @param memberId 会员id
+     * @param scheduleId 课次id
+     * @param scheduleStartTime 课次开始时间
+     * @param spanMinutes   上课时长
+     * @param receivableAmount 单次约课金额
+     * @return: java.lang.String
+     **/
+    public String createSingleReserve1(boolean addToQueue,String courseId,String chiefCoachId,String memberId,String scheduleId,long scheduleStartTime,int spanMinutes,int receivableAmount,String depositCardId,String depositAmount){
+        setUP("API_createSingleReserve");
+
+        JSONObject body = new JSONObject();
+        body.put("addToQueue",addToQueue);
+        JSONArray areaIds = new JSONArray();
+        body.put("areaIds", areaIds); // 场地
+
+        JSONArray assistantCoachIds = new JSONArray();
+        body.put("assistantCoachIds",assistantCoachIds); // 助教
+
+        body.put("chiefCoachId",chiefCoachId); // 教练
+
+        body.put("memberId", memberId); // 会员id
+        body.put("courseId", courseId); // 课次id
+        body.put("objectId", RandomStringUtil.randomString(16)); // 会员id
+        body.put("receivableAmount", receivableAmount); // 会员id
+        body.put("studioId", dataApi.getLoginInfo().getStudioId());
+        body.put("scheduleId", scheduleId);
+        body.put("scheduleStartTime", scheduleStartTime);
+        body.put("spanMinutes", spanMinutes);
+        body.put("brandId", dataApi.getLoginInfo().getBrandId());
+        body.put("depositCardId", depositCardId);
+        body.put("depositAmount", depositAmount);
+        dataApi.doRequest(RequestType.JSON,dataparams,body.toString(),dataheadrs).assetsSuccess(true);
+        return dataApi.getBodyInJSON().getString("result");
+
+    }
+
 }
 }

src/main/java/com/xiaomai/cases/polar/entry/EntryTool.java

@@ -127,4 +127,24 @@ public class EntryTool extends XMBaseTest {
         return dataApi.getBodyInJSON();
         return dataApi.getBodyInJSON();
 
 
     }
     }
+    //添加入场记录
+    public JSONObject addmemberEntry(String entryVoucherType,String entryVoucherId,String memberId){
+        dataApi.setApiModule(ApiModule.Polar_MemberEntry)
+                .setApiName("API_manual")
+                .setTerminal(Terminal.B);
+        super.beforeDataRequest();
+
+        JSONObject object = new JSONObject();
+        object.put("entryVoucherType",entryVoucherType);//EXPERIENCE_CARD 体验卡
+        object.put("memberId",memberId);
+        object.put("entryVoucherId",entryVoucherId);
+        object.put("remark","自动化脚本手动添加入场记录备注");
+        object.put("studioId",xmAppApi.getLoginInfo().getStudioId());
+        object.put("brandId",xmAppApi.getLoginInfo().getBrandId());
+        object.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
+
+        dataApi.doRequest(RequestType.JSON,dataparams,object.toString(),dataheadrs).assetsSuccess(true);
+        return dataApi.getBodyInJSON();
+
+    }
 }
 }

src/main/java/com/xiaomai/cases/polar/eventRegistration/EventRegistrationTools.java

@@ -112,8 +112,16 @@ public class EventRegistrationTools extends BaseTestImpl {
         jsonObject1.put("purchaseNumberLimit", -1);//购买限制
         jsonObject1.put("purchaseNumberLimit", -1);//购买限制
         jsonObject1.put("skuName", "自动化-报名项目");
         jsonObject1.put("skuName", "自动化-报名项目");
         jsonObject1.put("stock", "100");//剩余数量
         jsonObject1.put("stock", "100");//剩余数量
+
+        JSONObject jsonObject5 = new JSONObject();
+        jsonObject5.put("price", 100);//报名价格为0元
+        jsonObject5.put("purchaseNumberLimit", -1);//购买限制
+        jsonObject5.put("skuName", "自动化-积分");
+        jsonObject5.put("stock", "100");//剩余数量
+
         List<JSONObject> skuItems = new ArrayList<>();//报名项目
         List<JSONObject> skuItems = new ArrayList<>();//报名项目
         skuItems.add(jsonObject1);
         skuItems.add(jsonObject1);
+        skuItems.add(jsonObject5);
 
 
         JSONObject jsonObject2 = new JSONObject();//活动地点
         JSONObject jsonObject2 = new JSONObject();//活动地点
         jsonObject2.put("address", "同人广场A座");
         jsonObject2.put("address", "同人广场A座");
@@ -531,7 +539,7 @@ public class EventRegistrationTools extends BaseTestImpl {
      * @param activitySkuId 报名项目id
      * @param activitySkuId 报名项目id
      * @param memberId 会员id
      * @param memberId 会员id
      **/
      **/
-    public JSONObject purchaseSellableActivity( String activityId,String activitySkuId,String memberId,DataUserInfo... dataUserInfos) {
+    public JSONObject purchaseSellableActivity( String activityId,String receivableAmount,String activitySkuId,String memberId,DataUserInfo... dataUserInfos) {
 
 
         dataApi.setApiModule(ApiModule.Lunar_Registration)
         dataApi.setApiModule(ApiModule.Lunar_Registration)
                 .setApiName("API_purchaseSellableActivity")
                 .setApiName("API_purchaseSellableActivity")
@@ -568,7 +576,7 @@ public class EventRegistrationTools extends BaseTestImpl {
         jsonObject.put("objectId", RandomStringUtil.randomString(16));
         jsonObject.put("objectId", RandomStringUtil.randomString(16));
         jsonObject.put("activityType", "SELLABLE_ACTIVITY");
         jsonObject.put("activityType", "SELLABLE_ACTIVITY");
         jsonObject.put("purchaseQuantity", 1);
         jsonObject.put("purchaseQuantity", 1);
-        jsonObject.put("receivableAmount", 0);
+        jsonObject.put("receivableAmount", receivableAmount);
         jsonObject.put("collectUserInfoList", collectUserInfoList);
         jsonObject.put("collectUserInfoList", collectUserInfoList);
 
 
 
 

src/main/java/com/xiaomai/cases/polar/eventRegistration/TestGetPurchaseRecordDetail.java

@@ -63,7 +63,7 @@ public class TestGetPurchaseRecordDetail extends XMBaseTest {
 
 
         EventRegistrationTools.sellableActivity_checkMemberPurchaseActivity(activityId,activitySkuId,memberId);//活动报名页
         EventRegistrationTools.sellableActivity_checkMemberPurchaseActivity(activityId,activitySkuId,memberId);//活动报名页
 
 
-        EventRegistrationTools.purchaseSellableActivity(activityId,activitySkuId,memberId);//报名
+        EventRegistrationTools.purchaseSellableActivity(activityId, String.valueOf(0),activitySkuId,memberId);//报名
         String id =XMJSONPath.readPath(dataApi.getApi_response(),"$.result");//订单ID
         String id =XMJSONPath.readPath(dataApi.getApi_response(),"$.result");//订单ID
 
 
         orderTools.getDetail(id,info);//查看B生成的订单
         orderTools.getDetail(id,info);//查看B生成的订单

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

@@ -330,9 +330,10 @@ public class PointsTools extends XMBaseTest {
         jsonObject.put("enableMemberPoint", "YES");//积分功能是否打开
         jsonObject.put("enableMemberPoint", "YES");//积分功能是否打开
         jsonObject.put("memberPointName", "自动化积分");//积分名称
         jsonObject.put("memberPointName", "自动化积分");//积分名称
         jsonObject.put("ruleItemList", ruleItemList);//积分规则
         jsonObject.put("ruleItemList", ruleItemList);//积分规则
-        jsonObject.put("validPeriod", "1");
+        jsonObject.put("validPeriod", "-1");
         jsonObject.put("description", description);
         jsonObject.put("description", description);
 
 
+        System.out.println("jsonObject----"+jsonObject);
 
 
         dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
         dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
         JSONObject response = dataApi.getBodyInJSON();
         JSONObject response = dataApi.getBodyInJSON();

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

@@ -77,7 +77,7 @@ public class TestBatchPoints extends XMBaseTest {
         Assert.assertEquals(AfleftBalance2,AfleftBalance1-1);//断言剩余积分数-1
         Assert.assertEquals(AfleftBalance2,AfleftBalance1-1);//断言剩余积分数-1
 
 
         //核对积分记录
         //核对积分记录
-        //Thread.sleep(1000);
+        Thread.sleep(1000);
         int after2 = Integer.parseInt(XMJSONPath.readPath(pointsTools.findStatementPagePermission(""), "$.result.total"));
         int after2 = Integer.parseInt(XMJSONPath.readPath(pointsTools.findStatementPagePermission(""), "$.result.total"));
         System.out.println("after2--------"+after2);
         System.out.println("after2--------"+after2);
         Assert.assertEquals(after2,after1+1);//断言积分记录+1条记录
         Assert.assertEquals(after2,after1+1);//断言积分记录+1条记录

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

@@ -39,7 +39,7 @@ public class TestFindAccountPagePermission extends XMBaseTest {
 
 
 
 
     @Test(description = "场馆手动-积分")
     @Test(description = "场馆手动-积分")
-    public void testFindAccountPagePermission(){
+    public void testFindAccountPagePermission() throws InterruptedException {
         String phone = "13357537209";
         String phone = "13357537209";
         String memberId = trainingTools.searchTargerMember(phone);
         String memberId = trainingTools.searchTargerMember(phone);
         if (memberId.isEmpty()) {
         if (memberId.isEmpty()) {
@@ -59,6 +59,7 @@ public class TestFindAccountPagePermission extends XMBaseTest {
 
 
 
 
         pointsTools.manualAwardPoint("1",memberId);//会员详情增加1积分
         pointsTools.manualAwardPoint("1",memberId);//会员详情增加1积分
+        Thread.sleep(1000);
         //核对积分帐户的积分的变化
         //核对积分帐户的积分的变化
         int AftotalAwardBalance1 = Integer.parseInt(XMJSONPath.readPath(pointsTools.findAccountPagePermission(xmAppApi.getLoginInfo().getStudioId(),memberId), "$.result.records[0].totalAwardBalance"));//发放积分数
         int AftotalAwardBalance1 = Integer.parseInt(XMJSONPath.readPath(pointsTools.findAccountPagePermission(xmAppApi.getLoginInfo().getStudioId(),memberId), "$.result.records[0].totalAwardBalance"));//发放积分数
         int AfleftBalance1 = Integer.parseInt(XMJSONPath.readPath(pointsTools.findAccountPagePermission(xmAppApi.getLoginInfo().getStudioId(),memberId), "$.result.records[0].leftBalance"));//剩余积分数
         int AfleftBalance1 = Integer.parseInt(XMJSONPath.readPath(pointsTools.findAccountPagePermission(xmAppApi.getLoginInfo().getStudioId(),memberId), "$.result.records[0].leftBalance"));//剩余积分数
@@ -76,6 +77,7 @@ public class TestFindAccountPagePermission extends XMBaseTest {
 
 
 
 
         pointsTools.manualDeductPoint("1",memberId);//会员详情扣减1积分
         pointsTools.manualDeductPoint("1",memberId);//会员详情扣减1积分
+        Thread.sleep(1000);
         //核对积分帐户的积分的变化
         //核对积分帐户的积分的变化
         int AfalreadyUsedBalance2 = Integer.parseInt(XMJSONPath.readPath(pointsTools.findAccountPagePermission(xmAppApi.getLoginInfo().getStudioId(),memberId), "$.result.records[0].alreadyUsedBalance"));//已使用积分积分数
         int AfalreadyUsedBalance2 = Integer.parseInt(XMJSONPath.readPath(pointsTools.findAccountPagePermission(xmAppApi.getLoginInfo().getStudioId(),memberId), "$.result.records[0].alreadyUsedBalance"));//已使用积分积分数
         int AfleftBalance2 = Integer.parseInt(XMJSONPath.readPath(pointsTools.findAccountPagePermission(xmAppApi.getLoginInfo().getStudioId(),memberId), "$.result.records[0].leftBalance"));//剩余积分数
         int AfleftBalance2 = Integer.parseInt(XMJSONPath.readPath(pointsTools.findAccountPagePermission(xmAppApi.getLoginInfo().getStudioId(),memberId), "$.result.records[0].leftBalance"));//剩余积分数

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

+package com.xiaomai.cases.polar.points;
+
+import com.xiaomai.enums.ApiModule;
+import com.xiaomai.enums.LoginAccount;
+import com.xiaomai.enums.Terminal;
+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 javax.annotation.Resource;
+
+public class TestPointsRule extends XMBaseTest {
+    @BeforeMethod
+    public void beforeTest(){
+        xmAppApi.setApiModule(ApiModule.Polar_Points)
+                .setApiName("API_memberPoint_saveRule")
+                .setLoginUser(LoginAccount.YJ_PROD)
+                .setTerminal(Terminal.B);
+        dal.setCase_owner("yangjian")
+                .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
+        super.beforeTest();
+    }
+
+    @Resource(name = "pointsTools")
+    PointsTools pointsTools;
+
+    @Test(description = "积分规则编辑/保存")//新开场馆和品牌
+    public void testMemberPoint_saveRule(){
+        //pointsTools.memberPoint_saveRule("");
+        pointsTools.memberPoint_saveRule(xmAppApi.getLoginInfo().getStudioId());
+        pointsTools.memberPoint_findRule(xmAppApi.getLoginInfo().getStudioId());
+        Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.enableMemberPoint"), "YES", "积分规则未开启");
+
+
+    }
+}

src/main/java/com/xiaomai/cases/polar/setting/venue/VenueAreaTools.java

@@ -13,6 +13,8 @@ import com.xiaomai.utils.XMJSONPath;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 import org.testng.Assert;
 import org.testng.Assert;
 
 
+import java.math.BigDecimal;
+
 /**
 /**
  * @BelongsProject: xm-sportstest
  * @BelongsProject: xm-sportstest
  * @BelongsPackage: com.xiaomai.cases.polar.setting.venue
  * @BelongsPackage: com.xiaomai.cases.polar.setting.venue
@@ -1030,4 +1032,51 @@ public class VenueAreaTools extends XMBaseTest {
         dataApi.doRequest(RequestType.JSON, dataparams, object.toString(), dataheadrs).assetsSuccess(true);
         dataApi.doRequest(RequestType.JSON, dataparams, object.toString(), dataheadrs).assetsSuccess(true);
         return dataApi.getBodyInJSON();
         return dataApi.getBodyInJSON();
     }
     }
+
+    /**
+     * 小程序场地预约非0元
+     * @param startMinute 开始时间
+     * @param endMinute 结束时间
+     * @param suiteId 场地组id
+     * @param groupId 场地id
+     * @param memberId 会员id
+     * @param reserveDay 预约日期
+
+     * @param userInfos
+     * @return
+     */
+    public String purchaseAreaTimes1(String startMinute, String endMinute, BigDecimal price, String suiteId, String groupId,
+                                     String memberId, String receivableAmount, String reserveDay, String venueAreaId,String depositAmount,String depositCardId,  DataUserInfo...userInfos) {
+        dataApi.setApiModule(ApiModule.Lunar_VenueArea)
+                .setApiName("API_purchaseAreaTimes")
+                .setTerminal(Terminal.minApp);
+        super.beforeDataRequest(userInfos);
+
+        JSONArray areaTimeInfos = new JSONArray();
+        JSONObject areaTime = new JSONObject();
+        areaTime.put("startMinute",startMinute);//预约开始时间
+        areaTime.put("endMinute",endMinute);//预约结束时间
+        areaTime.put("price",price);
+        areaTimeInfos.add(areaTime);
+
+        //构建请求参数
+        JSONObject object = new JSONObject();
+        object.put("areaTimeInfos", areaTimeInfos);
+        object.put("depositAmount", depositAmount);
+        object.put("depositCardId", depositCardId);
+        object.put("groupId", groupId);//场地id
+        object.put("memberId", memberId);
+        object.put("memo", "自动化脚本创建的场地预约");
+        object.put("objectId", RandomStringUtil.randomString(16));
+        object.put("receivableAmount", receivableAmount);
+        object.put("reserveDay", reserveDay);
+        object.put("studioId", dataApi.getLoginInfo().getStudioId());
+        object.put("suiteId", suiteId);//场地组id
+        object.put("venueAreaId", venueAreaId);
+
+        dataApi.doRequest(RequestType.JSON, dataparams, object.toString(), dataheadrs);
+        Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.success")) == true, "调用接口返回结果：" + XMJSONPath.readPath(dataApi.getApi_response(), "$.message"));
+
+        return dataApi.getBodyInJSON().getJSONObject("result").getString("id");
+    }
 }
 }

src/main/java/com/xiaomai/enums/LoginAccount.java

@@ -25,5 +25,7 @@ public class LoginAccount {
     public static String YFF_RC="yff_rc";
     public static String YFF_RC="yff_rc";
 
 
     public static String YFF_GRAY="yff_gray";//芳芳场馆
     public static String YFF_GRAY="yff_gray";//芳芳场馆
+    public static String YJ_PROD="yj_prod";//杨剑场馆
+    public static String YJ_PROD_ALL="yj_prod_all";//杨剑场馆
 
 
 }
 }