Merge remote-tracking branch 'origin/master'

src/main/java/com/xiaomai/cases/polar/entry/TestMemberEntryExport.java

+package com.xiaomai.cases.polar.entry;
+
+import com.alibaba.fastjson.JSONObject;
+import com.xiaomai.cases.polar.export.ExportTool;
+import com.xiaomai.enums.ApiModule;
+import com.xiaomai.enums.LoginAccount;
+import com.xiaomai.enums.RequestType;
+import com.xiaomai.enums.Terminal;
+import com.xiaomai.utils.TimeUtils;
+import com.xiaomai.utils.XMBaseTest;
+
+
+import com.xiaomai.utils.XMJSONPath;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+
+
+public class TestMemberEntryExport extends XMBaseTest {
+
+
+    @BeforeMethod
+    public void beforeTest(){
+
+
+        xmAppApi.setApiModule(ApiModule.Polar_MemberEntry)
+                .setApiName("API_memberEntry_export")
+                .setLoginUser(LoginAccount.GYM_PROD)
+                .setTerminal(Terminal.B);
+
+        dal.setCase_owner("yj")
+                .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
+        super.beforeTest();
+    }
+    @Test(description = "入场记录导出")
+    public void testMemberEntryExport(){
+
+        ExportTool exportTool = new ExportTool();
+
+        int before = Integer.parseInt(XMJSONPath.readPath(exportTool.pageStudioExportRecord(), "$.result.total"));
+
+        JSONObject object = new JSONObject();
+        object.put("entryType",null);
+        object.put("startTime",TimeUtils.getBeforeDayDate(30));
+        object.put("endTime", TimeUtils.getTodayEndTime());
+        object.put("size",20);
+        object.put("studioId",xmAppApi.getLoginInfo().getStudioId());
+        object.put("brandId",xmAppApi.getLoginInfo().getBrandId());
+        object.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
+
+        xmAppApi.doRequest(RequestType.JSON,params,object.toString(),headers).assetsSuccess(true);
+
+        int after = Integer.parseInt(XMJSONPath.readPath(exportTool.pageStudioExportRecord(), "$.result.total"));
+        Assert.assertEquals(after,before+1);
+
+
+    }
+
+}

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

@@ -6,6 +6,7 @@ import com.xiaomai.cases.polar.memberCard.CardTools;
 import com.xiaomai.enums.ApiModule;
 import com.xiaomai.enums.ApiModule;
 import com.xiaomai.enums.LoginAccount;
 import com.xiaomai.enums.LoginAccount;
 import com.xiaomai.enums.Terminal;
 import com.xiaomai.enums.Terminal;
+import com.xiaomai.utils.RandomStringUtil;
 import com.xiaomai.utils.XMBaseTest;
 import com.xiaomai.utils.XMBaseTest;
 import com.xiaomai.utils.XMJSONPath;
 import com.xiaomai.utils.XMJSONPath;
 import org.testng.Assert;
 import org.testng.Assert;
@@ -36,6 +37,11 @@ public class TestUpdateGetdetail extends XMBaseTest {
         String ownerId ="1796482784551211010";
         String ownerId ="1796482784551211010";
         String ownerName="f昵称昵称昵称f昵称昵称昵称f昵称昵称昵";
         String ownerName="f昵称昵称昵称f昵称昵称昵称f昵称昵称昵";
 
 
+        Tools tools=new Tools();
+        String name = "退单手续费"+ RandomStringUtil.randomString(3);
+        String phone = RandomStringUtil.randomMobile("111");
+        String memberId = tools.create(name,phone).getString("result");
+
         JSONObject memberCard=orderTools.fetchPageOfMemberCard("次卡","MEMBER_CARD");
         JSONObject memberCard=orderTools.fetchPageOfMemberCard("次卡","MEMBER_CARD");
         String cardId=memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
         String cardId=memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
 
 
@@ -47,17 +53,35 @@ public class TestUpdateGetdetail extends XMBaseTest {
 
 
         int validPeriod= Integer.parseInt(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("validPeriod"));
         int validPeriod= Integer.parseInt(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("validPeriod"));
 
 
-        JSONObject orderResult= orderTools.signOrder(cardId, latestSnapshotId, quantity, price, validPeriod, latestSnapshotId, price / 2, "PURCHASE",
-                "MEMBER_CARD", "1805435813468483586", price - price / 2, price - price / 2, "1", true);
-
-        String getDetailId = orderResult.getString("result");
+        JSONObject orderResult= orderTools.signOrder(cardId, latestSnapshotId, quantity, price, validPeriod, latestSnapshotId, 0, "PURCHASE",
+                "MEMBER_CARD", memberId, price, price , "1", true);//会员签单
+        String getDetailId = orderResult.getString("result");//获取刚创建的订单id
 
 
-        orderTools.updateBusinessOwnerInfo(ownerId,ownerName,getDetailId,0.25,50);
+        orderTools.updateBusinessOwnerInfo(ownerId,ownerName,getDetailId,0.25,50);//修改业归属人
 
 
-        orderTools.getDetail(getDetailId);
-        Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.businessOwners[0].ownerId"), ownerId, "修改订单业绩人错误");
+        orderTools.getDetail(getDetailId);//查看订单详情
+        Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.businessOwners[0].ownerId"), ownerId, "修改订单业绩人错误");//断言业绩归属人
         Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.businessOwners[0].owner.name"), ownerName, "修改订单业绩人错误");
         Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.businessOwners[0].owner.name"), ownerName, "修改订单业绩人错误");
 
 
+        //System.out.println("--------"+price);//--------1.0
+
+        //退单，产生手续费
+
+        orderTools.listUserRefundableCard("MEMBER","次卡",memberId);//查看会员名下可退卡
+        String memberCardId=XMJSONPath.readPath(dataApi.getApi_response(),"$.result[0].id");//拿新购买的卡ID
+
+        JSONObject getDetailBResult=orderTools.getDetail(getDetailId);//查看订单详情
+        BigDecimal quantity1= new BigDecimal(getDetailBResult.getJSONObject("result").getJSONArray("voucherItems").getJSONObject(0).getJSONObject("purchaseCardSkuAttr").getJSONArray("skuItemAttrs").getJSONObject(0).getString("quantity"));
+        orderTools.refundOrder(ownerId,ownerName,0,memberCardId,quantity1,1,"MEMBER_CARD",memberId,0,0,"1",1,new BigDecimal(1),new BigDecimal(0));
+        String getDetailId1=XMJSONPath.readPath(dataApi.getApi_response(),"$.result");//退单订单id
+
+        orderTools.getDetail(getDetailId1);//查看退单订单详情
+        //Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.voucherItems[0].deductionAmount"), 1.0, "");
+        Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.voucherItems[0].deductionAmount"), "1.0000", "订单未产生手续费");//断言退单详情，手续费产生1元
+
+
+
+
 
 
     }
     }
 
 

src/main/java/com/xiaomai/cases/polar/memberCard/CardTools.java

@@ -947,4 +947,62 @@ public class CardTools extends XMBaseTest {
         JSONObject response = dataApi.getBodyInJSON();
         JSONObject response = dataApi.getBodyInJSON();
         return response;
         return response;
     }
     }
+    /**
+     * @param
+     * @description:延长单卡-期限卡有效期
+     * @author: yangjian
+     * @param days 延长天数
+     * @param memberCardId 卡id
+     **/
+    public JSONObject extendEffectiveDate(String days,String memberCardId, DataUserInfo... dataUserInfos) {
+
+        dataApi.setApiModule(ApiModule.Polar_Card)
+                .setApiName("API_extendEffectiveDate")
+                .setTerminal(Terminal.B);
+        super.beforeDataRequest(dataUserInfos);
+
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("days", days);
+        jsonObject.put("memberCardId", memberCardId);
+        jsonObject.put("memo", "自动化延长");
+        jsonObject.put("brandId", dataApi.getLoginInfo().getBrandId());
+        jsonObject.put("studioId", dataApi.getLoginInfo().getStudioId());
+        jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId());
+
+        dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs);
+        JSONObject response = dataApi.getBodyInJSON();
+        return response;
+    }
+
+    /**
+     * @param
+     * @description:批量延长卡有效期
+     * @author: yangjian
+     * @param days 延长天数
+     * @param accountType 类型 MEMBER会员卡 DEPOSIT储蓄卡
+     **/
+    public JSONObject batchExtEffectiveDate(String accountType,String days,DataUserInfo... dataUserInfos) {
+
+        dataApi.setApiModule(ApiModule.Polar_Card)
+                .setApiName("API_batchExtEffectiveDate")
+                .setTerminal(Terminal.B);
+        super.beforeDataRequest(dataUserInfos);
+
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("accountType", accountType);
+        jsonObject.put("activateTimeStart", TimeUtils.getTodayTime());//批量任务，数据太多，仅批量延长开卡时间是今天的卡
+        jsonObject.put("days", days);
+        jsonObject.put("memo", "自动化批量延长");
+        jsonObject.put("brandId", dataApi.getLoginInfo().getBrandId());
+        jsonObject.put("studioId", dataApi.getLoginInfo().getStudioId());
+        jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId());
+
+        dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs);
+        JSONObject response = dataApi.getBodyInJSON();
+        return response;
+    }
+
+
+
+
 }
 }

src/main/java/com/xiaomai/cases/polar/memberCard/TestCreateTerm.java

@@ -32,7 +32,7 @@ public class TestCreateTerm extends XMBaseTest {
         super.beforeTest();
         super.beforeTest();
     }
     }
     @Test(description = "创建期限卡")
     @Test(description = "创建期限卡")
-    public void testCreateTerm() {
+    public void testCreateTerm() throws InterruptedException {
         CardTools Cardtools = new CardTools();
         CardTools Cardtools = new CardTools();
         JSONArray activatePatternList = new JSONArray();
         JSONArray activatePatternList = new JSONArray();
         activatePatternList.add("PURCHASE");
         activatePatternList.add("PURCHASE");
@@ -105,6 +105,33 @@ public class TestCreateTerm extends XMBaseTest {
                 "MEMBER_CARD", memberId, price , price , "1",true);//创建期限卡订单
                 "MEMBER_CARD", memberId, price , price , "1",true);//创建期限卡订单
         String id = XMJSONPath.readPath(dataApi.getApi_response(), "$.result");//获取订单id
         String id = XMJSONPath.readPath(dataApi.getApi_response(), "$.result");//获取订单id
 
 
+
+
+
+        orderTools.fetchUserCardList("MEMBER",memberId,"NORMAL");//查看会员名下卡
+        String cardid=XMJSONPath.readPath(dataApi.getApi_response(), "$.result[0].id");//获取售出卡id
+
+        Cardtools.memberCardFindDetailById(cardid);//查看期限卡售卖记录详情
+        int before = Integer.parseInt(XMJSONPath.readPath(Cardtools.memberCardFindDetailById(cardid), "$.result.leftEffectiveDays"));//初始期限卡剩余天数
+        System.out.println("--------"+before);
+
+        Cardtools.extendEffectiveDate("1",cardid);//延长期限卡有效期1天
+
+        Cardtools.memberCardFindDetailById(cardid);//再次查看期限卡售卖记录详情
+        int after = Integer.parseInt(XMJSONPath.readPath(Cardtools.memberCardFindDetailById(cardid), "$.result.leftEffectiveDays"));//延长后期限卡剩余天数
+        System.out.println("--------"+after);
+
+        Assert.assertEquals(after,before+1);//断言有效期加了一天
+
+        Cardtools.batchExtEffectiveDate("MEMBER","1");//批量延长卡有效期 1天??
+        Thread.sleep(5000);
+
+        Cardtools.memberCardFindDetailById(cardid);//再次查看期限卡售卖记录详情
+        int after1 = Integer.parseInt(XMJSONPath.readPath(Cardtools.memberCardFindDetailById(cardid), "$.result.leftEffectiveDays"));//延长后期限卡剩余天数
+        Assert.assertEquals(after1,after+1);//断言有效期加了一天
+
+
+
         orderTools.discard(id,"订单录错","");//作废期限卡订单，新逻辑：未消耗的期限卡能直接作废订单
         orderTools.discard(id,"订单录错","");//作废期限卡订单，新逻辑：未消耗的期限卡能直接作废订单
         orderTools.getDetail(id);//查看已作废订单详情
         orderTools.getDetail(id);//查看已作废订单详情
         Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.state"), "DISCARD", "作废期限卡订单成功未成功");//断言订单已作废
         Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.state"), "DISCARD", "作废期限卡订单成功未成功");//断言订单已作废

src/main/java/com/xiaomai/cases/polar/setting/venue/TestVenueBookingRecordExport.java

+package com.xiaomai.cases.polar.setting.venue;
+import com.alibaba.fastjson.JSONObject;
+import com.xiaomai.basetest.BaseTestImpl;
+import com.xiaomai.cases.polar.export.ExportTool;
+import com.xiaomai.enums.ApiModule;
+import com.xiaomai.enums.LoginAccount;
+import com.xiaomai.enums.RequestType;
+import com.xiaomai.enums.Terminal;
+
+import com.xiaomai.utils.XMBaseTest;
+import com.xiaomai.utils.XMJSONPath;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+import javax.annotation.Resource;
+
+public class TestVenueBookingRecordExport extends XMBaseTest {
+
+
+    @BeforeMethod
+    public void beforeTest() {
+        xmAppApi.setApiModule(ApiModule.Polar_Setting)
+                .setApiName("API_venueBookingRecord_export")
+                .setLoginUser(LoginAccount.GYM_PROD)
+                .setTerminal(Terminal.B);
+        dal.setCase_owner("yj")
+                .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
+        super.beforeTest();
+
+    }
+    @Test(description = "场地预约-约场记录-导出")
+    public void testvenueBookingRecordExport() {
+
+        ExportTool exportTool = new ExportTool();
+
+        int before = Integer.parseInt(XMJSONPath.readPath(exportTool.pageStudioExportRecord(), "$.result.total"));
+
+        JSONObject object = new JSONObject();
+        object.put("studioId", xmAppApi.getLoginInfo().getStudioId());
+        object.put("brandId", xmAppApi.getLoginInfo().getBrandId());
+        object.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
+
+        xmAppApi.doRequest(RequestType.JSON,params,object.toString(),headers).assetsSuccess(true);
+        String id =XMJSONPath.readPath(dataApi.getApi_response(),"$.result");//导出任务id
+
+        int after = Integer.parseInt(XMJSONPath.readPath(exportTool.pageStudioExportRecord(), "$.result.total"));
+        Assert.assertEquals(after,before+1);
+
+
+
+    }
+}