Commit 52376a5f by yangfangfang

订单

parent 564409a2
...@@ -60,7 +60,7 @@ public class TestCancel extends XMBaseTest { ...@@ -60,7 +60,7 @@ public class TestCancel extends XMBaseTest {
//获取会员卡列表,没有则新建一个 //获取会员卡列表,没有则新建一个
int cardTotal = Integer.parseInt(orderTools.fetchPageOfMemberCard("次卡").getJSONObject("result").getString("total")); int cardTotal = Integer.parseInt(orderTools.fetchPageOfMemberCard("次卡").getJSONObject("result").getString("total"));
if (cardTotal == 0) { if (cardTotal == 0) {
cardId = cardTools.memberCardCreate("创建订单会员卡"+ TimeUtils.getCurrentTime()).getString("result"); cardId = cardTools.memberCardCreate("次卡-创建订单会员卡"+ TimeUtils.getCurrentTime()).getString("result");
} }
JSONObject memberCard=orderTools.fetchPageOfMemberCard("次卡"); JSONObject memberCard=orderTools.fetchPageOfMemberCard("次卡");
cardId=memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id"); cardId=memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
......
...@@ -62,7 +62,7 @@ public class TestDiscard extends XMBaseTest { ...@@ -62,7 +62,7 @@ public class TestDiscard extends XMBaseTest {
//获取会员卡列表,没有则新建一个 //获取会员卡列表,没有则新建一个
int cardTotal = Integer.parseInt(orderTools.fetchPageOfMemberCard("次卡").getJSONObject("result").getString("total")); int cardTotal = Integer.parseInt(orderTools.fetchPageOfMemberCard("次卡").getJSONObject("result").getString("total"));
if (cardTotal == 0) { if (cardTotal == 0) {
cardId = cardTools.memberCardCreate("创建订单会员卡"+ TimeUtils.getCurrentTime()).getString("result"); cardId = cardTools.memberCardCreate("次卡-创建订单会员卡"+ TimeUtils.getCurrentTime()).getString("result");
} }
JSONObject memberCard=orderTools.fetchPageOfMemberCard("次卡"); JSONObject memberCard=orderTools.fetchPageOfMemberCard("次卡");
cardId=memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id"); cardId=memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
......
...@@ -63,7 +63,7 @@ public class TestModifyMemo extends XMBaseTest { ...@@ -63,7 +63,7 @@ public class TestModifyMemo extends XMBaseTest {
//获取会员卡列表,没有则新建一个 //获取会员卡列表,没有则新建一个
int cardTotal = Integer.parseInt(orderTools.fetchPageOfMemberCard("次卡").getJSONObject("result").getString("total")); int cardTotal = Integer.parseInt(orderTools.fetchPageOfMemberCard("次卡").getJSONObject("result").getString("total"));
if (cardTotal == 0) { if (cardTotal == 0) {
cardId = cardTools.memberCardCreate("创建订单会员卡"+ TimeUtils.getCurrentTime()).getString("result"); cardId = cardTools.memberCardCreate("次卡-创建订单会员卡"+ TimeUtils.getCurrentTime()).getString("result");
} }
JSONObject memberCard=orderTools.fetchPageOfMemberCard("次卡"); JSONObject memberCard=orderTools.fetchPageOfMemberCard("次卡");
cardId=memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id"); cardId=memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
......
...@@ -63,7 +63,7 @@ public class TestPay extends XMBaseTest { ...@@ -63,7 +63,7 @@ public class TestPay extends XMBaseTest {
//获取会员卡列表,没有则新建一个 //获取会员卡列表,没有则新建一个
int cardTotal = Integer.parseInt(orderTools.fetchPageOfMemberCard("次卡").getJSONObject("result").getString("total")); int cardTotal = Integer.parseInt(orderTools.fetchPageOfMemberCard("次卡").getJSONObject("result").getString("total"));
if (cardTotal == 0) { if (cardTotal == 0) {
cardId = cardTools.memberCardCreate("创建订单会员卡"+ TimeUtils.getCurrentTime()).getString("result"); cardId = cardTools.memberCardCreate("次卡-创建订单会员卡"+ TimeUtils.getCurrentTime()).getString("result");
} }
JSONObject memberCard=orderTools.fetchPageOfMemberCard("次卡"); JSONObject memberCard=orderTools.fetchPageOfMemberCard("次卡");
cardId=memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id"); cardId=memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
......
...@@ -67,7 +67,7 @@ public class TestRefundOrder extends XMBaseTest { ...@@ -67,7 +67,7 @@ public class TestRefundOrder extends XMBaseTest {
//获取会员卡列表,没有则新建一个 //获取会员卡列表,没有则新建一个
int cardTotal = Integer.parseInt(orderTools.fetchPageOfMemberCard("次卡").getJSONObject("result").getString("total")); int cardTotal = Integer.parseInt(orderTools.fetchPageOfMemberCard("次卡").getJSONObject("result").getString("total"));
if (cardTotal == 0) { if (cardTotal == 0) {
cardId = cardTools.memberCardCreate("创建订单会员卡"+ TimeUtils.getCurrentTime()).getString("result"); cardId = cardTools.memberCardCreate("次卡-创建订单会员卡"+ TimeUtils.getCurrentTime()).getString("result");
} }
JSONObject memberCard=orderTools.fetchPageOfMemberCard("次卡"); JSONObject memberCard=orderTools.fetchPageOfMemberCard("次卡");
cardId=memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id"); cardId=memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
......
...@@ -64,7 +64,7 @@ public class TestSignOrder extends XMBaseTest { ...@@ -64,7 +64,7 @@ public class TestSignOrder extends XMBaseTest {
//获取会员卡列表,没有则新建一个 //获取会员卡列表,没有则新建一个
int cardTotal = Integer.parseInt(orderTools.fetchPageOfMemberCard("次卡").getJSONObject("result").getString("total")); int cardTotal = Integer.parseInt(orderTools.fetchPageOfMemberCard("次卡").getJSONObject("result").getString("total"));
if (cardTotal == 0) { if (cardTotal == 0) {
cardId = cardTools.memberCardCreate("创建订单会员卡"+TimeUtils.getCurrentTime()).getString("result"); cardId = cardTools.memberCardCreate("次卡-创建订单会员卡"+TimeUtils.getCurrentTime()).getString("result");
} }
JSONObject memberCard=orderTools.fetchPageOfMemberCard("次卡"); JSONObject memberCard=orderTools.fetchPageOfMemberCard("次卡");
cardId=memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id"); cardId=memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
......
...@@ -33,8 +33,6 @@ public class TestUploadResources extends XMBaseTest { ...@@ -33,8 +33,6 @@ public class TestUploadResources extends XMBaseTest {
OrderTools orderTools=new OrderTools(); OrderTools orderTools=new OrderTools();
RevenueAndExpenditureTools revenueAndExpenditureTools=new RevenueAndExpenditureTools();
CardTools cardTools=new CardTools(); CardTools cardTools=new CardTools();
@BeforeMethod @BeforeMethod
...@@ -72,7 +70,7 @@ public class TestUploadResources extends XMBaseTest { ...@@ -72,7 +70,7 @@ public class TestUploadResources extends XMBaseTest {
//获取会员卡列表,没有则新建一个 //获取会员卡列表,没有则新建一个
int cardTotal = Integer.parseInt(orderTools.fetchPageOfMemberCard("次卡").getJSONObject("result").getString("total")); int cardTotal = Integer.parseInt(orderTools.fetchPageOfMemberCard("次卡").getJSONObject("result").getString("total"));
if (cardTotal == 0) { if (cardTotal == 0) {
cardId = cardTools.memberCardCreate("创建订单会员卡"+ TimeUtils.getCurrentTime()).getString("result"); cardId = cardTools.memberCardCreate("次卡-创建订单会员卡"+ TimeUtils.getCurrentTime()).getString("result");
} }
JSONObject memberCard=orderTools.fetchPageOfMemberCard("次卡"); JSONObject memberCard=orderTools.fetchPageOfMemberCard("次卡");
cardId=memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id"); cardId=memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("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