修改会员卡报错

src/main/java/com/xiaomai/cases/polar/applet/TestGetStyleConfig.java

-package com.xiaomai.cases.polar.applet;
-
-import com.xiaomai.enums.ApiModule;
-import com.xiaomai.enums.LoginAccount;
-import com.xiaomai.enums.Terminal;
-import com.xiaomai.utils.XMBaseTest;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-/**
- * @Author zxy
- * @Description
- * @Date 2024/7/1 16:46
- */
-public class TestGetStyleConfig extends XMBaseTest {
-    @BeforeMethod
-    public void beforeTest(){
-
-        xmAppApi.setApiModule(ApiModule.Polar_Applet)
-                .setApiName("API_getStyleConfig")
-                .setLoginUser(LoginAccount.GYM_PROD)
-                .setTerminal(Terminal.B);
-
-        dal.setCase_owner("zyx")
-                .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
-        super.beforeTest();
-    }
-
-    @Test(description = "获取小程序全局配置")
-    public void testGetStyleConfig(){
-
-    }
-
-}

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

@@ -48,6 +48,7 @@ public class CardTools extends XMBaseTest {
         Object.put("defaultConsumeBalance", 1);
         //Object.put("itemList", itemList);
         Object.put("targetType", "COURSE");
+        Object.put("price","1");
         benefitList.add(Object);
 
 
@@ -69,6 +70,7 @@ public class CardTools extends XMBaseTest {
         jsonObject.put("studioId", dataApi.getLoginInfo().getStudioId());
         jsonObject.put("description", "{\"items\":[{\"content\":\"自动化创建的卡\",\"aspect\":\"\",\"type\":\"TEXT\"}]}");
         jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId());
+        jsonObject.put("commodityCardType","MEMBER_CARD");
 
 
         dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
@@ -106,6 +108,7 @@ public class CardTools extends XMBaseTest {
                 "\"defaultConsumeBalance\": 1,\n" +
                 "\"itemList\": [],\n" +
                 "\"targetType\": \"COURSE\"\n" +
+                "\"price\": \"398\"\n" +
                 "}\n" +
                 "],\n" +
                 "\"price\": \"398\",\n" +
@@ -131,7 +134,7 @@ public class CardTools extends XMBaseTest {
      * @description:会员卡列表
      * @author: yangjian
      **/
-    public JSONObject fetchPageOfMemberCard(DataUserInfo... dataUserInfos) {
+    public JSONObject fetchPageOfMemberCard(String commodityCardType,DataUserInfo... dataUserInfos) {
 
         dataApi.setApiModule(ApiModule.Polar_Card)
                 .setApiName("API_fetchPageOfMemberCard")
@@ -143,6 +146,7 @@ public class CardTools extends XMBaseTest {
         //jsonObject.put("xcxSaleStatus",xcxSaleStatus);//售卖状态
         jsonObject.put("current", 0);
         jsonObject.put("size", 20);
+        jsonObject.put("commodityCardType",commodityCardType);
         jsonObject.put("studioId", dataApi.getLoginInfo().getStudioId());
         jsonObject.put("brandId", dataApi.getLoginInfo().getBrandId());
         jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId());
@@ -186,7 +190,7 @@ public class CardTools extends XMBaseTest {
      * @description:会员卡搜索
      * @author: yangjian
      **/
-    public JSONObject doMemberCardcommonSearch(String title, DataUserInfo... dataUserInfos) {
+    public JSONObject doMemberCardcommonSearch(String title, String commodityCardType,DataUserInfo... dataUserInfos) {
 
         dataApi.setApiModule(ApiModule.Polar_Card)
                 .setApiName("API_commonSearch")
@@ -198,6 +202,7 @@ public class CardTools extends XMBaseTest {
         jsonObject.put("studioId", dataApi.getLoginInfo().getStudioId());
         jsonObject.put("title", title);//搜索的卡名
         jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId());
+        jsonObject.put("commodityCardType",commodityCardType);
         dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
         JSONObject response = dataApi.getBodyInJSON();
         return response;
@@ -209,13 +214,16 @@ public class CardTools extends XMBaseTest {
      * @description:会员卡售卖记录
      * @author: yangjian
      **/
-    public JSONObject membercardsearch(DataUserInfo... dataUserInfos) {
+    public JSONObject membercardsearch(String memberCardState,DataUserInfo... dataUserInfos) {
 
         dataApi.setApiModule(ApiModule.Polar_Card)
                 .setApiName("API_membercard_search")
                 .setTerminal(Terminal.B);
         super.beforeDataRequest(dataUserInfos);
 
+        List memberCardStateList = new ArrayList();
+        memberCardStateList.add(memberCardState);
+
         JSONObject jsonObject = new JSONObject();
 
         jsonObject.put("current", 0);
@@ -223,6 +231,7 @@ public class CardTools extends XMBaseTest {
         jsonObject.put("studioId", dataApi.getLoginInfo().getStudioId());
         jsonObject.put("brandId", dataApi.getLoginInfo().getBrandId());
         jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId());
+        jsonObject.put("memberCardStateList",memberCardStateList);
 
         dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
         JSONObject response = dataApi.getBodyInJSON();
@@ -348,10 +357,16 @@ public class CardTools extends XMBaseTest {
                 .setTerminal(Terminal.B);
         super.beforeDataRequest(dataUserInfos);
 
-        JSONObject jsonObject = new JSONObject();
 
-        jsonObject.put("balance", 1);
-        jsonObject.put("benefitId", benefitId);
+        JSONObject object = new JSONObject();
+        object.put("balance",1);
+        object.put("benefitId",benefitId);
+
+        List deductList = new ArrayList();
+        deductList.add(object);
+
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("deductList", deductList);
         jsonObject.put("memberCardId", memberCardId);
         jsonObject.put("memo", "自动化手动扣次");
         jsonObject.put("operatorId", dataApi.getLoginInfo().getAdminId());

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

@@ -49,7 +49,7 @@ public class GetMemberCardBaseInfoForSign extends BaseTestImpl {
 
         //搜索目标会员卡-次卡
         String title = "嘟嘟创建的会员卡-次卡";
-        cardTools.doMemberCardcommonSearch(title);
+        cardTools.doMemberCardcommonSearch(title,"MEMBER_CARD");
         int total = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result").size();
         if (total > 0) {
             memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result[0].id");
@@ -64,7 +64,7 @@ public class GetMemberCardBaseInfoForSign extends BaseTestImpl {
 
         //获取会员卡详情
         cardTools.fetchDetailById(memberCardId);
-        quantity=BigDecimal.valueOf(Long.valueOf(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.benefitList[0].balance")));
+        quantity= new BigDecimal(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.benefitList[0].balance"));
         price=Float.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.price"));
         validPeriod=Integer.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.validPeriod"));
         latestSnapshotId=XMJSONPath.readPath(dataApi.getApi_response(), "$.result.latestSnapshotId");

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

@@ -53,7 +53,7 @@ public class TestActivateMemberCard extends GetMemberCardBaseInfoForSign {
                 //查看售卖记录详情
                 cardTools.membercardfindDetailById(memberAccountCardId);
                 Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.state"),"NORMAL","开卡后卡状态没变更为生效状态");
-                String benefitId=XMJSONPath.readPath(dataApi.getApi_response(),"$.result.benefitList[0].id");
+                String benefitId=XMJSONPath.readPath(dataApi.getApi_response(),"$.result.courseBenefit.id");
 
                 //check生成一条变动记录
                 cardTools.getMemberCardAccountOperateRecord(memberAccountCardId);

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

@@ -25,8 +25,8 @@ public class TestCancelSuspend extends XMBaseTest {
     @Test(description = "会员卡取消停用")
     public void testcancelSuspend() {
         CardTools Cardtools = new CardTools();
-        Cardtools.membercardsearch();
-        String benefitId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].balanceBenefitList[0].id");
+        Cardtools.membercardsearch("NORMAL");
+        String benefitId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].courseBenefit.id");
         String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");//拿售卖记录第一张会员卡的ID;
 
         Cardtools.modifyExpireDate(benefitId,memberCardId);//修改有效期

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

@@ -26,8 +26,8 @@ public class TestDiscardManualDeduct extends XMBaseTest {
     @Test(description = "撤销手动扣次")
     public void testDiscardManualDeduct() {
         CardTools Cardtools = new CardTools();
-        Cardtools.membercardsearch();
-        String benefitId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].balanceBenefitList[0].id");
+        Cardtools.membercardsearch("NORMAL");
+        String benefitId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].courseBenefit.id");
         String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");//拿售卖记录第一张会员卡的ID;
 
 

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

@@ -26,9 +26,9 @@ public class TestFetchPageOfConsumeRecord extends XMBaseTest {
     @Test(description = "查看售卖记录-会员卡消耗记录")
     public void testfetchPageOfConsumeRecord() {
         CardTools Cardtools = new CardTools();
-        Cardtools.membercardsearch();
+        Cardtools.membercardsearch("NORMAL");
         String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");//拿售卖记录第一张会员卡的ID
-        String benefitId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].balanceBenefitList[0].id");
+        String benefitId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].courseBenefit.id");
 
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("current",0);

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

@@ -26,7 +26,7 @@ public class TestFetchPageOfHistory extends XMBaseTest {
     @Test(description = "查看会员卡编辑记录")
     public void testfetchPageOfHistory() {
         CardTools Cardtools = new CardTools();
-        Cardtools.fetchPageOfMemberCard();
+        Cardtools.fetchPageOfMemberCard("MEMBER_CARD");
 
         String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");
 

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

@@ -26,7 +26,7 @@ public class TestFetchPageOfOperateRecord extends XMBaseTest {
     @Test(description = "售卖记录详情-查看变动记录")
     public void testFetchPageOfOperateRecord() {
         CardTools Cardtools = new CardTools();
-        Cardtools.membercardsearch();
+        Cardtools.membercardsearch("NORMAL");
         String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");//拿售卖记录第一张会员卡的ID
 
         JSONObject jsonObject = new JSONObject();

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

@@ -26,7 +26,7 @@ public class TestFindHistoryDetailById extends XMBaseTest {
     public void testfindHistoryDetailById() {
         CardTools Cardtools = new CardTools();
 
-        Cardtools.fetchPageOfMemberCard();
+        Cardtools.fetchPageOfMemberCard("MEMBER_CARD");
         String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");//拿售卖记录第一张会员卡的ID
 
         Cardtools.fetchPageOfHistory(memberCardId);

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

@@ -32,7 +32,7 @@ public class TestMemberCardSearch extends XMBaseTest {
     public void testMemberCardcommonSearch() {
         String memberCardName="次卡-自动化会员卡"+ RandomStringUtil.randomString(8);
         cardTools.memberCardCreate(memberCardName);//创建随机的名的次卡
-        cardTools.fetchPageOfMemberCard();//创建成功后查询会员卡列表（此处也可以不查询）
+        cardTools.fetchPageOfMemberCard("MEMBER_CARD");//创建成功后查询会员卡列表（此处也可以不查询）
         Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(),"$.result.records").size()>=1,"创建会员卡成功后，会员卡列表数据为空");
         Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].title"),memberCardName,"创建成功后，列表中第一条数据不是显示的该卡");
 
@@ -41,6 +41,8 @@ public class TestMemberCardSearch extends XMBaseTest {
         jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId());
         jsonObject.put("title",memberCardName);//这里需要搜索新创建的会员卡
         jsonObject.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
+        jsonObject.put("commodityCardType","MEMBER_CARD");
+
         xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers).assetsSuccess(true);
         Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(xmAppApi.getApi_response(),"$.result").size()==1,"精确搜索后发现会搜索到的数据不等于1");
         Assert.assertTrue(XMJSONPath.readPath(xmAppApi.getApi_response(),"$.result[0].title").equals(memberCardName),"精确搜索后发现会员卡名称不匹配");

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

@@ -26,7 +26,7 @@ public class TestModifySharers extends XMBaseTest {
     @Test(description = "添加移除共享人")
     public void testmodifySharers() {
         CardTools Cardtools = new CardTools();
-        Cardtools.membercardsearch();
+        Cardtools.membercardsearch("NORMAL");
 
         String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");//拿售卖记录第一张会员卡的ID;
 
@@ -51,7 +51,7 @@ public class TestModifySharers extends XMBaseTest {
     @Test(description = "移除移除共享人")
     public void testmodifySharers1() {
         CardTools Cardtools = new CardTools();
-        Cardtools.membercardsearch();
+        Cardtools.membercardsearch("NORMAL");
 
         String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");//拿售卖记录第一张会员卡的ID;
 

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

@@ -30,7 +30,7 @@ public class TestModifyShelfState extends XMBaseTest {
     @Test(description = "停用会员卡")
     public void testmodifyShelfState() {
         CardTools Cardtools = new CardTools();
-        Cardtools.fetchPageOfMemberCard();
+        Cardtools.fetchPageOfMemberCard("MEMBER_CARD");
         String memberCardId = "";
         String shelfState;
         //先检查次下列表有没有数据，有数据才会执行下面的点代码（如果是个空机构，肯定不会被执行，想从存量数据中获取，需要自己先造个数据）
@@ -61,7 +61,7 @@ public class TestModifyShelfState extends XMBaseTest {
     @Test(description = "启用会员卡")
     public void testmodifyShelfState1() {
         CardTools Cardtools = new CardTools();
-        Cardtools.fetchPageOfMemberCard();
+        Cardtools.fetchPageOfMemberCard("MEMBER_CARD");
         String memberCardId = "";
         String shelfState;
         int listDatas = XMJSONPath.getJSONArrayByReadPath(dataApi.getApi_response(), "$.result.records").size();

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

@@ -25,7 +25,7 @@ public class TestModifyXcxSaleState extends XMBaseTest {
     @Test(description = "关闭会员卡售卖")
     public void testmodifyShelfState() {
         CardTools Cardtools = new CardTools();
-        Cardtools.fetchPageOfMemberCard();
+        Cardtools.fetchPageOfMemberCard("MEMBER_CARD");
 
         String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");
         JSONObject jsonObject = new JSONObject();
@@ -41,7 +41,7 @@ public class TestModifyXcxSaleState extends XMBaseTest {
     @Test(description = "开启会员卡售卖")
     public void testmodifyShelfState1() {
         CardTools Cardtools = new CardTools();
-        Cardtools.fetchPageOfMemberCard();
+        Cardtools.fetchPageOfMemberCard("MEMBER_CARD");
 
         String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");
 

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

@@ -30,8 +30,13 @@ public class TestTenantMemberCard_update extends XMBaseTest {
     @Test(description = "编辑会员卡")
     public void testmodifySharers() {
         CardTools Cardtools = new CardTools();
+        try {
+            Thread.sleep(2000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
         Cardtools.memberCardCreate("次卡-自动化会员卡"+ RandomStringUtil.randomString(3));//创建随机的名的次卡
-        Cardtools.fetchPageOfMemberCard();
+        Cardtools.fetchPageOfMemberCard("MEMBER_CARD");
 
         String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");
 
@@ -54,6 +59,8 @@ public class TestTenantMemberCard_update extends XMBaseTest {
         Object.put("defaultConsumeBalance", 1);
         //Object.put("itemList", itemList);
         Object.put("targetType", "COURSE");
+        Object.put("price","1");
+
         benefitList.add(Object);
 
 
@@ -79,6 +86,7 @@ public class TestTenantMemberCard_update extends XMBaseTest {
         jsonObject.put("description", "{\"items\":[{\"content\":\"自动化编辑的卡\",\"aspect\":\"\",\"type\":\"TEXT\"}]}");
         jsonObject.put("operatorId", xmAppApi.getLoginInfo().getAdminId());
         jsonObject.put("memberCardId",memberCardId);
+        jsonObject.put("commodityCardType","MEMBER_CARD");
 
 
         xmAppApi.doRequest(RequestType.JSON, params, jsonObject.toJSONString(), headers).assetsSuccess(true);

src/main/java/com/xiaomai/enums/ApiModule.java

@@ -35,6 +35,7 @@ public class ApiModule {
 
     public static String Lunar_Order="lunar_order";//C端订单
     public static String Lunar_Training="lunar_training";//C端订单
+    public static String Lunar_Share="lunar_share";//C端分享