Merge branch 'master' of ssh://xmgit.ixm5.cn:10022/xiamai-test/xm-sportstest

src/main/java/com/xiaomai/cases/polar/finance/axf/AXFTools.java

+package com.xiaomai.cases.polar.finance.axf;
+
+import com.alibaba.fastjson.JSONObject;
+import com.xiaomai.client.DataUserInfo;
+import com.xiaomai.enums.ApiModule;
+import com.xiaomai.enums.RequestType;
+import com.xiaomai.enums.Terminal;
+import com.xiaomai.utils.XMBaseTest;
+
+/**
+ * @BelongsProject: xm-sportstest
+ * @BelongsPackage: com.xiaomai.cases.polar.finance.axf
+ * @Author: xuyamei
+ * @CreateTime: 2024-12-25  14:14
+ * @Description: 先享后付工具类
+ * @Version: 1.0
+ */
+public class AXFTools extends XMBaseTest {
+    public void setUp(String name, DataUserInfo...dataUserInfo) {
+        dataApi.setApiModule(ApiModule.Polar_Finance)
+                .setApiName(name)
+                .setTerminal(Terminal.B);
+        super.beforeDataRequest(dataUserInfo);
+    }
+
+
+    /**
+     * @description:查询先享后付订购单
+     * @author: xuyamei
+     * @date:  2024/12/25 14:15
+     * @param body：请求参数
+     * @return: com.alibaba.fastjson.JSONObject
+     **/
+    public JSONObject getAXFPageOrder(String body){
+        setUp("API_axf_pageOrder");
+
+        dataApi.doRequest(RequestType.JSON,dataparams,body,dataheadrs).assetsSuccess(true);
+        return dataApi.getBodyInJSON();
+    }
+
+
+
+}

src/main/java/com/xiaomai/cases/polar/finance/axf/TestAXFAggOrder.java

+package com.xiaomai.cases.polar.finance.axf;
+
+import com.alibaba.fastjson.JSONObject;
+import com.xiaomai.basetest.BaseTestImpl;
+import com.xiaomai.enums.ApiModule;
+import com.xiaomai.enums.LoginAccount;
+import com.xiaomai.enums.RequestType;
+import com.xiaomai.enums.Terminal;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * @BelongsProject: xm-sportstest
+ * @BelongsPackage: com.xiaomai.cases.polar.finance.axf
+ * @Author: xuyamei
+ * @CreateTime: 2024-12-25  14:13
+ * @Description: 统计先学后付订购单 已扣总计、实扣总计
+ * @Version: 1.0
+ */
+public class TestAXFAggOrder extends BaseTestImpl {
+    AXFTools axfTools = new AXFTools();
+    @BeforeMethod
+    @Override
+    public void beforeTest(){
+        setTestInfo(ApiModule.Polar_Finance,"API_axf_aggOrder", LoginAccount.GYM_PROD, Terminal.B,"xym");
+        super.beforeTest();
+    }
+
+    @Test
+    public void testAXFAggOrder(){
+        String body = "{\"current\":0,\"size\":20,\"studioId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"brandId\":\""+xmAppApi.getLoginInfo().getBrandId()+"\",\"commodityCardType\":\"DEPOSIT_CARD\",\"voucherBusinessNo\":null,\"thirdOrderNo\":null,\"operatorId\":\""+xmAppApi.getLoginInfo().getAdminId()+"\"}";
+        JSONObject response = axfTools.getAXFPageOrder(body);
+        // 查询列表数据（已经扣款的数据）
+        int total = response.getJSONObject("result").getJSONArray("records").size();
+        double receivedAmount = 0.00;
+        double receivedActualAmount = 0.00;
+        String thirdOrderNo = "";
+        for (int i = 0; i < total; i++){
+            receivedAmount = response.getJSONObject("result").getJSONArray("records").getJSONObject(i).getDouble("receivedAmount");
+            if (receivedAmount > 0){
+                // 查询详情数据
+                receivedActualAmount = response.getJSONObject("result").getJSONArray("records").getJSONObject(i).getDouble("receivedActualAmount");
+                thirdOrderNo = response.getJSONObject("result").getJSONArray("records").getJSONObject(i).getString("thirdOrderNo");
+                break;
+            }
+
+            body = "{\"current\":0,\"size\":20,\"studioId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"brandId\":\""+xmAppApi.getLoginInfo().getBrandId()+"\",\"commodityCardType\":\"DEPOSIT_CARD\",\"voucherBusinessNo\":null,\"thirdOrderNo\":"+thirdOrderNo+",\"operatorId\":\""+xmAppApi.getLoginInfo().getAdminId()+"\"}";
+            xmAppApi.doRequest(RequestType.JSON,params,body,headers).assetsSuccess(true);
+            response = xmAppApi.getBodyInJSON();
+            // 验证统计条返回的数据与列表统计数据一致
+            Assert.assertEquals(response.getJSONObject("result").getString("receivedActualAmount").equals(String.valueOf(receivedActualAmount)), true);
+        }
+    }
+
+}

src/main/java/com/xiaomai/cases/polar/finance/axf/TestAXFGetOrder.java

+package com.xiaomai.cases.polar.finance.axf;
+
+import com.alibaba.fastjson.JSONObject;
+import com.xiaomai.basetest.BaseTestImpl;
+import com.xiaomai.enums.ApiModule;
+import com.xiaomai.enums.LoginAccount;
+import com.xiaomai.enums.RequestType;
+import com.xiaomai.enums.Terminal;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * @BelongsProject: xm-sportstest
+ * @BelongsPackage: com.xiaomai.cases.polar.finance.axf
+ * @Author: xuyamei
+ * @CreateTime: 2024-12-25  16:05
+ * @Description: 查看订购单详情
+ * @Version: 1.0
+ */
+public class TestAXFGetOrder extends BaseTestImpl {
+    AXFTools axfTools = new AXFTools();
+
+    @BeforeMethod
+    @Override
+    public void beforeTest(){
+        setTestInfo(ApiModule.Polar_Finance,"API_axf_getOrder", LoginAccount.GYM_PROD, Terminal.B,"xym");
+        super.beforeTest();
+    }
+
+    @Test
+    public void testAXFGetOrder() {
+        // 查询订购单列表数据
+        String body = "{\"current\":0,\"size\":20,\"studioId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"brandId\":\""+xmAppApi.getLoginInfo().getBrandId()+"\",\"commodityCardType\":\"DEPOSIT_CARD\",\"voucherBusinessNo\":null,\"thirdOrderNo\":null,\"operatorId\":\""+xmAppApi.getLoginInfo().getAdminId()+"\"}";
+        JSONObject response = axfTools.getAXFPageOrder(body);
+        String id = response.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
+
+        // 查询详订购单详情数据
+        body = "{\"id\":\""+id+"\",\"studioId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"brandId\":\""+xmAppApi.getLoginInfo().getBrandId()+"\",\"operatorId\":\""+xmAppApi.getLoginInfo().getAdminId()+"\"}";
+        xmAppApi.doRequest(RequestType.JSON,params,body,headers).assetsSuccess(true);
+        JSONObject response1 = xmAppApi.getBodyInJSON();
+
+        String[] params = {"commodityId","id","instId","merchantId","originalPrice","receivedActualAmount","receivedAmount","receivedFee","receivedPeriod","signState","signTime","studentId","thirdOrderNo","totalPeriod","voucherBusinessNo","voucherId"};
+
+        for (int i = 0; i < params.length; i++){
+            String page = response.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString(params[i]);
+            String detail = response1.getJSONObject("result").getString(params[i]);
+            Assert.assertEquals(page,detail,"列表数据和详情一致");
+        }
+
+    }
+}

src/main/java/com/xiaomai/cases/polar/finance/axf/TestAxfGetLatestApply.java

+package com.xiaomai.cases.polar.finance.axf;
+
+import com.xiaomai.basetest.BaseTestImpl;
+import com.xiaomai.enums.ApiModule;
+import com.xiaomai.enums.LoginAccount;
+import com.xiaomai.enums.RequestType;
+import com.xiaomai.enums.Terminal;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * @BelongsProject: xm-sportstest
+ * @BelongsPackage: com.xiaomai.cases.polar.finance.axf
+ * @Author: xuyamei
+ * @CreateTime: 2024-12-25  15:34
+ * @Description: 查询最新的申请
+ * @Version: 1.0
+ */
+public class TestAxfGetLatestApply extends BaseTestImpl {
+    @BeforeMethod
+    @Override
+    public void beforeTest(){
+        setTestInfo(ApiModule.Polar_Finance,"API_axf_getLatestApply", LoginAccount.GYM_PROD, Terminal.B,"xym");
+        super.beforeTest();
+    }
+
+    @Test
+    public void testAxfGetLatestApply(){
+        String str = "{\"studioId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"brandId\":\""+xmAppApi.getLoginInfo().getBrandId()+"\",\"operatorId\":\""+xmAppApi.getLoginInfo().getAdminId()+"\"}";
+        xmAppApi.doRequest(RequestType.JSON, params,str,headers).assetsSuccess(true);
+        //校验校区的商户号PID与预期的一致
+        Assert.assertEquals(xmAppApi.getBodyInJSON().getJSONObject("result").getString("merchantNo"),"2088460274140455","PID返回错误");
+        Assert.assertEquals(xmAppApi.getBodyInJSON().getJSONObject("result").getString("state"),"SETTLE_SUCCESS","状态是申请成功");
+
+    }
+}

src/main/java/com/xiaomai/cases/polar/finance/axf/TestExistFailDeduction.java

+package com.xiaomai.cases.polar.finance.axf;
+
+import com.alibaba.fastjson.JSONObject;
+import com.xiaomai.basetest.BaseTestImpl;
+import com.xiaomai.enums.ApiModule;
+import com.xiaomai.enums.LoginAccount;
+import com.xiaomai.enums.RequestType;
+import com.xiaomai.enums.Terminal;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * @BelongsProject: xm-sportstest
+ * @BelongsPackage: com.xiaomai.cases.polar.finance.axf
+ * @Author: xuyamei
+ * @CreateTime: 2024-12-25  16:10
+ * @Description: 是否存在失败扣款的数据
+ * @Version: 1.0
+ */
+public class TestExistFailDeduction extends BaseTestImpl {
+    AXFTools axfTools = new AXFTools();
+
+    @BeforeMethod
+    @Override
+    public void beforeTest(){
+        setTestInfo(ApiModule.Polar_Finance,"API_existFailDeduction", LoginAccount.GYM_PROD, Terminal.B,"xym");
+        super.beforeTest();
+    }
+
+    @Test
+    public void testExistFailDeduction() {
+        // 查询签约成功的列表数据 且有扣款数据
+        String body = "{\"current\":0,\"size\":20,\"studioId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"brandId\":\""+xmAppApi.getLoginInfo().getBrandId()+"\",\"commodityCardType\":\"DEPOSIT_CARD\",\"voucherBusinessNo\":null,\"thirdOrderNo\":null,\"operatorId\":\""+xmAppApi.getLoginInfo().getAdminId()+"\"}";
+        JSONObject response = axfTools.getAXFPageOrder(body);
+        // 查询列表数据
+        int total = response.getJSONObject("result").getJSONArray("records").size();
+        String id = "";
+        for (int i = 0; i < total; i++){
+            double receivedAmount = response.getJSONObject("result").getJSONArray("records").getJSONObject(i).getDouble("receivedAmount");
+            if (receivedAmount > 0){
+                // 查询详情数据
+                id = response.getJSONObject("result").getJSONArray("records").getJSONObject(i).getString("id");
+                break;
+            }
+        }
+
+        body = "{\"id\":\""+id+"\",\"studioId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"brandId\":\""+xmAppApi.getLoginInfo().getBrandId()+"\",\"operatorId\":\""+xmAppApi.getLoginInfo().getAdminId()+"\"}";
+        xmAppApi.doRequest(RequestType.JSON,params,body,headers).assetsSuccess(true);
+        response = xmAppApi.getBodyInJSON();
+        Assert.assertEquals(response.getString("result"),"NO");
+    }
+
+
+
+}

src/main/java/com/xiaomai/cases/polar/finance/axf/TestGetMerchant.java

+package com.xiaomai.cases.polar.finance.axf;
+
+import com.xiaomai.basetest.BaseTestImpl;
+import com.xiaomai.enums.ApiModule;
+import com.xiaomai.enums.LoginAccount;
+import com.xiaomai.enums.RequestType;
+import com.xiaomai.enums.Terminal;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * @BelongsProject: xm-sportstest
+ * @BelongsPackage: com.xiaomai.cases.polar.finance.axf
+ * @Author: xuyamei
+ * @CreateTime: 2024-12-25  14:07
+ * @Description:  获取当前绑定的商户信息
+ * @Version: 1.0
+ */
+public class TestGetMerchant extends BaseTestImpl {
+    @BeforeMethod
+    @Override
+    public void beforeTest(){
+        setTestInfo(ApiModule.Polar_Finance,"API_getMerchant", LoginAccount.GYM_PROD, Terminal.B,"xym");
+        super.beforeTest();
+    }
+
+    @Test
+    public void testGetMerchant() {
+        String str = "{\"studioId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"brandId\":\""+xmAppApi.getLoginInfo().getBrandId()+"\",\"operatorId\":\""+xmAppApi.getLoginInfo().getAdminId()+"\"}";
+        xmAppApi.doRequest(RequestType.JSON, params,str,headers).assetsSuccess(true);
+
+        //校验校区的商户号PID与预期的一致
+        Assert.assertEquals(xmAppApi.getBodyInJSON().getJSONObject("result").getString("merchantNo"),"2088460274140455","PID返回错误");
+    }
+
+
+
+}

src/main/java/com/xiaomai/cases/polar/finance/axf/TestListDeduction.java

+package com.xiaomai.cases.polar.finance.axf;
+
+import com.alibaba.fastjson.JSONObject;
+import com.xiaomai.basetest.BaseTestImpl;
+import com.xiaomai.enums.ApiModule;
+import com.xiaomai.enums.LoginAccount;
+import com.xiaomai.enums.RequestType;
+import com.xiaomai.enums.Terminal;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * @BelongsProject: xm-sportstest
+ * @BelongsPackage: com.xiaomai.cases.polar.finance.axf
+ * @Author: xuyamei
+ * @CreateTime: 2024-12-25  16:15
+ * @Description: 获取订购单扣款明细
+ * @Version: 1.0
+ */
+public class TestListDeduction extends BaseTestImpl {
+    AXFTools axfTools = new AXFTools();
+
+    @BeforeMethod
+    @Override
+    public void beforeTest(){
+        setTestInfo(ApiModule.Polar_Finance,"API_listDeduction", LoginAccount.GYM_PROD, Terminal.B,"xym");
+        super.beforeTest();
+    }
+
+    @Test
+    public void testListDeduction() {
+        // 查询签约成功的列表数据 且有扣款数据
+        String body = "{\"current\":0,\"size\":20,\"studioId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"brandId\":\""+xmAppApi.getLoginInfo().getBrandId()+"\",\"commodityCardType\":\"DEPOSIT_CARD\",\"voucherBusinessNo\":null,\"thirdOrderNo\":null,\"operatorId\":\""+xmAppApi.getLoginInfo().getAdminId()+"\"}";
+        JSONObject response = axfTools.getAXFPageOrder(body);
+        // 查询列表数据
+        int total = response.getJSONObject("result").getJSONArray("records").size();
+        String orderId = "";
+        for (int i = 0; i < total; i++){
+            double receivedAmount = response.getJSONObject("result").getJSONArray("records").getJSONObject(i).getDouble("receivedAmount");
+            if (receivedAmount > 0){
+                // 查询详情数据
+                orderId = response.getJSONObject("result").getJSONArray("records").getJSONObject(i).getString("id");
+                break;
+            }
+        }
+
+        body = "{\"orderId\":\""+orderId+"\",\"studioId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"brandId\":\""+xmAppApi.getLoginInfo().getBrandId()+"\",\"operatorId\":\""+xmAppApi.getLoginInfo().getAdminId()+"\"}";
+
+        xmAppApi.doRequest(RequestType.JSON,params,body,headers).assetsSuccess(true);
+        response = xmAppApi.getBodyInJSON();
+        // 验证扣款明细有数据
+        Assert.assertEquals(response.getJSONArray("result").size()>0,true);
+    }
+
+
+
+}

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

@@ -179,7 +179,7 @@ public class TestPay extends XMBaseTest {
     }
 
     @Test(dataProvider = "dataProvider")
-    public void testSignOrder2(boolean directReceive,String memo) {
+    public void testPay2(boolean directReceive,String memo) {
         // 查询存量的学员没有则创建学员
         if (tools.commonSearch("刘佳","NORMAL").getJSONArray("result").size()>0){
             memberId = tools.commonSearch("刘佳","NORMAL").getJSONArray("result").getJSONObject(0).getString("id");

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

@@ -214,7 +214,7 @@ public class TestSignOrder extends XMBaseTest {
         };
     }
 
-    @Test(description = "部分支付不发放商品权益")
+    @Test(description = "部分支付不发放商品权益",dataProvider = "dataProvider")
     public void testSignOrder2(boolean directReceive,String memo) {
         // 查询存量的学员没有则创建学员
         if (tools.commonSearch("刘青","NORMAL").getJSONArray("result").size()>0){