订单以及修改使用创建订单方法的类

src/main/java/com/xiaomai/cases/lunar/order/TestPurchaseCard.java

@@ -16,6 +16,8 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import java.math.BigDecimal;
+
 public class TestPurchaseCard extends BaseTestImpl {
 
     String memberId;
@@ -142,18 +144,46 @@ public class TestPurchaseCard extends BaseTestImpl {
         int total=Integer.parseInt(pageVoucherResult.getJSONObject("result").getString("total"));
         Assert.assertEquals(total>=1,true,"订单管理列表获取创建的签单订单失败");
 
-        //获取B端订单详情
+        //获取B端签单订单详情
         JSONObject getDetailBResult=orderTools.getDetail(signId);
         String getDetailBId = getDetailBResult.getJSONObject("result").getString("id");
         String getDetailBBusinessNo = getDetailBResult.getJSONObject("result").getString("businessNo");
         String getDetailBSource=getDetailBResult.getJSONObject("result").getString("source");
+        String getDetailBmemberId=getDetailBResult.getJSONObject("result").getJSONObject("receiver").getString("id");//会员id
+        BigDecimal quantity= new BigDecimal(getDetailBResult.getJSONObject("result").getJSONArray("voucherItems").getJSONObject(0).getJSONObject("purchaseCardSkuAttr").getJSONArray("skuItemAttrs").getJSONObject(0).getString("quantity"));
         Assert.assertEquals(getDetailBId.equals(signId),true,"C端创建的签单订单在B端和C端展示的订单id不一致");
         Assert.assertEquals(getDetailBBusinessNo.equals(getDetailBusinessNo),true,"C端创建的签单订单在B端和C端展示的订单号不一致");
         Assert.assertEquals(getDetailBSource,"ONLINE_MALL","C端创建的签单订单,B端展示订单来源非会员创建");
 
 
+        //B端退C端订单
+
+        try {
+            Thread.sleep(3000);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+
+        //查询要退的卡id 从listUserRefundableCard-查询用户可退的会员卡列表中获取
+
+        JSONObject listUserRefundableCardResult=orderTools.listUserRefundableCard("MEMBER","",getDetailBmemberId,dataUserInfo);
+        String listUserRefundableId=listUserRefundableCardResult.getJSONArray("result").getJSONObject(0).getString("id");
+
+
+        //查询订单或者收支可退流水金额（包含乐动收银状态信息）
 
+        boolean checkRefundableAmountResult=orderTools.checkRefundableAmount(getDetailBId,0,dataUserInfo).getBoolean("success");
 
+        if(checkRefundableAmountResult == true) {
+
+            //退单-会员卡
+            JSONObject refundOrderResult = orderTools.refundOrder(0, listUserRefundableId, quantity, 0, "MEMBER_CARD",
+                    getDetailBmemberId, 0, 0, "1",dataUserInfo);
+            String refundOrderSuccess = refundOrderResult.getString("success");
+            String refundOrderGetDetailId = refundOrderResult.getString("result");
+            Assert.assertEquals(refundOrderSuccess, "true", "创建的C端订单退单失败");
+
+        }
 
     }
 

src/main/java/com/xiaomai/cases/lunar/reserve/TestAddMemberReserve.java

@@ -24,6 +24,7 @@ import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Random;
 
@@ -217,14 +218,14 @@ public class TestAddMemberReserve extends BaseTestImpl {
         JSONObject fetchPageOfMemberCard = cardTools.fetchPageOfMemberCard(courseId,dataUserInfo);
         int total = Integer.parseInt(fetchPageOfMemberCard.getString("total"));
         String cardId = "";
-        int quantity = 0;
+        BigDecimal quantity = new BigDecimal(0);
         float price = 0;
         int validPeriod = 0;
         if (total == 0) {
             cardId = cardTools.memberCardCreate("约课使用会员卡"+ TimeUtils.getCurrentTime(),dataUserInfo).getString("result");
         }
         cardId = fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("id");
-        quantity = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("balance"));
+        quantity = new BigDecimal(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("balance"));
         price = Float.parseFloat(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("price"));
         validPeriod = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("validPeriod"));
 
@@ -243,7 +244,7 @@ public class TestAddMemberReserve extends BaseTestImpl {
         if( limitResult == true){
             //创建订单
             JSONObject orderResult=orderTools.signOrder(cardId,latestSnapshotId,quantity,price,validPeriod,latestSnapshotId, price/2,"PURCHASE",
-                    "MEMBER_CARD",memberId,price-price/2,price-price/2,"1");
+                    "MEMBER_CARD",memberId,price-price/2,price-price/2,"1",dataUserInfo);
 
         }
     }

src/main/java/com/xiaomai/cases/lunar/reserve/TestAddToQueue.java

@@ -25,6 +25,7 @@ import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Random;
 
@@ -146,8 +147,8 @@ public class TestAddToQueue extends BaseTestImpl {
     @DataProvider
     public Object[][] data(){
         return new Object[][]{
-                {"reserve","FULL_CAPACITY"},// 已经排队再次预约
-                {"queue","排队失败，无需重复添加"}, // 已排队再次排队
+                {"reserve","FULL_CAPACITY,会员已约该课程，不可重复预约"},// 已经排队再次预约
+                {"queue","排队失败，无需重复添加,会员已约该课程，不可重复预约"}, // 已排队再次排队
                 {"cancel","排队取消成功"},
                 {"notQueue","排队失败，课次未开放预约"},
                 {"queuing","排队成功"}
@@ -162,12 +163,12 @@ public class TestAddToQueue extends BaseTestImpl {
 
         switch(type) {
             case "reserve":
-                reserveCTools.memberReserveAdd("",chiefCoachId,memberInfo.getString(1),"",memberInfo.getString(0),1,scheduleId,startTime,true);
-                Assert.assertEquals(dataApi.getBodyInJSON().getJSONObject("result").getString("resultCode"),msg,"排队异常提示信息不符合");
+                reserveCTools.memberReserveAdd("",chiefCoachId,memberInfo.getString(1),"",memberInfo.getString(0),1,scheduleId,startTime,false);
+                Assert.assertTrue(dataApi.getBodyInJSON().getJSONObject("result").getString("resultCode").contains(msg) || dataApi.getBodyInJSON().getString("message").contains(msg),"排队异常提示信息不符合");
                 break;
             case "queue":
                 reserveCTools.addToQueue("",chiefCoachId,memberInfo.getString(0),memberInfo.getString(1),"",1,scheduleId,startTime,false);
-                Assert.assertEquals(dataApi.getBodyInJSON().getString("message"),msg,"排队异常提示信息不符合");
+                Assert.assertTrue(dataApi.getBodyInJSON().getString("message").contains(msg),"排队异常提示信息不符合");
                 break;
             case "cancel":
                 // 取消排队
@@ -298,14 +299,14 @@ public class TestAddToQueue extends BaseTestImpl {
         JSONObject fetchPageOfMemberCard = cardTools.fetchPageOfMemberCard(courseId,dataUserInfo);
         int total = Integer.parseInt(fetchPageOfMemberCard.getString("total"));
         String cardId = "";
-        int quantity = 0;
+        BigDecimal quantity = new BigDecimal(0);
         float price = 0;
         int validPeriod = 0;
         if (total == 0) {
             cardId = cardTools.memberCardCreate("约课使用会员卡"+ TimeUtils.getCurrentTime(),dataUserInfo).getString("result");
         }
         cardId = fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("id");
-        quantity = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("balance"));
+        quantity = new BigDecimal(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("balance"));
         price = Float.parseFloat(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("price"));
         validPeriod = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("validPeriod"));
 
@@ -324,7 +325,7 @@ public class TestAddToQueue extends BaseTestImpl {
         if( limitResult == true){
             //创建订单
             JSONObject orderResult=orderTools.signOrder(cardId,latestSnapshotId,quantity,price,validPeriod,latestSnapshotId, price/2,"PURCHASE",
-                    "MEMBER_CARD",memberId,price-price/2,price-price/2,"1");
+                    "MEMBER_CARD",memberId,price-price/2,price-price/2,"1",dataUserInfo);
         }
     }
 

src/main/java/com/xiaomai/cases/lunar/reserve/TestXCXSignIn.java

@@ -24,6 +24,7 @@ import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Random;
@@ -241,14 +242,14 @@ public class TestXCXSignIn extends BaseTestImpl {
         JSONObject fetchPageOfMemberCard = cardTools.fetchPageOfMemberCard(courseId,dataUserInfo);
         int total = Integer.parseInt(fetchPageOfMemberCard.getString("total"));
         String cardId = "";
-        int quantity = 0;
+        BigDecimal quantity = new BigDecimal(0);
         float price = 0;
         int validPeriod = 0;
         if (total == 0) {
             cardId = cardTools.memberCardCreate("约课使用会员卡"+ TimeUtils.getCurrentTime(),dataUserInfo).getString("result");
         }
         cardId = fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("id");
-        quantity = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("balance"));
+        quantity = new BigDecimal(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("balance"));
         price = Float.parseFloat(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("price"));
         validPeriod = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("validPeriod"));
 
@@ -267,7 +268,7 @@ public class TestXCXSignIn extends BaseTestImpl {
         if( limitResult == true){
             //创建订单
             JSONObject orderResult=orderTools.signOrder(cardId,latestSnapshotId,quantity,price,validPeriod,latestSnapshotId, price/2,"PURCHASE",
-                    "MEMBER_CARD",memberId,price-price/2,price-price/2,"1");
+                    "MEMBER_CARD",memberId,price-price/2,price-price/2,"1",dataUserInfo);
         }
     }
 

src/main/java/com/xiaomai/cases/polar/finance/order/OrderTools.java

@@ -10,6 +10,8 @@ import com.xiaomai.utils.RandomStringUtil;
 import com.xiaomai.utils.TimeUtils;
 import com.xiaomai.utils.XMBaseTest;
 
+import java.math.BigDecimal;
+
 
 public class OrderTools extends XMBaseTest {
 
@@ -340,7 +342,7 @@ public class OrderTools extends XMBaseTest {
 
     /**
      * @param
-     * @description: 检查会员对该卡是否超出购买上限
+     * @description: 创建订单
      * @param cardId:卡id
      * @param cardSnapshotId：卡快照id
      * @param quantity：次数
@@ -356,7 +358,7 @@ public class OrderTools extends XMBaseTest {
      * @author: yangfangfang
      **/
 
-    public JSONObject signOrder(String cardId,String cardSnapshotId,int quantity,float price,int validPeriod,String latestSnapshotId,float deductionAmount,String activatePattern,
+    public JSONObject signOrder(String cardId,String cardSnapshotId,BigDecimal quantity,float price,int validPeriod,String latestSnapshotId,float deductionAmount,String activatePattern,
                                 String commodityCardType,String memberId,float receivableAmount,float amount,String paymentWay,DataUserInfo...dataUserInfos){
 
 
@@ -573,7 +575,6 @@ public class OrderTools extends XMBaseTest {
     }
 
 
-
     /**
      * @param
      * @description:取消订单
@@ -640,7 +641,7 @@ public class OrderTools extends XMBaseTest {
      * @param paymentWay：支付方式
      * @author: yangfangfang
      **/
-    public JSONObject refundOrder(int giftQuantity, String memberCardId,int quantity,float refundAmount,String commodityCardType,String  memberId, float receivableAmount,
+    public JSONObject refundOrder(int giftQuantity, String memberCardId,BigDecimal quantity,float refundAmount,String commodityCardType,String  memberId, float receivableAmount,
                                    float amount,String paymentWay,DataUserInfo...dataUserInfos){
 
         dataApi.setApiModule(ApiModule.Polar_Finance)

src/main/java/com/xiaomai/cases/polar/finance/order/TestCancel.java

@@ -13,6 +13,8 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.math.BigDecimal;
+
 public class TestCancel extends XMBaseTest {
 
     String memberId;
@@ -64,7 +66,7 @@ public class TestCancel extends XMBaseTest {
         }
         JSONObject memberCard=orderTools.fetchPageOfMemberCard("次卡");
         cardId=memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
-        int quantity= Integer.parseInt(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("balance"));
+        BigDecimal quantity= new BigDecimal(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("balance"));
         float price= Float.parseFloat(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("price"));
         int validPeriod= Integer.parseInt(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("validPeriod"));
 

src/main/java/com/xiaomai/cases/polar/finance/order/TestDiscard.java

@@ -15,6 +15,8 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.math.BigDecimal;
+
 public class TestDiscard extends XMBaseTest {
     String memberId;
 
@@ -66,7 +68,7 @@ public class TestDiscard extends XMBaseTest {
         }
         JSONObject memberCard=orderTools.fetchPageOfMemberCard("次卡");
         cardId=memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
-        int quantity= Integer.parseInt(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("balance"));
+        BigDecimal quantity= new BigDecimal(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("balance"));
         float price= Float.parseFloat(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("price"));
         int validPeriod= Integer.parseInt(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("validPeriod"));
 

src/main/java/com/xiaomai/cases/polar/finance/order/TestModifyMemo.java

@@ -15,6 +15,7 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.math.BigDecimal;
 import java.util.Random;
 
 public class TestModifyMemo extends XMBaseTest {
@@ -67,7 +68,7 @@ public class TestModifyMemo extends XMBaseTest {
         }
         JSONObject memberCard=orderTools.fetchPageOfMemberCard("次卡");
         cardId=memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
-        int quantity= Integer.parseInt(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("balance"));
+        BigDecimal quantity= new BigDecimal(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("balance"));
         float price= Float.parseFloat(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("price"));
         int validPeriod= Integer.parseInt(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("validPeriod"));
 

src/main/java/com/xiaomai/cases/polar/finance/order/TestPay.java

@@ -15,6 +15,8 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.math.BigDecimal;
+
 public class TestPay extends XMBaseTest {
 
     String memberId;
@@ -67,7 +69,7 @@ public class TestPay extends XMBaseTest {
         }
         JSONObject memberCard=orderTools.fetchPageOfMemberCard("次卡");
         cardId=memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
-        int quantity= Integer.parseInt(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("balance"));
+        BigDecimal quantity= new BigDecimal(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("balance"));
         float price= Float.parseFloat(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("price"));
         int validPeriod= Integer.parseInt(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("validPeriod"));
 

src/main/java/com/xiaomai/cases/polar/finance/order/TestRefundOrder.java

@@ -15,6 +15,7 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.math.BigDecimal;
 
 
 public class TestRefundOrder extends XMBaseTest {
@@ -71,7 +72,7 @@ public class TestRefundOrder extends XMBaseTest {
         }
         JSONObject memberCard=orderTools.fetchPageOfMemberCard("次卡");
         cardId=memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
-        int quantity= Integer.parseInt(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("balance"));
+        BigDecimal quantity= new BigDecimal(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("balance"));
         float price= Float.parseFloat(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("price"));
         int validPeriod= Integer.parseInt(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("validPeriod"));
 

src/main/java/com/xiaomai/cases/polar/finance/order/TestSignOrder.java

@@ -15,6 +15,8 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.math.BigDecimal;
+
 
 public class TestSignOrder extends XMBaseTest {
 
@@ -68,7 +70,7 @@ public class TestSignOrder extends XMBaseTest {
         }
         JSONObject memberCard=orderTools.fetchPageOfMemberCard("次卡");
         cardId=memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
-        int quantity= Integer.parseInt(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("balance"));
+        BigDecimal quantity= new BigDecimal(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("balance"));
         float price= Float.parseFloat(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("price"));
         int validPeriod= Integer.parseInt(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("validPeriod"));
 

src/main/java/com/xiaomai/cases/polar/finance/revenueAndExpenditure/TestUploadResources.java

@@ -18,6 +18,7 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 
 public class TestUploadResources extends XMBaseTest {
 
@@ -47,7 +48,7 @@ public class TestUploadResources extends XMBaseTest {
     }
 
     @Test(description = "收支（收支明细&订单详情-支付记录）上传支付凭证-3张")
-    public void testUploadResources() throws IOException {
+    public void testUploadResources()  {
 
 
         String name = "创建订单潜在会员"+ RandomStringUtil.randomString(3);
@@ -74,7 +75,7 @@ public class TestUploadResources extends XMBaseTest {
         }
         JSONObject memberCard=orderTools.fetchPageOfMemberCard("次卡");
         cardId=memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
-        int quantity= Integer.parseInt(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("balance"));
+        BigDecimal quantity= new BigDecimal(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("balance"));
         float price= Float.parseFloat(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("price"));
         int validPeriod= Integer.parseInt(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("validPeriod"));
 

src/main/java/com/xiaomai/cases/polar/member/TestAppointCoach.java

@@ -19,6 +19,7 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -113,14 +114,14 @@ public class TestAppointCoach extends XMBaseTest {
         JSONObject fetchPageOfMemberCard = cardTools.fetchPageOfMemberCard(courseId);
         int total = Integer.parseInt(fetchPageOfMemberCard.getString("total"));
         String cardId = "";
-        int quantity = 0;
+        BigDecimal quantity = new BigDecimal(0);
         float price = 0;
         int validPeriod = 0;
         if (total == 0) {
             cardId = cardTools.memberCardCreate("约课使用会员卡"+TimeUtils.getCurrentTime()).getString("result");
         }
         cardId = fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("id");
-        quantity = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("balance"));
+        quantity = new BigDecimal(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("balance"));
         price = Float.parseFloat(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("price"));
         validPeriod = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("validPeriod"));
 

src/main/java/com/xiaomai/cases/polar/member/TestForceUpdate.java

@@ -18,6 +18,8 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.math.BigDecimal;
+
 public class TestForceUpdate extends XMBaseTest {
     String cardId;
 
@@ -58,7 +60,7 @@ public class TestForceUpdate extends XMBaseTest {
         }
         JSONObject memberCard=orderTools.fetchPageOfMemberCard("次卡");
         cardId=memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
-        int quantity= Integer.parseInt(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("balance"));
+        BigDecimal quantity= new BigDecimal(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("balance"));
         float price= Float.parseFloat(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("price"));
         int validPeriod= Integer.parseInt(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("validPeriod"));
 

src/main/java/com/xiaomai/cases/polar/reserve/TestAddMemberReserve.java

@@ -23,6 +23,7 @@ import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Random;
 
@@ -312,14 +313,14 @@ public class TestAddMemberReserve extends BaseTestImpl {
         JSONObject fetchPageOfMemberCard = cardTools.fetchPageOfMemberCard(courseId);
         int total = Integer.parseInt(fetchPageOfMemberCard.getString("total"));
         String cardId = "";
-        int quantity = 0;
+        BigDecimal quantity = new BigDecimal(0) ;
         float price = 0;
         int validPeriod = 0;
         if (total == 0) {
             cardId = cardTools.memberCardCreate("约课使用会员卡"+TimeUtils.getCurrentTime()).getString("result");
         }
         cardId = fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("id");
-        quantity = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("balance"));
+        quantity = new BigDecimal(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("balance"));
         price = Float.parseFloat(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("price"));
         validPeriod = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("validPeriod"));
 

src/main/java/com/xiaomai/cases/polar/reserve/TestAddToQueue.java

@@ -22,6 +22,7 @@ import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Random;
 
@@ -130,8 +131,8 @@ public class TestAddToQueue extends BaseTestImpl {
     @DataProvider
     public Object[][] data(){
         return new Object[][]{
-                {"memberId1","排队失败，无需重复添加"},// 已经在课次排队
-                {"memberId2","排队失败，无需重复添加"} // 已排队再次排队
+                {"memberId1","排队失败，无需重复添加,会员已约该课程，不可重复预约"},// 已经在课次排队
+                {"memberId2","排队失败，无需重复添加,会员已约该课程，不可重复预约"} // 已排队再次排队
 
         };
     }
@@ -140,7 +141,7 @@ public class TestAddToQueue extends BaseTestImpl {
         String memberId = member.equals(memberId1) ? memberId1.getString(0) : memberId2.getString(0);
         String benefitId = member.equals(memberId1) ? memberId1.getString(1) : memberId2.getString(1);
         reserveTools.addToQueue("",xmAppApi.getLoginInfo().getAdminId(),memberId,benefitId,"",1,scheduleId,startTime,false);
-        Assert.assertEquals(dataApi.getBodyInJSON().getString("message"),message,"排队提示信息不符合");
+        Assert.assertTrue(dataApi.getBodyInJSON().getString("message").contains(message),"排队提示信息不符合");
     }
 
     @Test(priority = 2,description = "在创建一个排队学员，进行排队，排在第二位，将第一位的排队取消，check 学员排在第一，将课次学员取消， check学员在课次中，并排队成功")
@@ -221,14 +222,14 @@ public class TestAddToQueue extends BaseTestImpl {
         JSONObject fetchPageOfMemberCard = cardTools.fetchPageOfMemberCard(courseId);
         int total = Integer.parseInt(fetchPageOfMemberCard.getString("total"));
         String cardId = "";
-        int quantity = 0;
+        BigDecimal quantity = new BigDecimal(0);
         float price = 0;
         int validPeriod = 0;
         if (total == 0) {
             cardId = cardTools.memberCardCreate("约课使用会员卡"+TimeUtils.getCurrentTime()).getString("result");
         }
         cardId = fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("id");
-        quantity = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("balance"));
+        quantity = new BigDecimal(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("balance"));
         price = Float.parseFloat(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("price"));
         validPeriod = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("validPeriod"));
 

src/main/java/com/xiaomai/cases/polar/reserve/TestSignIn.java

@@ -21,6 +21,7 @@ import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Random;
 
@@ -194,14 +195,14 @@ public class TestSignIn extends BaseTestImpl {
         JSONObject fetchPageOfMemberCard = cardTools.fetchPageOfMemberCard(courseId);
         int total = Integer.parseInt(fetchPageOfMemberCard.getString("total"));
         String cardId = "";
-        int quantity = 0;
+        BigDecimal quantity = new BigDecimal(0);
         float price = 0;
         int validPeriod = 0;
         if (total == 0) {
             cardId = cardTools.memberCardCreate("约课使用会员卡"+TimeUtils.getCurrentTime()).getString("result");
         }
         cardId = fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("id");
-        quantity = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("balance"));
+        quantity = new BigDecimal(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("balance"));
         price = Float.parseFloat(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("price"));
         validPeriod = Integer.parseInt(fetchPageOfMemberCard.getJSONArray("records").getJSONObject(0).getString("validPeriod"));