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

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

@@ -7,6 +7,7 @@ import com.xiaomai.enums.ApiModule;
 import com.xiaomai.enums.RequestType;
 import com.xiaomai.enums.Terminal;
 import com.xiaomai.utils.RandomStringUtil;
+import com.xiaomai.utils.TimeUtils;
 import com.xiaomai.utils.XMBaseTest;
 
 import java.util.ArrayList;
@@ -277,6 +278,119 @@ public JSONObject membercardsearch( DataUserInfo...dataUserInfos) {
 
         }
 
+    /**
+     * @param
+     * @description:手动扣次
+     * @author: yangjian
+     **/
+    public JSONObject manualDeduct( String benefitId ,String memberCardId ,DataUserInfo...dataUserInfos) {
+
+        dataApi.setApiModule(ApiModule.Polar_Card)
+                .setApiName("API_manualDeduct")
+                .setTerminal(Terminal.B);
+        super.beforeDataRequest(dataUserInfos);
+
+        JSONObject jsonObject = new JSONObject();
+
+        jsonObject.put("balance",1);
+        jsonObject.put("benefitId", benefitId);
+        jsonObject.put("memberCardId", memberCardId);
+        jsonObject.put("memo", "自动化手动扣次");
+        jsonObject.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
+        jsonObject.put("brandId", xmAppApi.getLoginInfo().getBrandId());
+        jsonObject.put("studioId", xmAppApi.getLoginInfo().getStudioId());
+
+        dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
+        JSONObject response=dataApi.getBodyInJSON();
+        return response;
+    }
+
+    /**
+     * @param
+     * @description:会员卡消耗记录
+     * @author: yangjian
+     **/
+    public JSONObject fetchPageOfConsumeRecord( String benefitId ,String memberCardId ,DataUserInfo...dataUserInfos) {
+
+        dataApi.setApiModule(ApiModule.Polar_Card)
+                .setApiName("API_fetchPageOfConsumeRecord")
+                .setTerminal(Terminal.B);
+        super.beforeDataRequest(dataUserInfos);
+
+        JSONObject jsonObject = new JSONObject();
+
+        jsonObject.put("current",0);
+        jsonObject.put("size",20);
+        jsonObject.put("benefitId",benefitId);
+        jsonObject.put("memberCardId",memberCardId);
+        jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId());
+        jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId());
+        jsonObject.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
+
+        dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
+        JSONObject response=dataApi.getBodyInJSON();
+        return response;
+    }
+
+    /**
+     * @param
+     * @description:修改会员卡有效期
+     * @author: yangjian
+     **/
+    public JSONObject modifyExpireDate( String benefitId ,String memberCardId ,DataUserInfo...dataUserInfos) {
+
+        dataApi.setApiModule(ApiModule.Polar_Card)
+                .setApiName("API_modifyExpireDate")
+                .setTerminal(Terminal.B);
+        super.beforeDataRequest(dataUserInfos);
+
+        JSONObject jsonObject = new JSONObject();
+
+        jsonObject.put("confirm",false);
+        jsonObject.put("expireDate", TimeUtils.getTodayTime());
+        jsonObject.put("memo","自动化修改会员卡有效期");
+        jsonObject.put("benefitId",benefitId);
+        jsonObject.put("memberCardId",memberCardId);
+        jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId());
+        jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId());
+        jsonObject.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
+
+        dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
+        JSONObject response=dataApi.getBodyInJSON();
+        return response;
+    }
+
+    /**
+     * @param
+     * @description:会员卡停卡
+     * @author: yangjian
+     **/
+    public JSONObject membercard_suspend( String benefitId ,String memberCardId ,DataUserInfo...dataUserInfos) {
+
+        dataApi.setApiModule(ApiModule.Polar_Card)
+                .setApiName("API_membercard_suspend")
+                .setTerminal(Terminal.B);
+        super.beforeDataRequest(dataUserInfos);
+
+        JSONObject jsonObject = new JSONObject();
+
+
+        jsonObject.put("planRestoreDate", TimeUtils.getAfterDayDate(1));//停卡到第二天
+        jsonObject.put("memo","自动化停卡");
+        jsonObject.put("benefitId",benefitId);
+        jsonObject.put("memberCardId",memberCardId);
+        jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId());
+        jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId());
+        jsonObject.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
+
+        dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
+        JSONObject response=dataApi.getBodyInJSON();
+        return response;
+    }
+
+
+
+
 
 
     }

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

+package com.xiaomai.cases.polar.memberCard;
+
+import com.alibaba.fastjson.JSONObject;
+import com.xiaomai.enums.ApiModule;
+import com.xiaomai.enums.LoginAccount;
+import com.xiaomai.enums.RequestType;
+import com.xiaomai.enums.Terminal;
+import com.xiaomai.utils.XMBaseTest;
+import com.xiaomai.utils.XMJSONPath;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+public class TestCancelSuspend extends XMBaseTest {
+    @BeforeMethod
+    public void beforeTest(){
+        xmAppApi.setApiModule(ApiModule.Polar_Card)
+                .setApiName("API_cancelSuspend")
+                .setLoginUser(LoginAccount.GYM_PROD)
+                .setTerminal(Terminal.B);
+
+        dal.setCase_owner("yj")
+                .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
+        super.beforeTest();
+    }
+    @Test(description = "会员卡取消停用")
+    public void testcancelSuspend() {
+        CardTools Cardtools = new CardTools();
+        Cardtools.membercardsearch();
+        String benefitId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].balanceBenefitList[0].id");
+        String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");//拿售卖记录第一张会员卡的ID;
+
+        Cardtools.modifyExpireDate(benefitId,memberCardId);//修改有效期
+        Cardtools.membercard_suspend(benefitId,memberCardId);//会员卡停卡
+
+
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("memo","自动化取消停卡");
+        jsonObject.put("memberCardId",memberCardId);
+        jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId());
+        jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId());
+        jsonObject.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
+
+
+
+        xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers).assetsSuccess(true);
+
+    }
+}

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

+package com.xiaomai.cases.polar.memberCard;
+
+import com.alibaba.fastjson.JSONObject;
+import com.xiaomai.enums.ApiModule;
+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.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+public class TestDiscardManualDeduct extends XMBaseTest {
+    @BeforeMethod
+    public void beforeTest(){
+        xmAppApi.setApiModule(ApiModule.Polar_Card)
+                .setApiName("API_discardManualDeduct")
+                .setLoginUser(LoginAccount.GYM_PROD)
+                .setTerminal(Terminal.B);
+
+        dal.setCase_owner("yj")
+                .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
+        super.beforeTest();
+    }
+    @Test(description = "撤销手动扣次")
+    public void testDiscardManualDeduct() {
+        CardTools Cardtools = new CardTools();
+        Cardtools.membercardsearch();
+        String benefitId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].balanceBenefitList[0].id");
+        String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");//拿售卖记录第一张会员卡的ID;
+
+
+
+        Cardtools.manualDeduct(benefitId,memberCardId);//手动扣次
+
+        Cardtools.fetchPageOfConsumeRecord(benefitId,memberCardId);
+        String consumeRecordId=XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");//
+
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("consumeRecordId",consumeRecordId);
+        jsonObject.put("memberCardId",memberCardId);
+        jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId());
+        jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId());
+        jsonObject.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
+
+
+
+        xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers).assetsSuccess(true);
+
+    }
+}

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

@@ -28,12 +28,12 @@ public class TestFetchPageOfConsumeRecord extends XMBaseTest {
         CardTools Cardtools = new CardTools();
         Cardtools.membercardsearch();
         String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");//拿售卖记录第一张会员卡的ID
-        String benefitId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].balanceBenefitList.id");
+        String benefitId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].balanceBenefitList[0].id");
 
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("current",0);
         jsonObject.put("size",20);
-        jsonObject.put("benefitId",benefitId);//5969 有点问题 是列表形式
+        jsonObject.put("benefitId",benefitId);
         jsonObject.put("memberCardId",memberCardId);
         jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId());
         jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId());

src/main/java/com/xiaomai/client/ApiTest.java

@@ -160,7 +160,7 @@ public class ApiTest extends AbstractTestNGSpringContextTests {
         }
 
 
-        executionApi.getHeadrs().put("xm_request_source", "TestGetAdmin");
+        executionApi.getHeadrs().put("xm-request-source", "xmTest");
         executionApi.getHeadrs().put("User-Agent", "XMSport/1.0 (com.jiejing.sport; build:1; iOS 15.8.1) Alamofire/5.8.0");
         executionApi.getHeadrs().put("Accept", "*/*");
         executionApi.getHeadrs().put("Connection", "Keep-Alive");

src/main/java/com/xiaomai/client/BaseTest.java

@@ -182,8 +182,7 @@ public class BaseTest extends AbstractTestNGSpringContextTests {
             executionHeaders.put("user", loginInfo.getUser());
             executionHeaders.put("token", loginInfo.getToken());
         }
-
-        executionHeaders.put("xm_request_source", "TestGetAdmin");
+        executionHeaders.put("xm-request-source", "xmTest");
         executionHeaders.put("User-Agent", "XMSport/1.0 (com.jiejing.sport; build:1; iOS 15.8.1) Alamofire/5.8.0");
         executionHeaders.put("Accept", "*/*");
         executionHeaders.put("Connection", "Keep-Alive");

src/main/java/com/xiaomai/utils/CommonLogin.java

@@ -56,6 +56,7 @@ public class CommonLogin {
             if (Terminal.B.equals(loginTerminal)) {
                 // 设置请求头
                 headers.put("Content-type", "application/json;charset=utf-8");
+                headers.put("xm-request-source", "xmTest");
                 headers.put("User-Agent", "XMSport/1.0 (com.jiejing.sport; build:1; iOS 15.8.1) Alamofire/5.8.0");
                 String tenant = userInfo.getTenant();
                 String adminId = userInfo.getAdminId();
@@ -95,6 +96,7 @@ public class CommonLogin {
                 String studioId = userInfo.getStudioId();
                 String token = userInfo.getXm_token();
                 String user = userInfo.getUser();
+                headers.put("xm-request-source", "xmTest");
 
                 CommonRequestParameters loginIofo = new CommonRequestParameters()
                         .setUser(user)