Skip to content

X
xm-sportstest
Commit 0bfc1732 by yangfangfang
Options

修改标签和会员

parent 87ee3c3e
Showing with 271 additions and 54 deletions
src/main/java/com/xiaomai/cases/polar/finance/order/OrderTools.java
...@@ -14,7 +14,7 @@ public class OrderTools extends XMBaseTest { ...@@ -14,7 +14,7 @@ public class OrderTools extends XMBaseTest {
* @description:获取会员详情-订单管理列表 * @description:获取会员详情-订单管理列表
* @author: yangfangfang * @author: yangfangfang
**/ **/
public JSONObject testPageMemberVoucher(String current,String size,String supplierId,String receiverId,String brandId,String studioId,String operatorId,DataUserInfo...dataUserInfos){ public JSONObject pageMemberVoucher(String current,String size,String supplierId,String receiverId,String brandId,String studioId,String operatorId,DataUserInfo...dataUserInfos){
dataApi.setApiModule(ApiModule.Polar_Finance) dataApi.setApiModule(ApiModule.Polar_Finance)
.setApiName("API_pageMemberVoucher") .setApiName("API_pageMemberVoucher")
...@@ -40,7 +40,7 @@ public class OrderTools extends XMBaseTest { ...@@ -40,7 +40,7 @@ public class OrderTools extends XMBaseTest {
* @description:获取会员详情-订单管理金额统计 * @description:获取会员详情-订单管理金额统计
* @author: yangfangfang * @author: yangfangfang
**/ **/
public JSONObject testSumMemberVoucherAmount(String current,String size,String supplierId,String receiverId,String brandId,String studioId,String operatorId,DataUserInfo...dataUserInfos){ public JSONObject sumMemberVoucherAmount(String current,String size,String supplierId,String receiverId,String brandId,String studioId,String operatorId,DataUserInfo...dataUserInfos){
dataApi.setApiModule(ApiModule.Polar_Finance) dataApi.setApiModule(ApiModule.Polar_Finance)
.setApiName("API_sumMemberVoucherAmount") .setApiName("API_sumMemberVoucherAmount")
...@@ -66,7 +66,7 @@ public class OrderTools extends XMBaseTest { ...@@ -66,7 +66,7 @@ public class OrderTools extends XMBaseTest {
* @description:获取会员详情-订单明细列表 * @description:获取会员详情-订单明细列表
* @author: yangfangfang * @author: yangfangfang
**/ **/
public JSONObject testPageMemberVoucherItem(String current,String size,String supplierId,String receiverId,String brandId,String studioId,String operatorId,DataUserInfo...dataUserInfos){ public JSONObject pageMemberVoucherItem(String current,String size,String supplierId,String receiverId,String brandId,String studioId,String operatorId,DataUserInfo...dataUserInfos){
dataApi.setApiModule(ApiModule.Polar_Finance) dataApi.setApiModule(ApiModule.Polar_Finance)
.setApiName("API_pageMemberVoucherItem") .setApiName("API_pageMemberVoucherItem")
...@@ -93,7 +93,7 @@ public class OrderTools extends XMBaseTest { ...@@ -93,7 +93,7 @@ public class OrderTools extends XMBaseTest {
* @description:获取订单管理-订单管理列表 * @description:获取订单管理-订单管理列表
* @author: yangfangfang * @author: yangfangfang
**/ **/
public JSONObject testPageVoucher(String current,String size,String supplierId,String receiverId,String brandId,String studioId,String operatorId,DataUserInfo...dataUserInfos){ public JSONObject pageVoucher(String current,String size,String supplierId,String receiverId,String brandId,String studioId,String operatorId,DataUserInfo...dataUserInfos){
dataApi.setApiModule(ApiModule.Polar_Finance) dataApi.setApiModule(ApiModule.Polar_Finance)
.setApiName("API_pageVoucher") .setApiName("API_pageVoucher")
...@@ -119,7 +119,7 @@ public class OrderTools extends XMBaseTest { ...@@ -119,7 +119,7 @@ public class OrderTools extends XMBaseTest {
* @description:获取订单管理-订单管理金额统计 * @description:获取订单管理-订单管理金额统计
* @author: yangfangfang * @author: yangfangfang
**/ **/
public JSONObject testSumVoucherAmount(String current,String size,String supplierId,String receiverId,String brandId,String studioId,String operatorId,DataUserInfo...dataUserInfos){ public JSONObject sumVoucherAmount(String current,String size,String supplierId,String receiverId,String brandId,String studioId,String operatorId,DataUserInfo...dataUserInfos){
dataApi.setApiModule(ApiModule.Polar_Finance) dataApi.setApiModule(ApiModule.Polar_Finance)
.setApiName("API_sumVoucherAmount") .setApiName("API_sumVoucherAmount")
...@@ -145,7 +145,7 @@ public class OrderTools extends XMBaseTest { ...@@ -145,7 +145,7 @@ public class OrderTools extends XMBaseTest {
* @description:获取订单管理-订单明细列表 * @description:获取订单管理-订单明细列表
* @author: yangfangfang * @author: yangfangfang
**/ **/
public JSONObject testPageVoucherItem(String current,String size,String supplierId,String receiverId,String brandId,String studioId,String operatorId,DataUserInfo...dataUserInfos){ public JSONObject pageVoucherItem(String current,String size,String supplierId,String receiverId,String brandId,String studioId,String operatorId,DataUserInfo...dataUserInfos){
dataApi.setApiModule(ApiModule.Polar_Finance) dataApi.setApiModule(ApiModule.Polar_Finance)
.setApiName("API_pageVoucherItem") .setApiName("API_pageVoucherItem")
...@@ -171,7 +171,7 @@ public class OrderTools extends XMBaseTest { ...@@ -171,7 +171,7 @@ public class OrderTools extends XMBaseTest {
* @description:获取订单管理-订单明细金额统计 * @description:获取订单管理-订单明细金额统计
* @author: yangfangfang * @author: yangfangfang
**/ **/
public JSONObject testSumVoucherItemAmount(String current,String size,String supplierId,String receiverId,String brandId,String studioId,String operatorId,DataUserInfo...dataUserInfos){ public JSONObject sumVoucherItemAmount(String current,String size,String supplierId,String receiverId,String brandId,String studioId,String operatorId,DataUserInfo...dataUserInfos){
dataApi.setApiModule(ApiModule.Polar_Finance) dataApi.setApiModule(ApiModule.Polar_Finance)
.setApiName("API_sumVoucherItemAmount") .setApiName("API_sumVoucherItemAmount")
......
src/main/java/com/xiaomai/cases/polar/member/TestFindDetailById.java
...@@ -13,24 +13,33 @@ import org.testng.annotations.Test; ...@@ -13,24 +13,33 @@ import org.testng.annotations.Test;
public class TestFindDetailById extends XMBaseTest { public class TestFindDetailById extends XMBaseTest {
Tools tools=new Tools();
@BeforeMethod @BeforeMethod
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Clue) xmAppApi.setApiModule(ApiModule.Polar_Clue)
.setApiName("API_findDetailById") .setApiName("API_findStudioMemberDetail")
.setLoginUser(LoginAccount.YFF_DEV) .setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
dal.setCase_owner("yff") dal.setCase_owner("yff")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
super.beforeTest(); super.beforeTest();
} }
@Test(description = "获取会员详情以及更多资料") @Test(description = "获取会员详情以及更多资料")
public void testFindDetailById(){ public void testFindDetailById(){
//暂时还不能转会员，只能写死：memberId：1771002119284924417-自动化正式会员勿动 //获取正式会员列表
JSONObject memberResult=tools.search("NORMAL","NORMAL");
String id=memberResult.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
JSONObject jsonObject=new JSONObject(); JSONObject jsonObject=new JSONObject();
jsonObject.put("memberId","1771059838226341890"); jsonObject.put("memberId",id);
jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId());
jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId());
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);
JSONObject response=xmAppApi.getBodyInJSON(); JSONObject response=xmAppApi.getBodyInJSON();
...@@ -41,11 +50,20 @@ public class TestFindDetailById extends XMBaseTest { ...@@ -41,11 +50,20 @@ public class TestFindDetailById extends XMBaseTest {
@Test(description = "获取会员详情以及更多资料-会员id不能为空") @Test(description = "获取会员详情以及更多资料-会员id不能为空")
public void testFindDetailById_1(){ public void testFindDetailById_1(){
//获取正式会员列表
JSONObject memberResult=tools.search("NORMAL","NORMAL");
String id=memberResult.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
JSONObject jsonObject1=new JSONObject(); JSONObject jsonObject1=new JSONObject();
jsonObject1.put("memberId",""); jsonObject1.put("memberId","");
jsonObject1.put("studioId",xmAppApi.getLoginInfo().getStudioId());
jsonObject1.put("brandId",xmAppApi.getLoginInfo().getBrandId());
jsonObject1.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
xmAppApi.doRequest(RequestType.JSON,params,jsonObject1.toJSONString(),headers).assetsSuccess(false); xmAppApi.doRequest(RequestType.JSON,params,jsonObject1.toJSONString(),headers).assetsSuccess(false);
Assert.assertEquals(XMJSONPath.readPath(xmAppApi.getBodyInJSON(),"$message"),"会员id不能为空"); Assert.assertEquals(XMJSONPath.readPath(xmAppApi.getBodyInJSON(),"$message"),"会员id不能为空");
} }
} }
src/main/java/com/xiaomai/cases/polar/member/TestForceUpdate.java
package com.xiaomai.cases.polar.member; package com.xiaomai.cases.polar.member;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.clue.MemberTools;
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;
...@@ -15,12 +16,14 @@ import org.testng.annotations.Test; ...@@ -15,12 +16,14 @@ import org.testng.annotations.Test;
public class TestForceUpdate extends XMBaseTest { public class TestForceUpdate extends XMBaseTest {
Tools tools= new Tools();
@BeforeMethod @BeforeMethod
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Clue) xmAppApi.setApiModule(ApiModule.Polar_Clue)
.setApiName("API_forceUpdate") .setApiName("API_forceUpdate")
.setLoginUser(LoginAccount.YFF_DEV) .setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
dal.setCase_owner("yff") dal.setCase_owner("yff")
...@@ -31,13 +34,21 @@ public class TestForceUpdate extends XMBaseTest { ...@@ -31,13 +34,21 @@ public class TestForceUpdate extends XMBaseTest {
@Test(description = "编辑正式会员信息") @Test(description = "编辑正式会员信息")
public void testForceUpdate() { public void testForceUpdate() {
//暂时还不能转会员，只能写死：memberId：1771059838226341890-自动化正式会员勿动
JSONObject create=tools.create("编辑正式会员"+RandomStringUtil.randomString(3),RandomStringUtil.randomMobile("88"));
String memberId=create.getString("result");
//创建订单转成正式会员
//编辑
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("brandId", xmAppApi.getLoginInfo().getBrandId()); jsonObject.put("brandId", xmAppApi.getLoginInfo().getBrandId());
jsonObject.put("studioId", xmAppApi.getLoginInfo().getStudioId()); jsonObject.put("studioId", xmAppApi.getLoginInfo().getStudioId());
jsonObject.put("operatorId", xmAppApi.getLoginInfo().getAdminId()); jsonObject.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
jsonObject.put("status", "NORMAL"); jsonObject.put("status", "POTENTIAL");
jsonObject.put("name", "自动化正式会员" + RandomStringUtil.randomString(2)); jsonObject.put("name", "自动化正式会员" + RandomStringUtil.randomString(2));
jsonObject.put("phone", RandomStringUtil.randomMobile("22")); jsonObject.put("phone", RandomStringUtil.randomMobile("22"));
jsonObject.put("gender", "WOMEN"); jsonObject.put("gender", "WOMEN");
...@@ -54,9 +65,10 @@ public class TestForceUpdate extends XMBaseTest { ...@@ -54,9 +65,10 @@ public class TestForceUpdate extends XMBaseTest {
jsonObject.put("emergencyContactPerson", RandomStringUtil.randomString(3)); jsonObject.put("emergencyContactPerson", RandomStringUtil.randomString(3));
jsonObject.put("emergencyContactPhone", RandomStringUtil.randomMobile("66")); jsonObject.put("emergencyContactPhone", RandomStringUtil.randomMobile("66"));
jsonObject.put("resourceId", "1"); jsonObject.put("resourceId", "1");
jsonObject.put("intention", "HIGH");
jsonObject.put("creatorId", xmAppApi.getLoginInfo().getAdminId()); jsonObject.put("creatorId", xmAppApi.getLoginInfo().getAdminId());
jsonObject.put("remark", "备注"+RandomStringUtil.randomString(12)); jsonObject.put("remark", "备注"+RandomStringUtil.randomString(12));
jsonObject.put("memberId", "1771059838226341890"); jsonObject.put("memberId", memberId);
xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers).assetsSuccess(true); xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers).assetsSuccess(true);
......
src/main/java/com/xiaomai/cases/polar/member/TestSearch.java
...@@ -18,7 +18,7 @@ public class TestSearch extends XMBaseTest { ...@@ -18,7 +18,7 @@ public class TestSearch extends XMBaseTest {
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Clue) xmAppApi.setApiModule(ApiModule.Polar_Clue)
.setApiName("API_searchMember") .setApiName("API_searchMember")
.setLoginUser(LoginAccount.YFF_DEV) .setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
dal.setCase_owner("yff") dal.setCase_owner("yff")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
...@@ -28,26 +28,35 @@ public class TestSearch extends XMBaseTest { ...@@ -28,26 +28,35 @@ public class TestSearch extends XMBaseTest {
@DataProvider @DataProvider
public Object[][] dataProvider(){ public Object[][] dataProvider(){
return new Object[][]{ return new Object[][]{
{"NORMAL"}, {"NORMAL","NORMAL"},
{"HISTORY"} {"HISTORY","HISTORY"}
}; };
} }
@Test(description = "获取会员管理（正式会员/流失会员）列表",dataProvider = "dataProvider") @Test(description = "获取会员管理（正式会员/流失会员）列表",dataProvider = "dataProvider")
public void testSearch(String status){ public void testSearch(String searchType,String status){
JSONObject jsonObject=new JSONObject(); JSONObject jsonObject=new JSONObject();
jsonObject.put("current",0); jsonObject.put("current",0);
jsonObject.put("size",20); jsonObject.put("size",20);
jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId()); jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId());
jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId());
JSONObject studioFilter=new JSONObject(); jsonObject.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
studioFilter.put("studioId",xmAppApi.getLoginInfo().getStudioId()); jsonObject.put("searchType",searchType);
jsonObject.put("studioFilter",studioFilter);
JSONArray statusList=new JSONArray(); JSONArray statusList=new JSONArray();
statusList.add(status); statusList.add(status);
jsonObject.put("statusList",statusList); jsonObject.put("statusList",statusList);
jsonObject.put("resourceId",null);
jsonObject.put("creatorId",null);
jsonObject.put("wechatBindStatus",null);
jsonObject.put("saleId",null);
jsonObject.put("birthdayEnd",null);
jsonObject.put("createdEnd",null);
jsonObject.put("createdStart",null);
jsonObject.put("tags",null);
jsonObject.put("coachId",null);
xmAppApi.doRequest(RequestType.JSON,params,jsonObject.toJSONString(),headers).assetsSuccess(true); xmAppApi.doRequest(RequestType.JSON,params,jsonObject.toJSONString(),headers).assetsSuccess(true);
JSONObject response=xmAppApi.getBodyInJSON(); JSONObject response=xmAppApi.getBodyInJSON();
String success=response.getString("success"); String success=response.getString("success");
...@@ -58,21 +67,20 @@ public class TestSearch extends XMBaseTest { ...@@ -58,21 +67,20 @@ public class TestSearch extends XMBaseTest {
@DataProvider @DataProvider
public Object[][] dataProvider1(){ public Object[][] dataProvider1(){
return new Object[][]{ return new Object[][]{
{"NORMAL"}, {"NORMAL","NORMAL"},
{"HISTORY"} {"HISTORY","HISTORY"}
}; };
} }
@Test(description = "筛选会员管理（正式会员/流失学员）列表来源、当前创建人、性别",dataProvider = "dataProvider1") @Test(description = "筛选会员管理（正式会员/流失学员）列表来源、当前创建人、跟进销售、跟进教练、绑定微信公众号、性别",dataProvider = "dataProvider1")
public void testSearchResource(String status){ public void testSearchResource(String searchType,String status){
JSONObject jsonObject=new JSONObject(); JSONObject jsonObject=new JSONObject();
jsonObject.put("current",0); jsonObject.put("current",0);
jsonObject.put("size",20); jsonObject.put("size",20);
jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId()); jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId());
jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId());
JSONObject studioFilter=new JSONObject(); jsonObject.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
studioFilter.put("studioId",xmAppApi.getLoginInfo().getStudioId()); jsonObject.put("searchType",searchType);
jsonObject.put("studioFilter",studioFilter);
JSONArray statusList=new JSONArray(); JSONArray statusList=new JSONArray();
statusList.add(status); statusList.add(status);
...@@ -81,6 +89,14 @@ public class TestSearch extends XMBaseTest { ...@@ -81,6 +89,14 @@ public class TestSearch extends XMBaseTest {
jsonObject.put("creatorId",xmAppApi.getLoginInfo().getAdminId()); jsonObject.put("creatorId",xmAppApi.getLoginInfo().getAdminId());
jsonObject.put("gender","WOMEN"); jsonObject.put("gender","WOMEN");
jsonObject.put("wechatBindStatus","NO");
jsonObject.put("saleId",xmAppApi.getLoginInfo().getAdminId());
jsonObject.put("birthdayEnd",null);
jsonObject.put("createdEnd",null);
jsonObject.put("createdStart",null);
jsonObject.put("tags",null);
jsonObject.put("coachId",xmAppApi.getLoginInfo().getAdminId());
xmAppApi.doRequest(RequestType.JSON,params,jsonObject.toJSONString(),headers).assetsSuccess(true); xmAppApi.doRequest(RequestType.JSON,params,jsonObject.toJSONString(),headers).assetsSuccess(true);
JSONObject response=xmAppApi.getBodyInJSON(); JSONObject response=xmAppApi.getBodyInJSON();
......
src/main/java/com/xiaomai/cases/polar/member/Tools.java 0 → 100644
package com.xiaomai.cases.polar.member;
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 java.util.List;
public class Tools extends XMBaseTest {
/**
* @param
* @description:获取会员管理列表
* @param searchType:查询类型 POTENTIAL, NORMAL, HISTORY
* @param status:会员状态 POTENTIAL, NORMAL, HISTORY
* @author: yangfangfang
**/
public JSONObject search(String searchType,String status, DataUserInfo...dataUserInfos){
dataApi.setApiModule(ApiModule.Polar_Clue)
.setApiName("API_searchMember")
.setTerminal(Terminal.B);
super.beforeDataRequest(dataUserInfos);
JSONObject jsonObject=new JSONObject();
jsonObject.put("current",0);
jsonObject.put("size",20);
jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId());
jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId());
jsonObject.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
jsonObject.put("searchType",searchType);
JSONArray statusList=new JSONArray();
statusList.add(status);
jsonObject.put("statusList",statusList);
jsonObject.put("resourceId",null);
jsonObject.put("creatorId",null);
jsonObject.put("wechatBindStatus",null);
jsonObject.put("saleId",null);
jsonObject.put("birthdayEnd",null);
jsonObject.put("createdEnd",null);
jsonObject.put("createdStart",null);
jsonObject.put("tags",null);
jsonObject.put("coachId",null);
dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
JSONObject response=dataApi.getBodyInJSON();
return response;
}
/**
* @param
* @description:添加线索
* @param name:姓名
* @param phone:手机号
* @param
* @author: yangfangfang
**/
public JSONObject create(String name,String phone,DataUserInfo...userInfos){
dataApi.setApiModule(ApiModule.Polar_Clue)
.setApiName("API_create")
.setTerminal(Terminal.B);
super.beforeDataRequest(userInfos);
JSONObject object = new JSONObject();
object.put("brandId",xmAppApi.getLoginInfo().getBrandId());
object.put("studioId",xmAppApi.getLoginInfo().getStudioId());
object.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
object.put("creatorId",xmAppApi.getLoginInfo().getAdminId());
object.put("status","POTENTIAL");
object.put("name",name);
object.put("phone",phone);
object.put("gender","UNKNOWN");
object.put("position","INITIAL");
object.put("saleId","-1");
dataApi.doRequest(RequestType.JSON,dataparams,object.toString(),dataheadrs).assetsSuccess(true);
return dataApi.getBodyInJSON();
}
/**
* @param
* @description:搜索会员
* @param content:姓名/手机号
* @param status:POTENTIAL, NORMAL, HISTORY
* @param
* @author: yangfangfang
**/
public JSONObject commonSearch(String content,String status, DataUserInfo...userInfos){
dataApi.setApiModule(ApiModule.Polar_Clue)
.setApiName("API_commonSearch")
.setTerminal(Terminal.B);
super.beforeDataRequest(userInfos);
JSONObject object = new JSONObject();
object.put("brandId",xmAppApi.getLoginInfo().getBrandId());
object.put("studioId",xmAppApi.getLoginInfo().getStudioId());
object.put("operatorId",xmAppApi.getLoginInfo().getStudioId());
object.put("content",content);
JSONArray statusList=new JSONArray();
statusList.add(status);
object.put("statusList",statusList);
object.put("followerId",null);
object.put("position",null);
object.put("dataPermissionFilter",true);
dataApi.doRequest(RequestType.JSON,dataparams,object.toString(),dataheadrs).assetsSuccess(true);
return dataApi.getBodyInJSON();
}
}
src/main/java/com/xiaomai/cases/polar/setting/TagTools.java → src/main/java/com/xiaomai/cases/polar/setting/tag/TagTools.java
package com.xiaomai.cases.polar.setting; package com.xiaomai.cases.polar.setting.tag;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
...@@ -6,6 +6,7 @@ import com.xiaomai.client.DataUserInfo; ...@@ -6,6 +6,7 @@ import com.xiaomai.client.DataUserInfo;
import com.xiaomai.enums.ApiModule; import com.xiaomai.enums.ApiModule;
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 java.util.ArrayList; import java.util.ArrayList;
...@@ -31,6 +32,8 @@ public class TagTools extends XMBaseTest { ...@@ -31,6 +32,8 @@ public class TagTools extends XMBaseTest {
jsonObject.put("bizAccountId",xmAppApi.getLoginInfo().getAdminId()); jsonObject.put("bizAccountId",xmAppApi.getLoginInfo().getAdminId());
jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId()); jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId());
jsonObject.put("label", label); jsonObject.put("label", label);
jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId());
jsonObject.put("operatorId",xmAppApi.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(); JSONObject response=dataApi.getBodyInJSON();
...@@ -112,6 +115,8 @@ public class TagTools extends XMBaseTest { ...@@ -112,6 +115,8 @@ public class TagTools extends XMBaseTest {
jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId()); jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId());
jsonObject.put("needUsageInfo","true"); jsonObject.put("needUsageInfo","true");
jsonObject.put("content",content); jsonObject.put("content",content);
jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId());
jsonObject.put("operatorId",xmAppApi.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(); JSONObject response=dataApi.getBodyInJSON();
...@@ -127,7 +132,7 @@ public class TagTools extends XMBaseTest { ...@@ -127,7 +132,7 @@ public class TagTools extends XMBaseTest {
* @date: 2024/3/16 16:28 * @date: 2024/3/16 16:28
* @return: com.alibaba.fastjson.JSONObject * @return: com.alibaba.fastjson.JSONObject
**/ **/
public JSONObject forceUpdate(String memberId, String name, String phone, String status,String tagId, DataUserInfo...dataUserInfos) { public JSONObject forceUpdate(String memberId, String name,String creator, String phone, String status,String tagId, DataUserInfo...dataUserInfos) {
dataApi.setApiModule(ApiModule.Polar_Clue) dataApi.setApiModule(ApiModule.Polar_Clue)
.setApiName("API_forceUpdate") .setApiName("API_forceUpdate")
...@@ -135,18 +140,41 @@ public class TagTools extends XMBaseTest { ...@@ -135,18 +140,41 @@ public class TagTools extends XMBaseTest {
super.beforeDataRequest(dataUserInfos); super.beforeDataRequest(dataUserInfos);
JSONObject dataJson=new JSONObject(); JSONObject dataJson=new JSONObject();
dataJson.put("id",memberId);
dataJson.put("brandId",xmAppApi.getLoginInfo().getBrandId());
dataJson.put("studioId",xmAppApi.getLoginInfo().getStudioId());
dataJson.put("memberId",memberId); dataJson.put("memberId",memberId);
dataJson.put("name",name); dataJson.put("name",name);
dataJson.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
dataJson.put("phone",phone); dataJson.put("phone",phone);
dataJson.put("gender","UNKNOWN");
dataJson.put("status",status); dataJson.put("status",status);
dataJson.put("studioId",xmAppApi.getLoginInfo().getStudioId()); dataJson.put("resourceId","-1");
dataJson.put("creatorId",xmAppApi.getLoginInfo().getAdminId());
dataJson.put("wechatBindStatus","NO");
dataJson.put("created", TimeUtils.getCurrentTime());
dataJson.put("updated",TimeUtils.getCurrentTime());
dataJson.put("intention","UNKNOWN");
dataJson.put("position","INITIAL");
dataJson.put("saleId","-1");
dataJson.put("lastFeedbackResult","NONE");
dataJson.put("planReleaseTime","-1");
dataJson.put("disableOperatorId","-1");
dataJson.put("coachId","-1");
dataJson.put("creator",creator);
dataJson.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
List tags = new ArrayList(); List tags = new ArrayList();
tags.add(tagId); tags.add(tagId);
dataJson.put("tags",tags); dataJson.put("tags",tags);
JSONObject refStudioList=new JSONObject();
refStudioList.put("id",xmAppApi.getLoginInfo().getStudioId());
refStudioList.put("name","小麦乐动自动化场馆");
dataJson.put("refStudioList",refStudioList);
dataApi.doRequest(RequestType.JSON, dataparams, dataJson.toJSONString(), dataheadrs).assetsSuccess(true); dataApi.doRequest(RequestType.JSON, dataparams, dataJson.toJSONString(), dataheadrs).assetsSuccess(true);
JSONObject response=dataApi.getBodyInJSON(); JSONObject response=dataApi.getBodyInJSON();
return response; return response;
......
src/main/java/com/xiaomai/cases/polar/setting/tag/TestCreate.java
package com.xiaomai.cases.polar.setting.tag; package com.xiaomai.cases.polar.setting.tag;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.setting.TagTools;
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;
...@@ -24,7 +23,7 @@ public class TestCreate extends XMBaseTest { ...@@ -24,7 +23,7 @@ public class TestCreate extends XMBaseTest {
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Setting) xmAppApi.setApiModule(ApiModule.Polar_Setting)
.setApiName("API_tag_create") .setApiName("API_tag_create")
.setLoginUser(LoginAccount.YFF_DEV) .setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
dal.setCase_owner("yff") dal.setCase_owner("yff")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
...@@ -44,6 +43,8 @@ public class TestCreate extends XMBaseTest { ...@@ -44,6 +43,8 @@ public class TestCreate extends XMBaseTest {
jsonObject.put("bizAccountId",xmAppApi.getLoginInfo().getAdminId()); jsonObject.put("bizAccountId",xmAppApi.getLoginInfo().getAdminId());
jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId()); jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId());
jsonObject.put("label","自动化"+ RandomStringUtil.randomString(3)); jsonObject.put("label","自动化"+ RandomStringUtil.randomString(3));
jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId());
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);
JSONObject response=xmAppApi.getBodyInJSON(); JSONObject response=xmAppApi.getBodyInJSON();
...@@ -80,6 +81,8 @@ public class TestCreate extends XMBaseTest { ...@@ -80,6 +81,8 @@ public class TestCreate extends XMBaseTest {
jsonObject.put("bizAccountId",xmAppApi.getLoginInfo().getAdminId()); jsonObject.put("bizAccountId",xmAppApi.getLoginInfo().getAdminId());
jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId()); jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId());
jsonObject.put("label","自动化-禁止使用"); jsonObject.put("label","自动化-禁止使用");
jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId());
jsonObject.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
xmAppApi.doRequest(RequestType.JSON,params,jsonObject.toJSONString(),headers).assetsSuccess(false); xmAppApi.doRequest(RequestType.JSON,params,jsonObject.toJSONString(),headers).assetsSuccess(false);
JSONObject response=xmAppApi.getBodyInJSON(); JSONObject response=xmAppApi.getBodyInJSON();
......
src/main/java/com/xiaomai/cases/polar/setting/tag/TestDeleteById.java
package com.xiaomai.cases.polar.setting.tag; package com.xiaomai.cases.polar.setting.tag;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.setting.TagTools; import com.xiaomai.cases.polar.admin.AdminTools;
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;
...@@ -16,6 +16,7 @@ import org.testng.annotations.Test; ...@@ -16,6 +16,7 @@ import org.testng.annotations.Test;
public class TestDeleteById extends XMBaseTest { public class TestDeleteById extends XMBaseTest {
TagTools tagTools=new TagTools(); TagTools tagTools=new TagTools();
AdminTools adminTools=new AdminTools();
@BeforeMethod @BeforeMethod
...@@ -23,7 +24,7 @@ public class TestDeleteById extends XMBaseTest { ...@@ -23,7 +24,7 @@ public class TestDeleteById extends XMBaseTest {
xmAppApi.setApiModule(ApiModule.Polar_Setting) xmAppApi.setApiModule(ApiModule.Polar_Setting)
.setApiName("API_tag_deleteById") .setApiName("API_tag_deleteById")
.setLoginUser(LoginAccount.YFF_DEV) .setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
dal.setCase_owner("yff") dal.setCase_owner("yff")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
...@@ -63,14 +64,18 @@ public class TestDeleteById extends XMBaseTest { ...@@ -63,14 +64,18 @@ public class TestDeleteById extends XMBaseTest {
@Test(description = "删除标签--已被本场馆会员使用-同步删除同场馆会员的标签") @Test(description = "删除标签--已被本场馆会员使用-同步删除同场馆会员的标签")
public void testDeleteById_1(){ public void testDeleteById_1(){
//memberId：1768875352924524545-自动化标签会员勿动1（还不能删除线索，不添加这么多，暂时先用一个） //memberId：1801136353800269825-自动化标签会员勿动1（还不能删除线索，不添加这么多，暂时先用一个）
//增加标签 //增加标签
JSONObject createTag=tagTools.tagCreate("自动化标签勿动1"); JSONObject createTag=tagTools.tagCreate("自动化标签勿动1");
String tagId1=createTag.getString("result"); String tagId1=createTag.getString("result");
//获取当前员工昵称
JSONObject adminResult= adminTools.getStudioAdmin(xmAppApi.getLoginInfo().getAdminId());
String nickName=adminResult.getJSONObject("result").getString("nickName");
//给会员添加标签 //给会员添加标签
JSONObject forceUpdate=tagTools.forceUpdate("1768875352924524545","自动化标签会员勿动1","10022233333","POTENTIAL",tagId1); JSONObject forceUpdate=tagTools.forceUpdate("1801136353800269825","自动化标签会员勿动1",nickName,"10022233333","POTENTIAL",tagId1);
//删除标签 //删除标签
JSONObject deleteTag1=new JSONObject(); JSONObject deleteTag1=new JSONObject();
...@@ -94,13 +99,13 @@ public class TestDeleteById extends XMBaseTest { ...@@ -94,13 +99,13 @@ public class TestDeleteById extends XMBaseTest {
@Test(description = "删除标签--已被非本场馆会员使用-不能删除") @Test(description = "删除标签--已被非本场馆会员使用-不能删除")
public void testDeleteById_2() { public void testDeleteById_2() {
//被别的场馆使用：tagId：1768900252624130050;memberId：1768900398913064961-自动化标签会员勿动1 //被别的场馆使用：tagId：1801151244447690753-自动化标签勿动;memberId：1801150921062658049-自动化标签会员勿动1
//删除标签 //删除标签
JSONObject deleteTag2=new JSONObject(); JSONObject deleteTag2=new JSONObject();
deleteTag2.put("operatorId",xmAppApi.getLoginInfo().getAdminId()); deleteTag2.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
deleteTag2.put("brandId",xmAppApi.getLoginInfo().getBrandId()); deleteTag2.put("brandId",xmAppApi.getLoginInfo().getBrandId());
deleteTag2.put("studioId",xmAppApi.getLoginInfo().getStudioId()); deleteTag2.put("studioId",xmAppApi.getLoginInfo().getStudioId());
deleteTag2.put("id","1768900252624130050"); deleteTag2.put("id","1801151244447690753");
deleteTag2.put("confirm",""); deleteTag2.put("confirm","");
xmAppApi.doRequest(RequestType.JSON,params,deleteTag2.toJSONString(),headers).assetsSuccess(true); xmAppApi.doRequest(RequestType.JSON,params,deleteTag2.toJSONString(),headers).assetsSuccess(true);
......
src/main/java/com/xiaomai/cases/polar/setting/tag/TestEdit.java
package com.xiaomai.cases.polar.setting.tag; package com.xiaomai.cases.polar.setting.tag;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.admin.AdminTools;
import com.xiaomai.cases.polar.clue.MemberTools; import com.xiaomai.cases.polar.clue.MemberTools;
import com.xiaomai.cases.polar.setting.TagTools;
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;
...@@ -18,6 +18,8 @@ public class TestEdit extends XMBaseTest { ...@@ -18,6 +18,8 @@ public class TestEdit extends XMBaseTest {
TagTools tagTools=new TagTools(); TagTools tagTools=new TagTools();
MemberTools memberTools=new MemberTools(); MemberTools memberTools=new MemberTools();
AdminTools adminTools=new AdminTools();
String tagId1; String tagId1;
String tagId2; String tagId2;
String tagId3; String tagId3;
...@@ -26,7 +28,7 @@ public class TestEdit extends XMBaseTest { ...@@ -26,7 +28,7 @@ public class TestEdit extends XMBaseTest {
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Setting) xmAppApi.setApiModule(ApiModule.Polar_Setting)
.setApiName("API_tag_edit") .setApiName("API_tag_edit")
.setLoginUser(LoginAccount.YFF_DEV) .setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
dal.setCase_owner("yff") dal.setCase_owner("yff")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
...@@ -62,14 +64,18 @@ public class TestEdit extends XMBaseTest { ...@@ -62,14 +64,18 @@ public class TestEdit extends XMBaseTest {
@Test(description = "编辑标签--已被本场馆会员使用-同步编辑使用此标签会员的标签") @Test(description = "编辑标签--已被本场馆会员使用-同步编辑使用此标签会员的标签")
public void testEdit_1(){ public void testEdit_1(){
//memberId：1768875352924524545-自动化标签会员勿动1（还不能删除线索，不添加这么多，暂时先用一个） //memberId：1801136353800269825-自动化标签会员勿动1（还不能删除线索，不添加这么多，暂时先用一个）
//增加标签 //增加标签
JSONObject createTag=tagTools.tagCreate("自动化标签勿动2"); JSONObject createTag=tagTools.tagCreate("自动化标签勿动2");
tagId2=createTag.getString("result"); tagId2=createTag.getString("result");
//获取当前员工昵称
JSONObject nickNameResult=adminTools.getStudioAdmin(xmAppApi.getLoginInfo().getAdminId());
String nickName=nickNameResult.getJSONObject("result").getString("nickName");
//给会员添加标签 //给会员添加标签
JSONObject forceUpdate=tagTools.forceUpdate("1768875352924524545","自动化标签会员勿动1","10022233333","POTENTIAL",tagId2); JSONObject forceUpdate=tagTools.forceUpdate("1801136353800269825","自动化标签会员勿动1",nickName,"10022233333","POTENTIAL",tagId2);
//编辑标签 //编辑标签
JSONObject editTag1=new JSONObject(); JSONObject editTag1=new JSONObject();
...@@ -93,7 +99,7 @@ public class TestEdit extends XMBaseTest { ...@@ -93,7 +99,7 @@ public class TestEdit extends XMBaseTest {
Assert.assertEquals(1,total,"已被本场馆使用标签编辑失败"); Assert.assertEquals(1,total,"已被本场馆使用标签编辑失败");
//查看会员详情的标签名有没有更新 //查看会员详情的标签名有没有更新
JSONObject findDetailById=memberTools.getDetailById("1768875352924524545"); JSONObject findDetailById=memberTools.getDetailById("1801136353800269825");
String label=findDetailById.getJSONObject("result").getJSONArray("tags").getJSONObject(0).getString("label"); String label=findDetailById.getJSONObject("result").getJSONArray("tags").getJSONObject(0).getString("label");
Assert.assertEquals(label,"自动化编辑呀","此标签被使用的会员未同步更新标签"); Assert.assertEquals(label,"自动化编辑呀","此标签被使用的会员未同步更新标签");
...@@ -101,14 +107,14 @@ public class TestEdit extends XMBaseTest { ...@@ -101,14 +107,14 @@ public class TestEdit extends XMBaseTest {
@Test(description = "编辑标签--已被非本场馆会员使用-不能编辑") @Test(description = "编辑标签--已被非本场馆会员使用-不能编辑")
public void testEdit_2() { public void testEdit_2() {
//被别的场馆使用：tagId：1768900252624130050;memberId：1768900398913064961-自动化标签会员勿动1 //被别的场馆使用：tagId：1801151244447690753-自动化标签勿动;memberId：1801150921062658049-自动化标签会员勿动1
//编辑标签 //编辑标签
JSONObject editTag2=new JSONObject(); JSONObject editTag2=new JSONObject();
editTag2.put("bizAccountId",xmAppApi.getLoginInfo().getAdminId()); editTag2.put("bizAccountId",xmAppApi.getLoginInfo().getAdminId());
editTag2.put("brandId",xmAppApi.getLoginInfo().getBrandId()); editTag2.put("brandId",xmAppApi.getLoginInfo().getBrandId());
editTag2.put("studioId",xmAppApi.getLoginInfo().getStudioId()); editTag2.put("studioId",xmAppApi.getLoginInfo().getStudioId());
editTag2.put("label","自动化编辑"+RandomStringUtil.randomString(2)); editTag2.put("label","自动化编辑"+RandomStringUtil.randomString(2));
editTag2.put("id","1768900252624130050"); editTag2.put("id","1801151244447690753");
xmAppApi.doRequest(RequestType.JSON,params,editTag2.toJSONString(),headers).assetsSuccess(true); xmAppApi.doRequest(RequestType.JSON,params,editTag2.toJSONString(),headers).assetsSuccess(true);
JSONObject response=xmAppApi.getBodyInJSON(); JSONObject response=xmAppApi.getBodyInJSON();
...@@ -119,7 +125,7 @@ public class TestEdit extends XMBaseTest { ...@@ -119,7 +125,7 @@ public class TestEdit extends XMBaseTest {
@Test(description = "编辑标签--编辑相同标签名失败") @Test(description = "编辑标签--编辑相同标签名失败")
public void testEdit_3() { public void testEdit_3() {
//被别的场馆使用：tagId：1768900252624130050;memberId：1768900398913064961-自动化标签会员勿动1 //被别的场馆使用：tagId：1801151244447690753-自动化标签勿动;memberId：1801150921062658049-自动化标签会员勿动1
//增加标签 //增加标签
JSONObject createTag=tagTools.tagCreate("自动化标签勿动3"); JSONObject createTag=tagTools.tagCreate("自动化标签勿动3");
...@@ -130,7 +136,7 @@ public class TestEdit extends XMBaseTest { ...@@ -130,7 +136,7 @@ public class TestEdit extends XMBaseTest {
editTag3.put("bizAccountId",xmAppApi.getLoginInfo().getAdminId()); editTag3.put("bizAccountId",xmAppApi.getLoginInfo().getAdminId());
editTag3.put("brandId",xmAppApi.getLoginInfo().getBrandId()); editTag3.put("brandId",xmAppApi.getLoginInfo().getBrandId());
editTag3.put("studioId",xmAppApi.getLoginInfo().getStudioId()); editTag3.put("studioId",xmAppApi.getLoginInfo().getStudioId());
editTag3.put("label","自动化标签勿删"); editTag3.put("label","自动化标签勿动");
editTag3.put("id",tagId3); editTag3.put("id",tagId3);
xmAppApi.doRequest(RequestType.JSON,params,editTag3.toJSONString(),headers).assetsSuccess(false); xmAppApi.doRequest(RequestType.JSON,params,editTag3.toJSONString(),headers).assetsSuccess(false);
......
src/main/java/com/xiaomai/cases/polar/setting/tag/TestFetchPage.java
...@@ -18,7 +18,7 @@ public class TestFetchPage extends XMBaseTest { ...@@ -18,7 +18,7 @@ public class TestFetchPage extends XMBaseTest {
xmAppApi.setApiModule(ApiModule.Polar_Setting) xmAppApi.setApiModule(ApiModule.Polar_Setting)
.setApiName("API_tag_fetchPage") .setApiName("API_tag_fetchPage")
.setLoginUser(LoginAccount.YFF_DEV) .setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
dal.setCase_owner("yff") dal.setCase_owner("yff")
...@@ -35,6 +35,8 @@ public class TestFetchPage extends XMBaseTest { ...@@ -35,6 +35,8 @@ public class TestFetchPage extends XMBaseTest {
jsonObject.put("current",0); jsonObject.put("current",0);
jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId()); jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId());
jsonObject.put("needUsageInfo","true"); jsonObject.put("needUsageInfo","true");
jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId());
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);
JSONObject response=xmAppApi.getBodyInJSON(); JSONObject response=xmAppApi.getBodyInJSON();
...@@ -50,6 +52,8 @@ public class TestFetchPage extends XMBaseTest { ...@@ -50,6 +52,8 @@ public class TestFetchPage extends XMBaseTest {
jsonObject.put("current",0); jsonObject.put("current",0);
jsonObject.put("brandId",""); jsonObject.put("brandId","");
jsonObject.put("needUsageInfo","true"); jsonObject.put("needUsageInfo","true");
jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId());
jsonObject.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
xmAppApi.doRequest(RequestType.JSON,params,jsonObject.toJSONString(),headers).assetsSuccess(false); xmAppApi.doRequest(RequestType.JSON,params,jsonObject.toJSONString(),headers).assetsSuccess(false);
Assert.assertEquals(XMJSONPath.readPath(xmAppApi.getBodyInJSON(),"$message"),"品牌id不能为空"); Assert.assertEquals(XMJSONPath.readPath(xmAppApi.getBodyInJSON(),"$message"),"品牌id不能为空");
......
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