Merge remote-tracking branch 'origin/master'

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

@@ -22,7 +22,7 @@ public class OrderCTools extends XMBaseTest {
      * @param receivableAmount:应收金额
      * @param receivableAmount:应收金额
      * @author: yangfangfang
      * @author: yangfangfang
      **/
      **/
-    public JSONObject purchaseCard(String activatePattern, String cardId, String cardSnapshotId, String memberId, BigDecimal receivableAmount, String commodityCardType,DataUserInfo...dataUserInfos) {
+    public JSONObject purchaseCard(String activatePattern, String cardId, String cardSnapshotId, String memberId, BigDecimal receivableAmount,DataUserInfo...dataUserInfos) {
 
 
         dataApi.setApiModule(ApiModule.Lunar_Order)
         dataApi.setApiModule(ApiModule.Lunar_Order)
                 .setApiName("API_purchaseCard")
                 .setApiName("API_purchaseCard")

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

@@ -56,17 +56,19 @@ public class TestMiNiPay extends BaseTestImpl {
         }
         }
 
 
         //获取会员卡
         //获取会员卡
-        cardId=minCardTools.fetchOnSaleMemberCard("次卡").getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
-        BigDecimal price=new BigDecimal(minCardTools.fetchOnSaleMemberCard("次卡").getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("price"));
+
+        JSONObject memberCardResult=minCardTools.fetchOnSaleMemberCard("次卡").getJSONObject("result").getJSONArray("records").getJSONObject(0);
+        cardId=memberCardResult.getString("id");
+        BigDecimal price=new BigDecimal(memberCardResult.getString("price"));
 
 
         try {
         try {
-            Thread.sleep(3000);
+            Thread.sleep(1000);
         } catch (InterruptedException e) {
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
             throw new RuntimeException(e);
         }
         }
 
 
         //购买C端非0元会员卡
         //购买C端非0元会员卡
-        JSONObject purchaseCardResult=orderCTools.purchaseCard("PURCHASE",cardId,cardId,memberId,price,"MEMBER_CARD");
+        JSONObject purchaseCardResult=orderCTools.purchaseCard("PURCHASE",cardId,cardId,memberId,price);
         String voucherId=purchaseCardResult.getJSONObject("result").getString("voucherId");//订单ID
         String voucherId=purchaseCardResult.getJSONObject("result").getString("voucherId");//订单ID
 
 
         try {
         try {