Commit 07358f94 by xyy

更新case

parent c2a94ace
...@@ -172,7 +172,7 @@ public class TestPurchaseCard extends BaseTestImpl { ...@@ -172,7 +172,7 @@ public class TestPurchaseCard extends BaseTestImpl {
String fetchUserCardListId=fetchUserCardListResult.getJSONArray("result").getJSONObject(0).getString("id");//权益ID String fetchUserCardListId=fetchUserCardListResult.getJSONArray("result").getJSONObject(0).getString("id");//权益ID
//获取售卖详情 //获取售卖详情
JSONObject findDetailByIdResult=cardTools.membercardfindDetailById(fetchUserCardListId); JSONObject findDetailByIdResult=cardTools.memberCardFindDetailById(fetchUserCardListId);
String findDetailByIdState=findDetailByIdResult.getJSONObject("result").getString("state");//卡状态 String findDetailByIdState=findDetailByIdResult.getJSONObject("result").getString("state");//卡状态
String findDetailByIdTradeOrderNumber=findDetailByIdResult.getJSONObject("result").getString("tradeOrderNumber");//订单号 String findDetailByIdTradeOrderNumber=findDetailByIdResult.getJSONObject("result").getString("tradeOrderNumber");//订单号
Assert.assertEquals(findDetailByIdTradeOrderNumber.equals(getDetailBBusinessNo),true,"创建C端已完成订单,未生成卡包");//断言的别意:生成的卡包的订单号和上述创建订单的订单号一致不一致的校验 Assert.assertEquals(findDetailByIdTradeOrderNumber.equals(getDetailBBusinessNo),true,"创建C端已完成订单,未生成卡包");//断言的别意:生成的卡包的订单号和上述创建订单的订单号一致不一致的校验
......
...@@ -23,7 +23,7 @@ public class TestBrandMerchantList extends XMBaseTest { ...@@ -23,7 +23,7 @@ public class TestBrandMerchantList extends XMBaseTest {
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Merchant) xmAppApi.setApiModule(ApiModule.Polar_Merchant)
.setApiName("API_brandMerchant_list") .setApiName("API_brandMerchant_list")
.setLoginUser(LoginAccount.XYY_PROD) .setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
dal.setCase_owner("xyy") dal.setCase_owner("xyy")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
......
...@@ -17,7 +17,7 @@ public class TestCheckUnbind extends XMBaseTest { ...@@ -17,7 +17,7 @@ public class TestCheckUnbind extends XMBaseTest {
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Merchant) xmAppApi.setApiModule(ApiModule.Polar_Merchant)
.setApiName("API_checkUnbind") .setApiName("API_checkUnbind")
.setLoginUser(LoginAccount.XYY_PROD) .setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
dal.setCase_owner("xyy") dal.setCase_owner("xyy")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
......
...@@ -28,7 +28,7 @@ public class TestGetApply extends XMBaseTest { ...@@ -28,7 +28,7 @@ public class TestGetApply extends XMBaseTest {
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Merchant) xmAppApi.setApiModule(ApiModule.Polar_Merchant)
.setApiName("API_getApply") .setApiName("API_getApply")
.setLoginUser(LoginAccount.XYY_PROD) .setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
dal.setCase_owner("xyy") dal.setCase_owner("xyy")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
......
...@@ -23,7 +23,7 @@ public class TestGetLatestApply extends XMBaseTest { ...@@ -23,7 +23,7 @@ public class TestGetLatestApply extends XMBaseTest {
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Merchant) xmAppApi.setApiModule(ApiModule.Polar_Merchant)
.setApiName("API_getLatestApply") .setApiName("API_getLatestApply")
.setLoginUser(LoginAccount.XYY_PROD) .setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
dal.setCase_owner("xyy") dal.setCase_owner("xyy")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
......
...@@ -17,7 +17,7 @@ public class TestGetLatestSuccessApply extends XMBaseTest { ...@@ -17,7 +17,7 @@ public class TestGetLatestSuccessApply extends XMBaseTest {
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Merchant) xmAppApi.setApiModule(ApiModule.Polar_Merchant)
.setApiName("API_getLatestSuccessApply") .setApiName("API_getLatestSuccessApply")
.setLoginUser(LoginAccount.XYY_PROD) .setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
dal.setCase_owner("xyy") dal.setCase_owner("xyy")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
......
...@@ -23,7 +23,7 @@ public class TestGetMerchant extends XMBaseTest { ...@@ -23,7 +23,7 @@ public class TestGetMerchant extends XMBaseTest {
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Merchant) xmAppApi.setApiModule(ApiModule.Polar_Merchant)
.setApiName("API_getMerchant") .setApiName("API_getMerchant")
.setLoginUser(LoginAccount.XYY_PROD) .setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
dal.setCase_owner("xyy") dal.setCase_owner("xyy")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
......
...@@ -17,7 +17,7 @@ public class TestGetStudioJoinBrandInfo extends XMBaseTest { ...@@ -17,7 +17,7 @@ public class TestGetStudioJoinBrandInfo extends XMBaseTest {
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Merchant) xmAppApi.setApiModule(ApiModule.Polar_Merchant)
.setApiName("API_getStudioJoinBrandInfo") .setApiName("API_getStudioJoinBrandInfo")
.setLoginUser(LoginAccount.XYY_PROD) .setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
dal.setCase_owner("xyy") dal.setCase_owner("xyy")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
......
...@@ -24,7 +24,7 @@ public class TestPageApply extends XMBaseTest { ...@@ -24,7 +24,7 @@ public class TestPageApply extends XMBaseTest {
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Merchant) xmAppApi.setApiModule(ApiModule.Polar_Merchant)
.setApiName("API_pageApply") .setApiName("API_pageApply")
.setLoginUser(LoginAccount.XYY_PROD) .setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
dal.setCase_owner("xyy") dal.setCase_owner("xyy")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
......
...@@ -9,6 +9,7 @@ import com.xiaomai.enums.RequestType; ...@@ -9,6 +9,7 @@ import com.xiaomai.enums.RequestType;
import com.xiaomai.enums.Terminal; import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.RandomStringUtil; import com.xiaomai.utils.RandomStringUtil;
import com.xiaomai.utils.TimeUtils; import com.xiaomai.utils.TimeUtils;
import org.springframework.stereotype.Component;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -19,6 +20,7 @@ import java.util.Random; ...@@ -19,6 +20,7 @@ import java.util.Random;
* @Description * @Description
* @Date 2024/3/14 16:03 * @Date 2024/3/14 16:03
*/ */
@Component("memberTools")
public class MemberTools extends BaseTestImpl { public class MemberTools extends BaseTestImpl {
//创建潜在会员 //创建潜在会员
......
...@@ -24,7 +24,7 @@ public class TestBatchModifyStudioConfig extends XMBaseTest { ...@@ -24,7 +24,7 @@ public class TestBatchModifyStudioConfig extends XMBaseTest {
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Config) xmAppApi.setApiModule(ApiModule.Polar_Config)
.setApiName("API_batchModifyStudioConfig") .setApiName("API_batchModifyStudioConfig")
.setLoginUser(LoginAccount.XYY_PROD) .setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
dal.setCase_owner("xyy") dal.setCase_owner("xyy")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
......
...@@ -23,7 +23,7 @@ public class TestCurrentUser extends XMBaseTest { ...@@ -23,7 +23,7 @@ public class TestCurrentUser extends XMBaseTest {
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Config) xmAppApi.setApiModule(ApiModule.Polar_Config)
.setApiName("API_currentUser") .setApiName("API_currentUser")
.setLoginUser(LoginAccount.XYY_PROD) .setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
dal.setCase_owner("xyy") dal.setCase_owner("xyy")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
......
...@@ -24,7 +24,7 @@ public class TestGetFailTenantSmsRecordDetail extends XMBaseTest { ...@@ -24,7 +24,7 @@ public class TestGetFailTenantSmsRecordDetail extends XMBaseTest {
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Config) xmAppApi.setApiModule(ApiModule.Polar_Config)
.setApiName("API_getFailTenantSmsRecordDetail") .setApiName("API_getFailTenantSmsRecordDetail")
.setLoginUser(LoginAccount.XYY_PROD) .setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
dal.setCase_owner("xyy") dal.setCase_owner("xyy")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
......
...@@ -24,7 +24,7 @@ public class TestGetSmsRechargeOrderStatus extends XMBaseTest { ...@@ -24,7 +24,7 @@ public class TestGetSmsRechargeOrderStatus extends XMBaseTest {
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Config) xmAppApi.setApiModule(ApiModule.Polar_Config)
.setApiName("API_getSmsRechargeOrderStatus") .setApiName("API_getSmsRechargeOrderStatus")
.setLoginUser(LoginAccount.XYY_PROD) .setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
dal.setCase_owner("xyy") dal.setCase_owner("xyy")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
......
...@@ -25,7 +25,7 @@ public class TestGetSmsRechargePage extends XMBaseTest { ...@@ -25,7 +25,7 @@ public class TestGetSmsRechargePage extends XMBaseTest {
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Config) xmAppApi.setApiModule(ApiModule.Polar_Config)
.setApiName("API_getSmsRechargePage") .setApiName("API_getSmsRechargePage")
.setLoginUser(LoginAccount.XYY_PROD) .setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
dal.setCase_owner("xyy") dal.setCase_owner("xyy")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
......
...@@ -24,7 +24,7 @@ public class TestGetSmsType extends XMBaseTest { ...@@ -24,7 +24,7 @@ public class TestGetSmsType extends XMBaseTest {
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Config) xmAppApi.setApiModule(ApiModule.Polar_Config)
.setApiName("API_getSmsType") .setApiName("API_getSmsType")
.setLoginUser(LoginAccount.XYY_PROD) .setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
dal.setCase_owner("xyy") dal.setCase_owner("xyy")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
......
...@@ -24,7 +24,7 @@ public class TestGetStudioMessageConfigs extends XMBaseTest { ...@@ -24,7 +24,7 @@ public class TestGetStudioMessageConfigs extends XMBaseTest {
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Config) xmAppApi.setApiModule(ApiModule.Polar_Config)
.setApiName("API_getStudioMessageConfigs") .setApiName("API_getStudioMessageConfigs")
.setLoginUser(LoginAccount.XYY_PROD) .setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
dal.setCase_owner("xyy") dal.setCase_owner("xyy")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
......
...@@ -24,7 +24,7 @@ public class TestGetStudioSmsInfo extends XMBaseTest { ...@@ -24,7 +24,7 @@ public class TestGetStudioSmsInfo extends XMBaseTest {
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Config) xmAppApi.setApiModule(ApiModule.Polar_Config)
.setApiName("API_getStudioSmsInfo") .setApiName("API_getStudioSmsInfo")
.setLoginUser(LoginAccount.XYY_PROD) .setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
dal.setCase_owner("xyy") dal.setCase_owner("xyy")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
......
...@@ -23,7 +23,7 @@ public class TestGetSuitList extends XMBaseTest { ...@@ -23,7 +23,7 @@ public class TestGetSuitList extends XMBaseTest {
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Config) xmAppApi.setApiModule(ApiModule.Polar_Config)
.setApiName("API_getSuitList") .setApiName("API_getSuitList")
.setLoginUser(LoginAccount.XYY_PROD) .setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
dal.setCase_owner("xyy") dal.setCase_owner("xyy")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
......
...@@ -24,7 +24,7 @@ public class TestGetTenantSmsRecordDetail extends XMBaseTest { ...@@ -24,7 +24,7 @@ public class TestGetTenantSmsRecordDetail extends XMBaseTest {
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Config) xmAppApi.setApiModule(ApiModule.Polar_Config)
.setApiName("API_getTenantSmsRecordDetail") .setApiName("API_getTenantSmsRecordDetail")
.setLoginUser(LoginAccount.XYY_PROD) .setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
dal.setCase_owner("xyy") dal.setCase_owner("xyy")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
......
...@@ -23,7 +23,7 @@ public class TestGetTenantSmsRecordPage extends XMBaseTest { ...@@ -23,7 +23,7 @@ public class TestGetTenantSmsRecordPage extends XMBaseTest {
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Config) xmAppApi.setApiModule(ApiModule.Polar_Config)
.setApiName("API_getTenantSmsRecordPage") .setApiName("API_getTenantSmsRecordPage")
.setLoginUser(LoginAccount.XYY_PROD) .setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
dal.setCase_owner("xyy") dal.setCase_owner("xyy")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
......
...@@ -23,7 +23,7 @@ public class TestSmsRecharge extends XMBaseTest { ...@@ -23,7 +23,7 @@ public class TestSmsRecharge extends XMBaseTest {
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Config) xmAppApi.setApiModule(ApiModule.Polar_Config)
.setApiName("API_smsRecharge") .setApiName("API_smsRecharge")
.setLoginUser(LoginAccount.XYY_PROD) .setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
dal.setCase_owner("xyy") dal.setCase_owner("xyy")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
......
package com.xiaomai.cases.polar.depositCard;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.client.DataUserInfo;
import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.RequestType;
import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.XMBaseTest;
import com.xiaomai.utils.XMJSONPath;
import org.springframework.stereotype.Component;
@Component("depositTools")
public class DepositTools extends XMBaseTest {
/**
* 创建储值卡
* @param title
* @param dataUserInfos
* @return
*/
public String depositCardCreate(String title,String balance, String price, DataUserInfo... dataUserInfos) {
dataApi.setApiModule(ApiModule.Polar_Card)
.setApiName("API_tenantMemberCard_create")
.setTerminal(Terminal.B);
super.beforeDataRequest(dataUserInfos);
JSONArray benefitList = new JSONArray();
JSONObject benefitObject = new JSONObject();
benefitObject.put("identifier", dataApi.getLoginInfo().getUser());
benefitObject.put("balance", balance);//赠送金额
benefitObject.put("benefitType", "STORED_VALUE");
benefitObject.put("price", price);//充值金额
benefitObject.put("targetType", "PAYMENT");
benefitObject.put("targetScope", "PAYMENT_SPECIFIC_SCENARIO");
benefitObject.put("paymentScenarioList", new JSONArray().add("ALL"));
benefitObject.put("accountType", "DEPOSIT");
benefitList.add(benefitObject);
JSONObject object = new JSONObject();
object.put("surfaceUrl", "https://image.xiaomaiketang.com/xm/internal/BHabA5WaNF.png");//储值卡封面图片
object.put("surfaceCornerMark", "自动化标签");
object.put("title", title);//储值卡名称 不能重复要加东西 "储值卡"+RandomStringUtil.randomString(3)
object.put("validPeriod", "10");//有效期10天
object.put("sharePeopleLimit", "10");//共享10人
object.put("price", price);//充值金额
object.put("purchaseNumberLimit", "-1");//购买数量不限制
object.put("xcxSaleStatus", "YES");//小程序是否售卖
object.put("creatorId", dataApi.getLoginInfo().getAdminId());
object.put("shelfState", "YES");//卡启用状态
object.put("brandId", dataApi.getLoginInfo().getBrandId());
object.put("studioId", dataApi.getLoginInfo().getStudioId());
object.put("description", "{\"items\":[{\"content\":\"自动化创建的卡\",\"aspect\":\"\",\"type\":\"TEXT\"}]}");
object.put("operatorId", dataApi.getLoginInfo().getAdminId());
object.put("commodityCardType", "DEPOSIT_CARD");
object.put("activatePatternList", new JSONArray().add("PURCHASE"));
dataApi.doRequest(RequestType.JSON, dataparams, object.toJSONString(), dataheadrs).assetsSuccess(true);
return XMJSONPath.readPath(dataApi.getApi_response(), "$.result");
}
/**
* 售卖记录全局搜索:根据会员名称/手机号搜索,获取会员名下购卡相关记录
*
* @param memberId
*/
public JSONObject getUserDepositCardList(String memberId,DataUserInfo... dataUserInfos) {
dataApi.setApiModule(ApiModule.Polar_Card)
.setApiName("API_fetchUserCardList")
.setTerminal(Terminal.B);
super.beforeDataRequest(dataUserInfos);
JSONObject object = new JSONObject();
JSONArray memberCardStateList = new JSONArray();
memberCardStateList.add("NORMAL");
memberCardStateList.add("SUSPEND");
object.put("studioId", dataApi.getLoginInfo().getStudioId());
object.put("accountType", "DEPOSIT");
object.put("memberId", memberId);
object.put("memberCardStateList", memberCardStateList);
object.put("brandId", dataApi.getLoginInfo().getBrandId());
object.put("operatorId", dataApi.getLoginInfo().getAdminId());
dataApi.doRequest(RequestType.JSON, dataparams, object.toJSONString(), dataheadrs).assetsSuccess(true);
return dataApi.getBodyInJSON();
}
/**
* 查看储值卡售卖记录
*/
public JSONObject searchMemberCard(DataUserInfo... dataUserInfos) {
dataApi.setApiModule(ApiModule.Polar_Training)
.setApiName("API_searchTrainingAccountRecordsList")
.setTerminal(Terminal.B);
super.beforeDataRequest(dataUserInfos);
JSONObject object = new JSONObject();
object.put("current", 0);
object.put("size", 20);
object.put("accountType","DEPOSIT");
object.put("studioId", dataApi.getLoginInfo().getStudioId());
object.put("brandId", dataApi.getLoginInfo().getBrandId());
object.put("operatorId", dataApi.getLoginInfo().getAdminId());
dataApi.doRequest(RequestType.JSON, dataparams, object.toJSONString(), dataheadrs).assetsSuccess(true);
return dataApi.getBodyInJSON();
}
public JSONObject commonSearchMemberCard(String title, String commodityCardType,DataUserInfo... dataUserInfos) {
dataApi.setApiModule(ApiModule.Polar_Training)
.setApiName("API_tenantMemberCard_commonSearch")
.setTerminal(Terminal.B);
super.beforeDataRequest(dataUserInfos);
JSONObject object = new JSONObject();
object.put("brandId", dataApi.getLoginInfo().getBrandId());
object.put("studioId", dataApi.getLoginInfo().getStudioId());
object.put("commodityCardType",commodityCardType);
object.put("title",title);
object.put("operatorId", dataApi.getLoginInfo().getAdminId());
dataApi.doRequest(RequestType.JSON, dataparams, object.toJSONString(), dataheadrs).assetsSuccess(true);
return dataApi.getBodyInJSON();
}
}
...@@ -220,7 +220,7 @@ public class TestRefundOrder extends XMBaseTest { ...@@ -220,7 +220,7 @@ public class TestRefundOrder extends XMBaseTest {
String fetchUserCardListId=fetchUserCardListResult.getJSONArray("result").getJSONObject(0).getString("id");//权益ID String fetchUserCardListId=fetchUserCardListResult.getJSONArray("result").getJSONObject(0).getString("id");//权益ID
//获取售卖详情 //获取售卖详情
JSONObject findDetailByIdResult=cardTools.membercardfindDetailById(fetchUserCardListId); JSONObject findDetailByIdResult=cardTools.memberCardFindDetailById(fetchUserCardListId);
String findDetailByIdState=findDetailByIdResult.getJSONObject("result").getString("state");//卡状态 String findDetailByIdState=findDetailByIdResult.getJSONObject("result").getString("state");//卡状态
String findDetailByIdTradeOrderNumber=findDetailByIdResult.getJSONObject("result").getString("tradeOrderNumber");//所关联的签单订单号 String findDetailByIdTradeOrderNumber=findDetailByIdResult.getJSONObject("result").getString("tradeOrderNumber");//所关联的签单订单号
Assert.assertEquals(findDetailByIdTradeOrderNumber.equals(signBusinessNo),true,"创建已完成退单订单,未生成已退卡卡包");//断言的别意:生成的卡包所关联的签单订单号和上述创建签单订单的订单号一致不一致的校验 Assert.assertEquals(findDetailByIdTradeOrderNumber.equals(signBusinessNo),true,"创建已完成退单订单,未生成已退卡卡包");//断言的别意:生成的卡包所关联的签单订单号和上述创建签单订单的订单号一致不一致的校验
......
...@@ -186,7 +186,7 @@ public class TestSignOrder extends XMBaseTest { ...@@ -186,7 +186,7 @@ public class TestSignOrder extends XMBaseTest {
String fetchUserCardListId=fetchUserCardListResult.getJSONArray("result").getJSONObject(0).getString("id");//权益ID String fetchUserCardListId=fetchUserCardListResult.getJSONArray("result").getJSONObject(0).getString("id");//权益ID
//获取售卖详情 //获取售卖详情
JSONObject findDetailByIdResult=cardTools.membercardfindDetailById(fetchUserCardListId); JSONObject findDetailByIdResult=cardTools.memberCardFindDetailById(fetchUserCardListId);
String findDetailByIdState=findDetailByIdResult.getJSONObject("result").getString("state");//卡状态 String findDetailByIdState=findDetailByIdResult.getJSONObject("result").getString("state");//卡状态
String findDetailByIdTradeOrderNumber=findDetailByIdResult.getJSONObject("result").getString("tradeOrderNumber");//订单号 String findDetailByIdTradeOrderNumber=findDetailByIdResult.getJSONObject("result").getString("tradeOrderNumber");//订单号
Assert.assertEquals(findDetailByIdTradeOrderNumber.equals(businessNo),true,"创建已完成订单,未生成卡包");//断言的别意:生成的卡包的订单号和上述创建订单的订单号一致不一致的校验 Assert.assertEquals(findDetailByIdTradeOrderNumber.equals(businessNo),true,"创建已完成订单,未生成卡包");//断言的别意:生成的卡包的订单号和上述创建订单的订单号一致不一致的校验
......
...@@ -72,10 +72,8 @@ public class CardTools extends XMBaseTest { ...@@ -72,10 +72,8 @@ public class CardTools extends XMBaseTest {
jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId()); jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId());
jsonObject.put("commodityCardType","MEMBER_CARD"); jsonObject.put("commodityCardType","MEMBER_CARD");
dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true); dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
JSONObject response = dataApi.getBodyInJSON(); return dataApi.getBodyInJSON();
return response;
} }
/** /**
...@@ -150,9 +148,9 @@ public class CardTools extends XMBaseTest { ...@@ -150,9 +148,9 @@ public class CardTools extends XMBaseTest {
jsonObject.put("studioId", dataApi.getLoginInfo().getStudioId()); jsonObject.put("studioId", dataApi.getLoginInfo().getStudioId());
jsonObject.put("brandId", dataApi.getLoginInfo().getBrandId()); jsonObject.put("brandId", dataApi.getLoginInfo().getBrandId());
jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId()); jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId());
dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true); dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
JSONObject response = dataApi.getBodyInJSON(); return dataApi.getBodyInJSON();
return response;
} }
/** /**
...@@ -191,7 +189,6 @@ public class CardTools extends XMBaseTest { ...@@ -191,7 +189,6 @@ public class CardTools extends XMBaseTest {
* @author: yangjian * @author: yangjian
**/ **/
public JSONObject doMemberCardcommonSearch(String title, String commodityCardType,DataUserInfo... dataUserInfos) { public JSONObject doMemberCardcommonSearch(String title, String commodityCardType,DataUserInfo... dataUserInfos) {
dataApi.setApiModule(ApiModule.Polar_Card) dataApi.setApiModule(ApiModule.Polar_Card)
.setApiName("API_commonSearch") .setApiName("API_commonSearch")
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
...@@ -203,18 +200,16 @@ public class CardTools extends XMBaseTest { ...@@ -203,18 +200,16 @@ public class CardTools extends XMBaseTest {
jsonObject.put("title", title);//搜索的卡名 jsonObject.put("title", title);//搜索的卡名
jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId()); jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId());
jsonObject.put("commodityCardType",commodityCardType); jsonObject.put("commodityCardType",commodityCardType);
dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true); dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
JSONObject response = dataApi.getBodyInJSON(); return dataApi.getBodyInJSON();
return response;
} }
/** /**
* @param * @param
* @description:会员卡售卖记录 * @description:会员卡售卖记录
* @author: yangjian * @author: yangjian
**/ **/
public JSONObject membercardsearch(String memberCardState,DataUserInfo... dataUserInfos) { public JSONObject memberCardSearch(String memberCardState,DataUserInfo... dataUserInfos) {
dataApi.setApiModule(ApiModule.Polar_Card) dataApi.setApiModule(ApiModule.Polar_Card)
.setApiName("API_membercard_search") .setApiName("API_membercard_search")
...@@ -234,8 +229,32 @@ public class CardTools extends XMBaseTest { ...@@ -234,8 +229,32 @@ public class CardTools extends XMBaseTest {
jsonObject.put("memberCardStateList",memberCardStateList); jsonObject.put("memberCardStateList",memberCardStateList);
dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true); dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
JSONObject response = dataApi.getBodyInJSON(); return dataApi.getBodyInJSON();
return response; }
/**
* @param
* @description:会员卡/体验卡/储值卡售卖记录
* @author: xyy
**/
public void memberCardSearch(String accountType,String memberCardState,DataUserInfo... dataUserInfos) {
dataApi.setApiModule(ApiModule.Polar_Card)
.setApiName("API_membercard_search")
.setTerminal(Terminal.B);
super.beforeDataRequest(dataUserInfos);
List memberCardStateList = new ArrayList();
memberCardStateList.add(memberCardState);//卡状态
JSONObject jsonObject = new JSONObject();
jsonObject.put("current", 0);
jsonObject.put("size", 20);
jsonObject.put("accountType", accountType);//卡类型
jsonObject.put("studioId", dataApi.getLoginInfo().getStudioId());
jsonObject.put("brandId", dataApi.getLoginInfo().getBrandId());
jsonObject.put("memberCardStateList",memberCardStateList);
jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId());
dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
} }
/** /**
...@@ -245,7 +264,6 @@ public class CardTools extends XMBaseTest { ...@@ -245,7 +264,6 @@ public class CardTools extends XMBaseTest {
**/ **/
public JSONObject commonSearch(String content, DataUserInfo... dataUserInfos) { public JSONObject commonSearch(String content, DataUserInfo... dataUserInfos) {
dataApi.setApiModule(ApiModule.Polar_Card) dataApi.setApiModule(ApiModule.Polar_Card)
.setApiName("API_commonSearch") .setApiName("API_commonSearch")
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
...@@ -259,8 +277,7 @@ public class CardTools extends XMBaseTest { ...@@ -259,8 +277,7 @@ public class CardTools extends XMBaseTest {
jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId()); jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId());
dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true); dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
JSONObject response = dataApi.getBodyInJSON(); return dataApi.getBodyInJSON();
return response;
} }
/** /**
...@@ -269,22 +286,19 @@ public class CardTools extends XMBaseTest { ...@@ -269,22 +286,19 @@ public class CardTools extends XMBaseTest {
* @author: yangjian * @author: yangjian
**/ **/
public JSONObject fetchDetailById(String id, DataUserInfo... dataUserInfos) { public JSONObject fetchDetailById(String id, DataUserInfo... dataUserInfos) {
dataApi.setApiModule(ApiModule.Polar_Card) dataApi.setApiModule(ApiModule.Polar_Card)
.setApiName("API_fetchDetailById") .setApiName("API_fetchDetailById")
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
super.beforeDataRequest(dataUserInfos); super.beforeDataRequest(dataUserInfos);
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("id", id); jsonObject.put("id", id);
jsonObject.put("studioId", dataApi.getLoginInfo().getStudioId()); jsonObject.put("studioId", dataApi.getLoginInfo().getStudioId());
jsonObject.put("brandId", dataApi.getLoginInfo().getBrandId()); jsonObject.put("brandId", dataApi.getLoginInfo().getBrandId());
jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId()); jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId());
dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true); dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
JSONObject response = dataApi.getBodyInJSON(); return dataApi.getBodyInJSON();
return response;
} }
/** /**
...@@ -292,7 +306,7 @@ public class CardTools extends XMBaseTest { ...@@ -292,7 +306,7 @@ public class CardTools extends XMBaseTest {
* @description:会员卡售卖记录详情 * @description:会员卡售卖记录详情
* @author: yangjian * @author: yangjian
**/ **/
public JSONObject membercardfindDetailById(String id, DataUserInfo... dataUserInfos) { public JSONObject memberCardFindDetailById(String id, DataUserInfo... dataUserInfos) {
dataApi.setApiModule(ApiModule.Polar_Card) dataApi.setApiModule(ApiModule.Polar_Card)
.setApiName("API_membercard_findDetailById") .setApiName("API_membercard_findDetailById")
...@@ -410,8 +424,7 @@ public class CardTools extends XMBaseTest { ...@@ -410,8 +424,7 @@ public class CardTools extends XMBaseTest {
* @description:修改会员卡有效期 * @description:修改会员卡有效期
* @author: yangjian * @author: yangjian
**/ **/
public JSONObject modifyExpireDate(String benefitId, String memberCardId, DataUserInfo... dataUserInfos) { public JSONObject modifyExpireDate(int num, String memberCardId, DataUserInfo... dataUserInfos) {
dataApi.setApiModule(ApiModule.Polar_Card) dataApi.setApiModule(ApiModule.Polar_Card)
.setApiName("API_modifyExpireDate") .setApiName("API_modifyExpireDate")
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
...@@ -420,17 +433,15 @@ public class CardTools extends XMBaseTest { ...@@ -420,17 +433,15 @@ public class CardTools extends XMBaseTest {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("confirm", false); jsonObject.put("confirm", false);
jsonObject.put("expireDate", TimeUtils.getAfterDayDate(1)); jsonObject.put("expireDate", TimeUtils.getAfterDayDate(num));
jsonObject.put("memo", "自动化修改会员卡有效期"); jsonObject.put("memo", "自动化修改卡有效期");
jsonObject.put("benefitId", benefitId);
jsonObject.put("memberCardId", memberCardId); jsonObject.put("memberCardId", memberCardId);
jsonObject.put("brandId", dataApi.getLoginInfo().getBrandId()); jsonObject.put("brandId", dataApi.getLoginInfo().getBrandId());
jsonObject.put("studioId", dataApi.getLoginInfo().getStudioId()); jsonObject.put("studioId", dataApi.getLoginInfo().getStudioId());
jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId()); jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId());
dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true); dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
JSONObject response = dataApi.getBodyInJSON(); return dataApi.getBodyInJSON();
return response;
} }
/** /**
...@@ -438,7 +449,7 @@ public class CardTools extends XMBaseTest { ...@@ -438,7 +449,7 @@ public class CardTools extends XMBaseTest {
* @description:会员卡停卡 * @description:会员卡停卡
* @author: yangjian * @author: yangjian
**/ **/
public JSONObject membercard_suspend(String benefitId, String memberCardId, DataUserInfo... dataUserInfos) { public JSONObject memberCardSuspend(String memberCardId, DataUserInfo... dataUserInfos) {
dataApi.setApiModule(ApiModule.Polar_Card) dataApi.setApiModule(ApiModule.Polar_Card)
.setApiName("API_membercard_suspend") .setApiName("API_membercard_suspend")
...@@ -446,19 +457,36 @@ public class CardTools extends XMBaseTest { ...@@ -446,19 +457,36 @@ public class CardTools extends XMBaseTest {
super.beforeDataRequest(dataUserInfos); super.beforeDataRequest(dataUserInfos);
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("planRestoreDate", TimeUtils.getAfterDayDate(1));//停卡到第二天 jsonObject.put("planRestoreDate", TimeUtils.getAfterDayDate(1));//停卡到第二天
jsonObject.put("memo", "自动化停卡"); jsonObject.put("memo", "自动化停卡");
jsonObject.put("benefitId", benefitId);
jsonObject.put("memberCardId", memberCardId); jsonObject.put("memberCardId", memberCardId);
jsonObject.put("brandId", dataApi.getLoginInfo().getBrandId()); jsonObject.put("brandId", dataApi.getLoginInfo().getBrandId());
jsonObject.put("studioId", dataApi.getLoginInfo().getStudioId()); jsonObject.put("studioId", dataApi.getLoginInfo().getStudioId());
jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId()); jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId());
dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true); dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
JSONObject response = dataApi.getBodyInJSON(); return dataApi.getBodyInJSON();
return response; }
/**
* @param
* @description:会员卡取消停卡
* @author: yangjian
**/
public void memberCardCancelSuspend(String memberCardId, DataUserInfo... dataUserInfos) {
dataApi.setApiModule(ApiModule.Polar_Card)
.setApiName("API_cancelSuspend")
.setTerminal(Terminal.B);
super.beforeDataRequest(dataUserInfos);
JSONObject jsonObject = new JSONObject();
jsonObject.put("memberCardId", memberCardId);
jsonObject.put("memo", "自动化取消停卡");
jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId());
jsonObject.put("brandId", dataApi.getLoginInfo().getBrandId());
jsonObject.put("studioId", dataApi.getLoginInfo().getStudioId());
dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
} }
/** /**
...@@ -499,16 +527,18 @@ public class CardTools extends XMBaseTest { ...@@ -499,16 +527,18 @@ public class CardTools extends XMBaseTest {
.setApiName("API_modifyShelfState") .setApiName("API_modifyShelfState")
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
super.beforeDataRequest(dataUserInfos); super.beforeDataRequest(dataUserInfos);
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("memberCardId", memberCardId); jsonObject.put("memberCardId", memberCardId);
jsonObject.put("shelfState", shelfState); jsonObject.put("shelfState", shelfState);
jsonObject.put("brandId", dataApi.getLoginInfo().getBrandId()); jsonObject.put("brandId", dataApi.getLoginInfo().getBrandId());
jsonObject.put("studioId", dataApi.getLoginInfo().getStudioId()); jsonObject.put("studioId", dataApi.getLoginInfo().getStudioId());
jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId()); jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId());
dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true); dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
} }
/** /**
* 修改会员卡的售卖状态 * 修改会员卡的小程序售卖状态
* *
* @param memberCardId 会员卡ID * @param memberCardId 会员卡ID
* @param xcxSaleState 启用:YES,停用:NO * @param xcxSaleState 启用:YES,停用:NO
...@@ -526,6 +556,7 @@ public class CardTools extends XMBaseTest { ...@@ -526,6 +556,7 @@ public class CardTools extends XMBaseTest {
jsonObject.put("brandId", dataApi.getLoginInfo().getBrandId()); jsonObject.put("brandId", dataApi.getLoginInfo().getBrandId());
jsonObject.put("studioId", dataApi.getLoginInfo().getStudioId()); jsonObject.put("studioId", dataApi.getLoginInfo().getStudioId());
jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId()); jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId());
dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true); dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
} }
...@@ -534,18 +565,19 @@ public class CardTools extends XMBaseTest { ...@@ -534,18 +565,19 @@ public class CardTools extends XMBaseTest {
* *
* @param memberId * @param memberId
*/ */
public void getUserMemberCardList(String memberId) { public void getUserMemberCardList(String memberId,String accountType, DataUserInfo... dataUserInfos) {
dataApi.setApiModule(ApiModule.Polar_Card) dataApi.setApiModule(ApiModule.Polar_Card)
.setApiName("API_fetchUserCardList") .setApiName("API_fetchUserCardList")
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
super.beforeDataRequest(); super.beforeDataRequest(dataUserInfos);
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("accountType", "MEMBER"); jsonObject.put("accountType",accountType);
jsonObject.put("memberId", memberId); jsonObject.put("memberId", memberId);
jsonObject.put("brandId", dataApi.getLoginInfo().getBrandId()); jsonObject.put("brandId", dataApi.getLoginInfo().getBrandId());
jsonObject.put("studioId", dataApi.getLoginInfo().getStudioId()); jsonObject.put("studioId", dataApi.getLoginInfo().getStudioId());
jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId()); jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId());
dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true); dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
} }
...@@ -566,9 +598,31 @@ public class CardTools extends XMBaseTest { ...@@ -566,9 +598,31 @@ public class CardTools extends XMBaseTest {
jsonObject.put("brandId", dataApi.getLoginInfo().getBrandId()); jsonObject.put("brandId", dataApi.getLoginInfo().getBrandId());
jsonObject.put("studioId", dataApi.getLoginInfo().getStudioId()); jsonObject.put("studioId", dataApi.getLoginInfo().getStudioId());
jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId()); jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId());
dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true); dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
} }
/**
* 查看会员卡售卖记录-变动记录
*/
public JSONObject fetchPageOfOperateRecord(String memberCardId){
dataApi.setApiModule(ApiModule.Polar_Card)
.setApiName("API_fetchPageOfOperateRecord")
.setTerminal(Terminal.B);
super.beforeDataRequest();
JSONObject jsonObject = new JSONObject();
jsonObject.put("memberCardId", memberCardId);
jsonObject.put("current", 0);
jsonObject.put("size", 100);
jsonObject.put("brandId", dataApi.getLoginInfo().getBrandId());
jsonObject.put("studioId", dataApi.getLoginInfo().getStudioId());
jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId());
dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
return dataApi.getBodyInJSON();
}
//查看卡的编辑记录 //查看卡的编辑记录
public JSONObject findHistoryDetailById(String id,DataUserInfo...userInfos){ public JSONObject findHistoryDetailById(String id,DataUserInfo...userInfos){
dataApi.setApiModule(ApiModule.Polar_Card) dataApi.setApiModule(ApiModule.Polar_Card)
...@@ -588,4 +642,25 @@ public class CardTools extends XMBaseTest { ...@@ -588,4 +642,25 @@ public class CardTools extends XMBaseTest {
return response; return response;
} }
/**
* 移除共享人
* @param memberCardId
* @param userInfos
*/
public void modifySharers(String memberCardId,DataUserInfo...userInfos){
dataApi.setApiModule(ApiModule.Polar_Card)
.setApiName("API_modifySharers")
.setTerminal(Terminal.B);
super.beforeDataRequest(userInfos);
JSONObject jsonObject = new JSONObject();
jsonObject.put("memberCardId",memberCardId);
jsonObject.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
jsonObject.put("sharerIds",new JSONArray());
jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId());
jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId());
dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
}
} }
...@@ -34,7 +34,7 @@ public class TestActivateMemberCard extends GetMemberCardBaseInfoForSign { ...@@ -34,7 +34,7 @@ public class TestActivateMemberCard extends GetMemberCardBaseInfoForSign {
@Test(description = "操作会员卡开卡") @Test(description = "操作会员卡开卡")
public void testActivateMemberCard() { public void testActivateMemberCard() {
cardTools.getUserMemberCardList(memberId); cardTools.getUserMemberCardList(memberId,"MEMBER");
String memberAccountCardId=""; String memberAccountCardId="";
String state; String state;
int count= XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(),"$.result").size(); int count= XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(),"$.result").size();
...@@ -51,7 +51,7 @@ public class TestActivateMemberCard extends GetMemberCardBaseInfoForSign { ...@@ -51,7 +51,7 @@ public class TestActivateMemberCard extends GetMemberCardBaseInfoForSign {
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers).assetsSuccess(true); xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers).assetsSuccess(true);
//查看售卖记录详情 //查看售卖记录详情
cardTools.membercardfindDetailById(memberAccountCardId); cardTools.memberCardFindDetailById(memberAccountCardId);
Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.state"),"NORMAL","开卡后卡状态没变更为生效状态"); Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.state"),"NORMAL","开卡后卡状态没变更为生效状态");
String benefitId=XMJSONPath.readPath(dataApi.getApi_response(),"$.result.courseBenefit.id"); String benefitId=XMJSONPath.readPath(dataApi.getApi_response(),"$.result.courseBenefit.id");
...@@ -73,7 +73,7 @@ public class TestActivateMemberCard extends GetMemberCardBaseInfoForSign { ...@@ -73,7 +73,7 @@ public class TestActivateMemberCard extends GetMemberCardBaseInfoForSign {
String refundOrderId=XMJSONPath.readPath(dataApi.getApi_response(),"$.result"); String refundOrderId=XMJSONPath.readPath(dataApi.getApi_response(),"$.result");
//退卡成功后check 售卖记录详情状态:已退卡 //退卡成功后check 售卖记录详情状态:已退卡
cardTools.membercardfindDetailById(memberAccountCardId); cardTools.memberCardFindDetailById(memberAccountCardId);
Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.state"),"REFUNDED","退卡后卡卡账户状态没变更为已退卡状态"); Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.state"),"REFUNDED","退卡后卡卡账户状态没变更为已退卡状态");
//退卡后check是否生成一条退卡的消耗记录 //退卡后check是否生成一条退卡的消耗记录
cardTools.fetchPageOfConsumeRecord(benefitId,memberAccountCardId); cardTools.fetchPageOfConsumeRecord(benefitId,memberAccountCardId);
......
...@@ -5,14 +5,21 @@ import com.xiaomai.enums.ApiModule; ...@@ -5,14 +5,21 @@ import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.LoginAccount; import com.xiaomai.enums.LoginAccount;
import com.xiaomai.enums.RequestType; import com.xiaomai.enums.RequestType;
import com.xiaomai.enums.Terminal; import com.xiaomai.enums.Terminal;
import com.xiaomai.utils.TimeUtils;
import com.xiaomai.utils.XMBaseTest; import com.xiaomai.utils.XMBaseTest;
import com.xiaomai.utils.XMJSONPath; import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import javax.annotation.Resource;
public class TestCancelSuspend extends XMBaseTest { public class TestCancelSuspend extends XMBaseTest {
@Resource(name = "cardTools")
CardTools cardTools;
public String memberCardId = "";
public String memberCardState;
@BeforeMethod @BeforeMethod
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Card) xmAppApi.setApiModule(ApiModule.Polar_Card)
...@@ -24,48 +31,48 @@ public class TestCancelSuspend extends XMBaseTest { ...@@ -24,48 +31,48 @@ public class TestCancelSuspend extends XMBaseTest {
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
super.beforeTest(); super.beforeTest();
} }
@Test(description = "会员卡售卖记录详情-取消停用") @DataProvider
public void testcancelSuspend() { public Object[][] dataProvider(){
CardTools Cardtools = new CardTools(); return new Object[][]{
Cardtools.membercardsearch("NORMAL"); {"MEMBER"},//会员卡
{"DEPOSIT"},//储值卡
String benefitId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].courseBenefit.id");//拿售卖记录第一张【生效中】售卖的会员卡的ID; {"EXPERIENCE"}//体验卡
String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");//拿售卖记录第一张【生效中】会员卡的ID; };
}
Cardtools.modifyExpireDate(benefitId,memberCardId);//修改有效期 @Test(description = "取消停用的已售卡",dataProvider = "dataProvider")
Cardtools.getMemberCardAccountOperateRecord(memberCardId);//查看售卖记录变动记录 public void testMemberCardCancelSuspend(String cardType) {
Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].operateType").equals("CHANGE_EFFECTIVE_DATE"),"操作修改有效期,变动记录第一条操作类型"); //查询生效中的卡列表
Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].remark").equals("自动化修改会员卡有效期"),"操作修改有效期,变动记录第一条的备注"); cardTools.memberCardSearch(cardType,"SUSPEND");
//先检查列表有没有数据,有数据才会执行下面的点代码(如果是个空机构,肯定不会被执行,想从存量数据中获取,需要自己先造个数据)
//Cardtools.membercardfindDetailById(memberCardId);//获取售卖记录详情 int listDatas = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.records").size();
//long expireDate = TimeUtils.getAfterDayDate(1); if (listDatas > 0) {
//System.out.println(expireDate); memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");
//Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].expireDate").equals(expireDate));//校验售卖记录,有效期是否修改正确 //取出第一个数据后,要check下会员卡的启用状态,想停用,要保证卡的状态目前就是启用状态
//Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].expireDate")..equals(expireDate),substring(0, 5);); memberCardState=XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].state");
//如果不是启用状态,则开启
Cardtools.membercard_suspend(benefitId,memberCardId);//会员卡操作停卡 if(memberCardState.equals("NORMAL")){
Cardtools.membercardfindDetailById(memberCardId);//获取售卖记录详情 cardTools.memberCardSuspend(memberCardId);
Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.state").equals("SUSPEND"),"校验停卡后,售卖记录详情-状态变更为已停用"); }
Cardtools.getMemberCardAccountOperateRecord(memberCardId);//查看售卖记录变动记录
Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].operateType").equals("SUSPEND_CARD"),"操作停卡,变动记录第一条操作类型");
Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].remark").equals("自动化停卡"),"操作停卡,变动记录第一条的备注");
JSONObject jsonObject = new JSONObject(); //获取该卡的变动记录条数
jsonObject.put("memo","自动化取消停卡"); int num = Integer.parseInt(XMJSONPath.readPath(cardTools.fetchPageOfOperateRecord(memberCardId),"$.result.total"));
jsonObject.put("memberCardId",memberCardId);
jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId());
jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId());
jsonObject.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
JSONObject jsonObject = new JSONObject();
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());
xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers).assetsSuccess(true);
xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers).assetsSuccess(true); //check 会员卡详情,查看状态是否是生效中状态
Cardtools.getMemberCardAccountOperateRecord(memberCardId);//查看售卖记录变动记录 Assert.assertEquals(XMJSONPath.readPath(cardTools.memberCardFindDetailById(memberCardId),"$.result.state"),"NORMAL");
Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].operateType").equals("CANCEL_SUSPEND_CARD"),"操作取消停卡,变动记录第一条操作类型");
Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].remark").equals("自动化取消停卡"),"操作取消停卡,变动记录第一条的备注");
//check 变动记录新增1条数据
Assert.assertTrue(Integer.parseInt(XMJSONPath.readPath(cardTools.fetchPageOfOperateRecord(memberCardId),"$.result.total"))==num+1);
Assert.assertTrue(XMJSONPath.readPath(cardTools.fetchPageOfOperateRecord(memberCardId),"$.result.records[0].operateType").equals("CANCEL_SUSPEND_CARD"),"操作停卡,变动记录第一条操作类型");
Assert.assertTrue(XMJSONPath.readPath(cardTools.fetchPageOfOperateRecord(memberCardId),"$.result.records[0].remark").equals("自动化取消停卡"),"操作停卡,变动记录第一条的备注");
}
} }
} }
...@@ -12,7 +12,13 @@ import org.testng.Assert; ...@@ -12,7 +12,13 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import javax.annotation.Resource;
public class TestDiscardManualDeduct extends XMBaseTest { public class TestDiscardManualDeduct extends XMBaseTest {
@Resource(name = "cardTools")
CardTools cardTools;
@BeforeMethod @BeforeMethod
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Card) xmAppApi.setApiModule(ApiModule.Polar_Card)
...@@ -26,21 +32,20 @@ public class TestDiscardManualDeduct extends XMBaseTest { ...@@ -26,21 +32,20 @@ public class TestDiscardManualDeduct extends XMBaseTest {
} }
@Test(description = "撤销手动扣次") @Test(description = "撤销手动扣次")
public void testDiscardManualDeduct() { public void testDiscardManualDeduct() {
CardTools Cardtools = new CardTools(); cardTools.memberCardSearch("NORMAL");
Cardtools.membercardsearch("NORMAL");
String benefitId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].courseBenefit.id");//拿售卖记录第一张【生效中】售卖的会员卡的ID; String benefitId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].courseBenefit.id");//拿售卖记录第一张【生效中】售卖的会员卡的ID;
String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");//拿售卖记录第一张【生效中】会员卡的ID; String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");//拿售卖记录第一张【生效中】会员卡的ID;
//JSONObject bodyJson1 =Cardtools.membercardfindDetailById(memberCardId); //JSONObject bodyJson1 =Cardtools.memberCardFindDetailById(memberCardId);
//int num1 = Integer.parseInt(XMJSONPath.readPath(bodyJson1,"$.result.courseBenefit.leftPurchaseBalance")); //int num1 = Integer.parseInt(XMJSONPath.readPath(bodyJson1,"$.result.courseBenefit.leftPurchaseBalance"));
Cardtools.manualDeduct(benefitId,memberCardId);//手动扣次 cardTools.manualDeduct(benefitId,memberCardId);//手动扣次
Cardtools.fetchPageOfConsumeRecord(benefitId,memberCardId); cardTools.fetchPageOfConsumeRecord(benefitId,memberCardId);
String consumeRecordId=XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");//拿第一条消耗记录 String consumeRecordId=XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");//拿第一条消耗记录
Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].consumeType").equals("MANUAL_DEDUCT"),"操作手动扣次,消耗记录第一条操作类型"); Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].consumeType").equals("MANUAL_DEDUCT"),"操作手动扣次,消耗记录第一条操作类型");
Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].changeOfPurchaseBalance").equals("-1.00"),"操作手动扣次,消耗次数"); Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].changeOfPurchaseBalance").equals("-1.00"),"操作手动扣次,消耗次数");
//JSONObject bodyJson2 =Cardtools.membercardfindDetailById(memberCardId); //JSONObject bodyJson2 =Cardtools.memberCardFindDetailById(memberCardId);
//int num2 = Integer.parseInt(XMJSONPath.readPath(bodyJson2,"$.result.courseBenefit.leftPurchaseBalance")); //int num2 = Integer.parseInt(XMJSONPath.readPath(bodyJson2,"$.result.courseBenefit.leftPurchaseBalance"));
//Assert.assertTrue(num1 == num2+1);//手动扣次后减少一次 //Assert.assertTrue(num1 == num2+1);//手动扣次后减少一次
...@@ -52,12 +57,12 @@ public class TestDiscardManualDeduct extends XMBaseTest { ...@@ -52,12 +57,12 @@ public class TestDiscardManualDeduct extends XMBaseTest {
jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId()); jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId());
jsonObject.put("operatorId",xmAppApi.getLoginInfo().getAdminId()); jsonObject.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers).assetsSuccess(true); xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers).assetsSuccess(true);
Cardtools.fetchPageOfConsumeRecord(benefitId,memberCardId); cardTools.fetchPageOfConsumeRecord(benefitId,memberCardId);
Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].consumeType").equals("DISCARD_MANUAL_DEDUCT"),"操作手动扣次,消耗记录第一条操作类型"); Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].consumeType").equals("DISCARD_MANUAL_DEDUCT"),"操作手动扣次,消耗记录第一条操作类型");
Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].changeOfPurchaseBalance").equals("1.00"),"操作撤销手动扣次,消耗次数"); Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].changeOfPurchaseBalance").equals("1.00"),"操作撤销手动扣次,消耗次数");
//JSONObject bodyJson3 =Cardtools.membercardfindDetailById(memberCardId); //JSONObject bodyJson3 =Cardtools.memberCardFindDetailById(memberCardId);
//int num3 = Integer.parseInt(XMJSONPath.readPath(bodyJson2,"$.result.courseBenefit.leftPurchaseBalance")); //int num3 = Integer.parseInt(XMJSONPath.readPath(bodyJson2,"$.result.courseBenefit.leftPurchaseBalance"));
//Assert.assertTrue(num1 == num3);//撤销后和原来一样的次数 //Assert.assertTrue(num1 == num3);//撤销后和原来一样的次数
......
...@@ -11,7 +11,11 @@ import com.xiaomai.utils.XMJSONPath; ...@@ -11,7 +11,11 @@ import com.xiaomai.utils.XMJSONPath;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import javax.annotation.Resource;
public class TestFetchPageOfConsumeRecord extends XMBaseTest { public class TestFetchPageOfConsumeRecord extends XMBaseTest {
@Resource(name = "cardTools")
CardTools cardTools;
@BeforeMethod @BeforeMethod
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Card) xmAppApi.setApiModule(ApiModule.Polar_Card)
...@@ -25,8 +29,7 @@ public class TestFetchPageOfConsumeRecord extends XMBaseTest { ...@@ -25,8 +29,7 @@ public class TestFetchPageOfConsumeRecord extends XMBaseTest {
} }
@Test(description = "查看售卖记录-会员卡消耗记录") @Test(description = "查看售卖记录-会员卡消耗记录")
public void testfetchPageOfConsumeRecord() { public void testfetchPageOfConsumeRecord() {
CardTools Cardtools = new CardTools(); cardTools.memberCardSearch("NORMAL");
Cardtools.membercardsearch("NORMAL");
String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");//拿售卖记录第一张会员卡的ID String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");//拿售卖记录第一张会员卡的ID
String benefitId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].courseBenefit.id"); String benefitId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].courseBenefit.id");
......
...@@ -11,7 +11,11 @@ import com.xiaomai.utils.XMJSONPath; ...@@ -11,7 +11,11 @@ import com.xiaomai.utils.XMJSONPath;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import javax.annotation.Resource;
public class TestFetchPageOfOperateRecord extends XMBaseTest { public class TestFetchPageOfOperateRecord extends XMBaseTest {
@Resource(name = "cardTools")
CardTools cardTools;
@BeforeMethod @BeforeMethod
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Card) xmAppApi.setApiModule(ApiModule.Polar_Card)
...@@ -25,8 +29,7 @@ public class TestFetchPageOfOperateRecord extends XMBaseTest { ...@@ -25,8 +29,7 @@ public class TestFetchPageOfOperateRecord extends XMBaseTest {
} }
@Test(description = "售卖记录详情-查看变动记录") @Test(description = "售卖记录详情-查看变动记录")
public void testFetchPageOfOperateRecord() { public void testFetchPageOfOperateRecord() {
CardTools Cardtools = new CardTools(); cardTools.memberCardSearch("NORMAL");
Cardtools.membercardsearch("NORMAL");
String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");//拿售卖记录第一张会员卡的ID String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");//拿售卖记录第一张会员卡的ID
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
......
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.TimeUtils;
import com.xiaomai.utils.XMBaseTest;
import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import javax.annotation.Resource;
public class TestMemberCardSuspend extends XMBaseTest {
@Resource(name = "cardTools")
CardTools cardTools;
public String memberCardId = "";
public String memberCardState;
@BeforeMethod
public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Card)
.setApiName("API_membercard_suspend")
.setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B);
dal.setCase_owner("xyy")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
super.beforeTest();
}
@DataProvider
public Object[][] dataProvider(){
return new Object[][]{
{"MEMBER"},//会员卡
{"DEPOSIT"},//储值卡
{"EXPERIENCE"}//体验卡
};
}
@Test(description = "停用已售卡",dataProvider = "dataProvider")
public void testMemberCardSuspend(String cardType) {
//查询生效中的卡列表
cardTools.memberCardSearch(cardType,"NORMAL");
//先检查列表有没有数据,有数据才会执行下面的点代码(如果是个空机构,肯定不会被执行,想从存量数据中获取,需要自己先造个数据)
int listDatas = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.records").size();
if (listDatas > 0) {
memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");
//取出第一个数据后,要check下会员卡的启用状态,想停用,要保证卡的状态目前就是启用状态
memberCardState=XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].state");
//如果不是启用状态,则开启
if(memberCardState.equals("SUSPEND")){
cardTools.memberCardCancelSuspend(memberCardId);
}
//获取该卡的变动记录条数
int num = Integer.parseInt(XMJSONPath.readPath(cardTools.fetchPageOfOperateRecord(memberCardId),"$.result.total"));
JSONObject jsonObject = new JSONObject();
jsonObject.put("planRestoreDate", TimeUtils.getAfterDayDate(1));//恢复使用时间
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());
xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers).assetsSuccess(true);
//check 会员卡详情,查看状态是否是已停用状态
Assert.assertEquals(XMJSONPath.readPath(cardTools.memberCardFindDetailById(memberCardId),"$.result.state"),"SUSPEND");
//check 变动记录新增1条数据
Assert.assertTrue(Integer.parseInt(XMJSONPath.readPath(cardTools.fetchPageOfOperateRecord(memberCardId),"$.result.total"))==num+1);
Assert.assertTrue(XMJSONPath.readPath(cardTools.fetchPageOfOperateRecord(memberCardId),"$.result.records[0].operateType").equals("SUSPEND_CARD"),"操作停卡,变动记录第一条操作类型");
Assert.assertTrue(XMJSONPath.readPath(cardTools.fetchPageOfOperateRecord(memberCardId),"$.result.records[0].remark").equals("自动化停卡"),"操作停卡,变动记录第一条的备注");
}
}
}
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.TimeUtils;
import com.xiaomai.utils.XMBaseTest;
import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import javax.annotation.Resource;
public class TestModifyExpireDate extends XMBaseTest {
@Resource(name = "cardTools")
CardTools cardTools;
public String memberCardId = "";
public String memberCardState;
@BeforeMethod
public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Card)
.setApiName("API_modifyExpireDate")
.setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B);
dal.setCase_owner("xyy")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
super.beforeTest();
}
@DataProvider
public Object[][] dataProvider(){
return new Object[][]{
{"MEMBER"},//会员卡
{"DEPOSIT"},//储值卡
{"EXPERIENCE"}//体验卡
};
}
@Test(description = "修改卡有效期",dataProvider = "dataProvider")
public void testModifyExpireDate(String cardType) {
//查询生效中的卡列表
cardTools.memberCardSearch(cardType,"NORMAL");
//先检查列表有没有数据,有数据才会执行下面的点代码(如果是个空机构,肯定不会被执行,想从存量数据中获取,需要自己先造个数据)
int listDatas = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.records").size();
if (listDatas > 0) {
memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");
//取出第一个数据后,要check下会员卡的启用状态,想停用,要保证卡的状态目前就是启用状态
memberCardState=XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].state");
//如果不是启用状态,则开启
if(memberCardState.equals("SUSPEND")){
cardTools.memberCardCancelSuspend(memberCardId);
}
//获取该卡的变动记录条数
int num = Integer.parseInt(XMJSONPath.readPath(cardTools.fetchPageOfOperateRecord(memberCardId),"$.result.total"));
//构建接口参数
JSONObject jsonObject = new JSONObject();
jsonObject.put("confirm",false);
jsonObject.put("expireDate", TimeUtils.getAfterDayDate(7));//修改到期时间:当前时间后7天
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());
xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers).assetsSuccess(true);
//check 会员卡详情,卡到期时间为当前时间后7天
Assert.assertEquals(XMJSONPath.readPath(cardTools.memberCardFindDetailById(memberCardId),"$.result.expireTime"),String.valueOf(TimeUtils.getAfterDayDate(7)));
//check 变动记录新增1条数据
Assert.assertTrue(Integer.parseInt(XMJSONPath.readPath(cardTools.fetchPageOfOperateRecord(memberCardId),"$.result.total"))==num+1);
Assert.assertTrue(XMJSONPath.readPath(cardTools.fetchPageOfOperateRecord(memberCardId),"$.result.records[0].operateType").equals("CHANGE_EFFECTIVE_DATE"),"操作修改有效期,变动记录第一条操作类型");
Assert.assertTrue(XMJSONPath.readPath(cardTools.fetchPageOfOperateRecord(memberCardId),"$.result.records[0].remark").equals("自动化修改卡有效期"),"操作修改有效期,变动记录第一条的备注");
}
}
}
...@@ -2,6 +2,8 @@ package com.xiaomai.cases.polar.memberCard; ...@@ -2,6 +2,8 @@ package com.xiaomai.cases.polar.memberCard;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.clue.MemberTools;
import com.xiaomai.cases.polar.training.TrainingTools;
import com.xiaomai.enums.ApiModule; import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.LoginAccount; import com.xiaomai.enums.LoginAccount;
import com.xiaomai.enums.RequestType; import com.xiaomai.enums.RequestType;
...@@ -10,9 +12,25 @@ import com.xiaomai.utils.XMBaseTest; ...@@ -10,9 +12,25 @@ import com.xiaomai.utils.XMBaseTest;
import com.xiaomai.utils.XMJSONPath; import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import javax.annotation.Resource;
public class TestModifySharers extends XMBaseTest { public class TestModifySharers extends XMBaseTest {
@Resource(name = "cardTools")
CardTools cardTools;
@Resource(name = "trainingTools")
TrainingTools trainingTools;
@Resource(name = "memberTools")
MemberTools memberTools;
public String memberCardId = "";
public String sharePeopleLimit;
public String memberId;
@BeforeMethod @BeforeMethod
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Card) xmAppApi.setApiModule(ApiModule.Polar_Card)
...@@ -24,55 +42,74 @@ public class TestModifySharers extends XMBaseTest { ...@@ -24,55 +42,74 @@ public class TestModifySharers extends XMBaseTest {
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
super.beforeTest(); super.beforeTest();
} }
@Test(description = "添加移除共享人")
public void testmodifySharers() {
CardTools Cardtools = new CardTools();
Cardtools.membercardsearch("NORMAL");
String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");//拿售卖记录第一张会员卡的ID;
JSONArray sharerIds=new JSONArray();
sharerIds.add("1807334217474027521");
JSONObject jsonObject = new JSONObject();
jsonObject.put("sharerIds",sharerIds);
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);
Cardtools.membercardfindDetailById(memberCardId);
Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.sharers.id"),"[\"1807334217474027521\"]","添加共享人后,核对会员卡有对应共享人");
@DataProvider
public Object[][] dataProvider(){
return new Object[][]{
{"MEMBER"},//会员卡
{"DEPOSIT"},//储值卡
{"EXPERIENCE"}//体验卡
};
} }
@Test(description = "移除移除共享人") @Test(description = "添加共享人-->移除共享人",dataProvider = "dataProvider")
public void testmodifySharers1() { public void testModifySharers(String cardType) {
CardTools Cardtools = new CardTools(); //查询生效中的卡列表
Cardtools.membercardsearch("NORMAL"); cardTools.memberCardSearch(cardType,"NORMAL");
//先检查列表有没有数据,有数据才会执行下面的点代码(如果是个空机构,肯定不会被执行,想从存量数据中获取,需要自己先造个数据)
String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");//拿售卖记录第一张会员卡的ID; int listDatas = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.records").size();
if (listDatas > 0) {
//JSONArray sharerIds=new JSONArray(); memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");
//sharerIds.add(); //取出第一个数据后,要check下会员卡的启用状态,想停用,要保证卡的状态目前就是启用状态
// sharePeopleLimit = Integer.parseInt(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].sharePeopleLimit"));
JSONObject jsonObject = new JSONObject(); //如果共享人数=0,设置共享人=2
//jsonObject.put("sharerIds",sharerIds);//空共享人 // if(sharePeopleLimit == 0){
jsonObject.put("memberCardId",memberCardId); // cardTools.memberCardCancelSuspend(memberCardId);//进行卡编辑,共享人设置=2
jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId()); // }
jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId());
jsonObject.put("operatorId",xmAppApi.getLoginInfo().getAdminId()); //获取该卡的变动记录条数
int num = Integer.parseInt(XMJSONPath.readPath(cardTools.fetchPageOfOperateRecord(memberCardId),"$.result.total"));
//获取该卡当前的共享人数
int sharerNum = XMJSONPath.getJSONArrayByReadPath(cardTools.memberCardFindDetailById(memberCardId), "$.result.sharers").size();
xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers).assetsSuccess(true);
Cardtools.membercardfindDetailById(memberCardId); //获取共享人列表里其中是「流失会员」的会员id
Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.sharers.id"),"[]","移除共享人后,核对会员卡下无共享人"); memberId = trainingTools.searchTargerMember("自动化流失会员");
Assert.assertEquals(XMJSONPath.readPath(memberTools.findStudioMemberDetail(memberId), "$.result.status"),"HISTORY");
//查询该会员名下卡数据
cardTools.getUserMemberCardList(memberId,cardType);
int cardNum = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").size();
//构建接口参数
JSONArray sharerIds = new JSONArray();
sharerIds.add(memberId);
JSONObject jsonObject = new JSONObject();
jsonObject.put("memberCardId", memberCardId);
jsonObject.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
jsonObject.put("sharerIds", sharerIds);
jsonObject.put("brandId", xmAppApi.getLoginInfo().getBrandId());
jsonObject.put("studioId", xmAppApi.getLoginInfo().getStudioId());
//调用请求
xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers).assetsSuccess(true);
//check 会员卡详情,共享人新增1条
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(cardTools.memberCardFindDetailById(memberCardId), "$.result.sharers").size()==sharerNum+1);
//check 变动记录新增1条数据
Assert.assertTrue(Integer.parseInt(XMJSONPath.readPath(cardTools.fetchPageOfOperateRecord(memberCardId),"$.result.total"))==num+1);
Assert.assertTrue(XMJSONPath.readPath(cardTools.fetchPageOfOperateRecord(memberCardId),"$.result.records[0].operateType").equals("CHANGE_SHARER"),"操作添加共享人,变动记录第一条操作类型");
Assert.assertTrue(XMJSONPath.readPath(cardTools.fetchPageOfOperateRecord(memberCardId),"$.result.records[0].content").contains("添加"),"操作添加共享人,变动记录第一条的备注");
//check 会员状态从流失->正式
Assert.assertEquals(XMJSONPath.readPath(memberTools.findStudioMemberDetail(memberId), "$.result.status"),"NORMAL");
//check 会员已购卡新增1张
cardTools.getUserMemberCardList(memberId,cardType);
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").size()==cardNum+1);
//数据清理:移除共享人
cardTools.modifySharers(memberCardId);
//check 会员状态从正式->流失
Assert.assertEquals(XMJSONPath.readPath(memberTools.findStudioMemberDetail(memberId), "$.result.status"),"HISTORY");
}
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment