Commit 56ef759e by yangfangfang

修改订单

parent 209003dc
package com.xiaomai.cases.polar.finance.order; package com.xiaomai.cases.polar.finance.order;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.member.Tools;
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;
...@@ -12,11 +13,13 @@ import org.testng.annotations.Test; ...@@ -12,11 +13,13 @@ import org.testng.annotations.Test;
public class TestPageMemberVoucher extends XMBaseTest { public class TestPageMemberVoucher extends XMBaseTest {
Tools tools=new Tools();
@BeforeMethod @BeforeMethod
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Finance) xmAppApi.setApiModule(ApiModule.Polar_Finance)
.setApiName("API_pageMemberVoucher") .setApiName("API_pageMemberVoucher")
.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]);
...@@ -25,11 +28,15 @@ public class TestPageMemberVoucher extends XMBaseTest { ...@@ -25,11 +28,15 @@ public class TestPageMemberVoucher extends XMBaseTest {
@Test(description = "获取会员详情-订单管理列表") @Test(description = "获取会员详情-订单管理列表")
public void testPageMemberVoucher(){ public void testPageMemberVoucher(){
//获取会员ID
String receiverId=tools.search("NORMAL","NORMAL").getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
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("supplierId",xmAppApi.getLoginInfo().getStudioId()); jsonObject.put("supplierId",xmAppApi.getLoginInfo().getStudioId());
jsonObject.put("receiverId","1777254935106740226"); jsonObject.put("receiverId",receiverId);
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());
......
package com.xiaomai.cases.polar.finance.order; package com.xiaomai.cases.polar.finance.order;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.member.Tools;
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;
...@@ -12,11 +13,13 @@ import org.testng.annotations.Test; ...@@ -12,11 +13,13 @@ import org.testng.annotations.Test;
public class TestPageMemberVoucherItem extends XMBaseTest { public class TestPageMemberVoucherItem extends XMBaseTest {
Tools tools=new Tools();
@BeforeMethod @BeforeMethod
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Finance) xmAppApi.setApiModule(ApiModule.Polar_Finance)
.setApiName("API_pageMemberVoucherItem") .setApiName("API_pageMemberVoucherItem")
.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]);
...@@ -26,11 +29,16 @@ public class TestPageMemberVoucherItem extends XMBaseTest { ...@@ -26,11 +29,16 @@ public class TestPageMemberVoucherItem extends XMBaseTest {
@Test(description = "获取会员详情-订单明细列表") @Test(description = "获取会员详情-订单明细列表")
public void testPageMemberVoucherItem(){ public void testPageMemberVoucherItem(){
//获取会员ID
String receiverId=tools.search("NORMAL","NORMAL").getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
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("supplierId",xmAppApi.getLoginInfo().getStudioId()); jsonObject.put("supplierId",xmAppApi.getLoginInfo().getStudioId());
jsonObject.put("receiverId","1777254935106740226"); jsonObject.put("receiverId",receiverId);
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());
......
...@@ -19,7 +19,7 @@ public class TestPageVoucher extends XMBaseTest { ...@@ -19,7 +19,7 @@ public class TestPageVoucher extends XMBaseTest {
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Finance) xmAppApi.setApiModule(ApiModule.Polar_Finance)
.setApiName("API_pageVoucher") .setApiName("API_pageVoucher")
.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]);
...@@ -32,7 +32,6 @@ public class TestPageVoucher extends XMBaseTest { ...@@ -32,7 +32,6 @@ public class TestPageVoucher extends XMBaseTest {
jsonObject.put("current",0); jsonObject.put("current",0);
jsonObject.put("size",20); jsonObject.put("size",20);
jsonObject.put("supplierId",xmAppApi.getLoginInfo().getStudioId()); jsonObject.put("supplierId",xmAppApi.getLoginInfo().getStudioId());
jsonObject.put("receiverId","");
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());
...@@ -43,13 +42,12 @@ public class TestPageVoucher extends XMBaseTest { ...@@ -43,13 +42,12 @@ public class TestPageVoucher extends XMBaseTest {
Assert.assertEquals(success,"true","获取订单管理列表失败"); Assert.assertEquals(success,"true","获取订单管理列表失败");
} }
@Test(description = "获取财务中心-订单管理列表-无筛选-无卖家ID(场馆ID)、场馆ID、品牌ID、操作人ID") @Test(description = "获取财务中心-订单管理列表-无筛选-无卖家ID(场馆ID)、品牌ID、场馆ID、操作人ID")
public void testPageVoucher1(){ public void testPageVoucher1(){
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("supplierId",""); jsonObject.put("supplierId","");
jsonObject.put("receiverId","");
jsonObject.put("brandId",""); jsonObject.put("brandId","");
jsonObject.put("studioId",""); jsonObject.put("studioId","");
jsonObject.put("operatorId",""); jsonObject.put("operatorId","");
...@@ -63,7 +61,6 @@ public class TestPageVoucher extends XMBaseTest { ...@@ -63,7 +61,6 @@ public class TestPageVoucher extends XMBaseTest {
jsonObject.put("current",0); jsonObject.put("current",0);
jsonObject.put("size",20); jsonObject.put("size",20);
jsonObject.put("supplierId",xmAppApi.getLoginInfo().getStudioId()); jsonObject.put("supplierId",xmAppApi.getLoginInfo().getStudioId());
jsonObject.put("receiverId","");
jsonObject.put("source","OFFLINE_SOURCE"); jsonObject.put("source","OFFLINE_SOURCE");
JSONArray states=new JSONArray(); JSONArray states=new JSONArray();
...@@ -84,8 +81,7 @@ public class TestPageVoucher extends XMBaseTest { ...@@ -84,8 +81,7 @@ public class TestPageVoucher extends XMBaseTest {
jsonObject.put("operationTimeEnd",TimeUtils.getCurrentTime()); jsonObject.put("operationTimeEnd",TimeUtils.getCurrentTime());
JSONArray salesmanIds=new JSONArray(); JSONArray salesmanIds=new JSONArray();
salesmanIds.add("1772880092185255937"); salesmanIds.add(xmAppApi.getLoginInfo().getAdminId());
salesmanIds.add("1774376463837065218");
jsonObject.put("salesmanIds",salesmanIds); jsonObject.put("salesmanIds",salesmanIds);
jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId()); jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId());
......
...@@ -18,7 +18,7 @@ public class TestPageVoucherItem extends XMBaseTest { ...@@ -18,7 +18,7 @@ public class TestPageVoucherItem extends XMBaseTest {
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Finance) xmAppApi.setApiModule(ApiModule.Polar_Finance)
.setApiName("API_pageVoucherItem") .setApiName("API_pageVoucherItem")
.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]);
...@@ -31,7 +31,6 @@ public class TestPageVoucherItem extends XMBaseTest { ...@@ -31,7 +31,6 @@ public class TestPageVoucherItem extends XMBaseTest {
jsonObject.put("current",0); jsonObject.put("current",0);
jsonObject.put("size",20); jsonObject.put("size",20);
jsonObject.put("supplierId",xmAppApi.getLoginInfo().getStudioId()); jsonObject.put("supplierId",xmAppApi.getLoginInfo().getStudioId());
jsonObject.put("receiverId","");
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());
...@@ -42,13 +41,12 @@ public class TestPageVoucherItem extends XMBaseTest { ...@@ -42,13 +41,12 @@ public class TestPageVoucherItem extends XMBaseTest {
Assert.assertEquals(success,"true","获取订单明细列表失败"); Assert.assertEquals(success,"true","获取订单明细列表失败");
} }
@Test(description = "获取财务中心-订单明细列表-无筛选-无卖家ID(场馆ID)、场馆ID、品牌ID、操作人ID") @Test(description = "获取财务中心-订单明细列表-无筛选-无卖家ID(场馆ID)、品牌ID、场馆ID、操作人ID")
public void testPageVoucherItem1(){ public void testPageVoucherItem1(){
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("supplierId",""); jsonObject.put("supplierId","");
jsonObject.put("receiverId","");
jsonObject.put("brandId",""); jsonObject.put("brandId","");
jsonObject.put("studioId",""); jsonObject.put("studioId","");
jsonObject.put("operatorId",""); jsonObject.put("operatorId","");
...@@ -62,7 +60,6 @@ public class TestPageVoucherItem extends XMBaseTest { ...@@ -62,7 +60,6 @@ public class TestPageVoucherItem extends XMBaseTest {
jsonObject.put("current",0); jsonObject.put("current",0);
jsonObject.put("size",20); jsonObject.put("size",20);
jsonObject.put("supplierId",xmAppApi.getLoginInfo().getStudioId()); jsonObject.put("supplierId",xmAppApi.getLoginInfo().getStudioId());
jsonObject.put("receiverId","");
jsonObject.put("createdStart", TimeUtils.getMonthFristDay()); jsonObject.put("createdStart", TimeUtils.getMonthFristDay());
jsonObject.put("createdEnd",TimeUtils.getCurrentTime()); jsonObject.put("createdEnd",TimeUtils.getCurrentTime());
...@@ -72,8 +69,7 @@ public class TestPageVoucherItem extends XMBaseTest { ...@@ -72,8 +69,7 @@ public class TestPageVoucherItem extends XMBaseTest {
jsonObject.put("operationTimeEnd",TimeUtils.getCurrentTime()); jsonObject.put("operationTimeEnd",TimeUtils.getCurrentTime());
JSONArray salesmanIds=new JSONArray(); JSONArray salesmanIds=new JSONArray();
salesmanIds.add("1772880092185255937"); salesmanIds.add(xmAppApi.getLoginInfo().getAdminId());
salesmanIds.add("1774376463837065218");
jsonObject.put("salesmanIds",salesmanIds); jsonObject.put("salesmanIds",salesmanIds);
jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId()); jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId());
......
package com.xiaomai.cases.polar.finance.order; package com.xiaomai.cases.polar.finance.order;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.member.Tools;
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;
...@@ -12,11 +13,13 @@ import org.testng.annotations.Test; ...@@ -12,11 +13,13 @@ import org.testng.annotations.Test;
public class TestSumMemberVoucherAmount extends XMBaseTest { public class TestSumMemberVoucherAmount extends XMBaseTest {
Tools tools=new Tools();
@BeforeMethod @BeforeMethod
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Finance) xmAppApi.setApiModule(ApiModule.Polar_Finance)
.setApiName("API_sumMemberVoucherAmount") .setApiName("API_sumMemberVoucherAmount")
.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]);
...@@ -26,11 +29,14 @@ public class TestSumMemberVoucherAmount extends XMBaseTest { ...@@ -26,11 +29,14 @@ public class TestSumMemberVoucherAmount extends XMBaseTest {
@Test(description = "获取会员详情-订单管理金额统计") @Test(description = "获取会员详情-订单管理金额统计")
public void testSumMemberVoucherAmount(){ public void testSumMemberVoucherAmount(){
//获取会员ID
String receiverId=tools.search("NORMAL","NORMAL").getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
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("supplierId",xmAppApi.getLoginInfo().getStudioId()); jsonObject.put("supplierId",xmAppApi.getLoginInfo().getStudioId());
jsonObject.put("receiverId","1777254935106740226"); jsonObject.put("receiverId",receiverId);
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());
......
...@@ -19,7 +19,7 @@ public class TestSumVoucherAmount extends XMBaseTest { ...@@ -19,7 +19,7 @@ public class TestSumVoucherAmount extends XMBaseTest {
public void beforeTest() { public void beforeTest() {
xmAppApi.setApiModule(ApiModule.Polar_Finance) xmAppApi.setApiModule(ApiModule.Polar_Finance)
.setApiName("API_sumVoucherAmount") .setApiName("API_sumVoucherAmount")
.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]);
...@@ -32,7 +32,6 @@ public class TestSumVoucherAmount extends XMBaseTest { ...@@ -32,7 +32,6 @@ public class TestSumVoucherAmount extends XMBaseTest {
jsonObject.put("current", 0); jsonObject.put("current", 0);
jsonObject.put("size", 20); jsonObject.put("size", 20);
jsonObject.put("supplierId", xmAppApi.getLoginInfo().getStudioId()); jsonObject.put("supplierId", xmAppApi.getLoginInfo().getStudioId());
jsonObject.put("receiverId", "");
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());
...@@ -59,7 +58,6 @@ public class TestSumVoucherAmount extends XMBaseTest { ...@@ -59,7 +58,6 @@ public class TestSumVoucherAmount extends XMBaseTest {
jsonObject.put("current",0); jsonObject.put("current",0);
jsonObject.put("size",20); jsonObject.put("size",20);
jsonObject.put("supplierId",xmAppApi.getLoginInfo().getStudioId()); jsonObject.put("supplierId",xmAppApi.getLoginInfo().getStudioId());
jsonObject.put("receiverId","");
jsonObject.put("source","OFFLINE_SOURCE"); jsonObject.put("source","OFFLINE_SOURCE");
JSONArray states=new JSONArray(); JSONArray states=new JSONArray();
...@@ -80,8 +78,7 @@ public class TestSumVoucherAmount extends XMBaseTest { ...@@ -80,8 +78,7 @@ public class TestSumVoucherAmount extends XMBaseTest {
jsonObject.put("operationTimeEnd",TimeUtils.getCurrentTime()); jsonObject.put("operationTimeEnd",TimeUtils.getCurrentTime());
JSONArray salesmanIds=new JSONArray(); JSONArray salesmanIds=new JSONArray();
salesmanIds.add("1772880092185255937"); salesmanIds.add(xmAppApi.getLoginInfo().getAdminId());
salesmanIds.add("1774376463837065218");
jsonObject.put("salesmanIds",salesmanIds); jsonObject.put("salesmanIds",salesmanIds);
jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId()); jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId());
...@@ -102,7 +99,6 @@ public class TestSumVoucherAmount extends XMBaseTest { ...@@ -102,7 +99,6 @@ public class TestSumVoucherAmount extends XMBaseTest {
jsonObject.put("current", 0); jsonObject.put("current", 0);
jsonObject.put("size", 20); jsonObject.put("size", 20);
jsonObject.put("supplierId", ""); jsonObject.put("supplierId", "");
jsonObject.put("receiverId", "");
jsonObject.put("brandId", ""); jsonObject.put("brandId", "");
jsonObject.put("studioId", ""); jsonObject.put("studioId", "");
jsonObject.put("operatorId", ""); jsonObject.put("operatorId", "");
......
...@@ -18,7 +18,7 @@ public class TestSumVoucherItemAmount extends XMBaseTest { ...@@ -18,7 +18,7 @@ public class TestSumVoucherItemAmount extends XMBaseTest {
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Finance) xmAppApi.setApiModule(ApiModule.Polar_Finance)
.setApiName("API_sumVoucherItemAmount") .setApiName("API_sumVoucherItemAmount")
.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]);
...@@ -31,7 +31,6 @@ public class TestSumVoucherItemAmount extends XMBaseTest { ...@@ -31,7 +31,6 @@ public class TestSumVoucherItemAmount extends XMBaseTest {
jsonObject.put("current",0); jsonObject.put("current",0);
jsonObject.put("size",20); jsonObject.put("size",20);
jsonObject.put("supplierId",xmAppApi.getLoginInfo().getStudioId()); jsonObject.put("supplierId",xmAppApi.getLoginInfo().getStudioId());
jsonObject.put("receiverId","");
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());
...@@ -57,7 +56,6 @@ public class TestSumVoucherItemAmount extends XMBaseTest { ...@@ -57,7 +56,6 @@ public class TestSumVoucherItemAmount extends XMBaseTest {
jsonObject.put("current",0); jsonObject.put("current",0);
jsonObject.put("size",20); jsonObject.put("size",20);
jsonObject.put("supplierId",""); jsonObject.put("supplierId","");
jsonObject.put("receiverId","");
jsonObject.put("brandId",""); jsonObject.put("brandId","");
jsonObject.put("studioId",""); jsonObject.put("studioId","");
jsonObject.put("operatorId",""); jsonObject.put("operatorId","");
...@@ -71,7 +69,6 @@ public class TestSumVoucherItemAmount extends XMBaseTest { ...@@ -71,7 +69,6 @@ public class TestSumVoucherItemAmount extends XMBaseTest {
jsonObject.put("current",0); jsonObject.put("current",0);
jsonObject.put("size",20); jsonObject.put("size",20);
jsonObject.put("supplierId",xmAppApi.getLoginInfo().getStudioId()); jsonObject.put("supplierId",xmAppApi.getLoginInfo().getStudioId());
jsonObject.put("receiverId","");
jsonObject.put("createdStart", TimeUtils.getMonthFristDay()); jsonObject.put("createdStart", TimeUtils.getMonthFristDay());
jsonObject.put("createdEnd",TimeUtils.getCurrentTime()); jsonObject.put("createdEnd",TimeUtils.getCurrentTime());
...@@ -81,8 +78,7 @@ public class TestSumVoucherItemAmount extends XMBaseTest { ...@@ -81,8 +78,7 @@ public class TestSumVoucherItemAmount extends XMBaseTest {
jsonObject.put("operationTimeEnd",TimeUtils.getCurrentTime()); jsonObject.put("operationTimeEnd",TimeUtils.getCurrentTime());
JSONArray salesmanIds=new JSONArray(); JSONArray salesmanIds=new JSONArray();
salesmanIds.add("1772880092185255937"); salesmanIds.add(xmAppApi.getLoginInfo().getAdminId());
salesmanIds.add("1774376463837065218");
jsonObject.put("salesmanIds",salesmanIds); jsonObject.put("salesmanIds",salesmanIds);
jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId()); jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId());
......
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