Skip to content

X
xm-sportstest
Commit 6abf84be by xyy
Options

Merge remote-tracking branch 'origin/master'

parents ba63bd49 e31cf7d8
Showing with 226 additions and 59 deletions
src/main/java/com/xiaomai/cases/lunar/order/TestMiNiPay.java
...@@ -85,7 +85,6 @@ public class TestMiNiPay extends BaseTestImpl { ...@@ -85,7 +85,6 @@ public class TestMiNiPay extends BaseTestImpl {
//小程序支付失败 //小程序支付失败
JSONObject jsonObject=new JSONObject(); JSONObject jsonObject=new JSONObject();
jsonObject.put("appId",xmAppApi.getLoginInfo().getWechatAppId()); jsonObject.put("appId",xmAppApi.getLoginInfo().getWechatAppId());
System.out.println("yff"+xmAppApi.getLoginInfo().getWechatAppId());
jsonObject.put("openId",xmAppApi.getLoginInfo().getOpenId()); jsonObject.put("openId",xmAppApi.getLoginInfo().getOpenId());
jsonObject.put("voucherId",voucherId); jsonObject.put("voucherId",voucherId);
......
src/main/java/com/xiaomai/cases/lunar/order/TestPurchaseCard.java
...@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; ...@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.xiaomai.basetest.BaseTestImpl; import com.xiaomai.basetest.BaseTestImpl;
import com.xiaomai.cases.lunar.minMemberCard.MinCardTools; import com.xiaomai.cases.lunar.minMemberCard.MinCardTools;
import com.xiaomai.cases.lunar.user.UserTools; import com.xiaomai.cases.lunar.user.UserTools;
import com.xiaomai.cases.polar.admin.AdminTools;
import com.xiaomai.cases.polar.finance.order.OrderTools; import com.xiaomai.cases.polar.finance.order.OrderTools;
import com.xiaomai.cases.polar.memberCard.CardTools; import com.xiaomai.cases.polar.memberCard.CardTools;
import com.xiaomai.client.DataUserInfo; import com.xiaomai.client.DataUserInfo;
...@@ -32,6 +33,7 @@ public class TestPurchaseCard extends BaseTestImpl { ...@@ -32,6 +33,7 @@ public class TestPurchaseCard extends BaseTestImpl {
@Resource(name = "orderTools") @Resource(name = "orderTools")
OrderTools orderTools; OrderTools orderTools;
DataUserInfo dataUserInfo = new DataUserInfo(); DataUserInfo dataUserInfo = new DataUserInfo();
AdminTools adminTools=new AdminTools();
public String memberId; public String memberId;
public String cardId; public String cardId;
...@@ -190,9 +192,18 @@ public class TestPurchaseCard extends BaseTestImpl { ...@@ -190,9 +192,18 @@ public class TestPurchaseCard extends BaseTestImpl {
if(checkRefundableAmountResult == true) { if(checkRefundableAmountResult == true) {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
String ownerName=adminTools.getStudioAdmin(dataApi.getLoginInfo().getAdminId(),dataUserInfo).getJSONObject("result").getString("nickName");
//退单-会员卡 //退单-会员卡
JSONObject refundOrderResult = orderTools.refundOrder(0, listUserRefundableId, quantity, 0, "MEMBER_CARD", JSONObject refundOrderResult = orderTools.refundOrder(dataApi.getLoginInfo().getAdminId(),ownerName,0, listUserRefundableId, quantity, 0, "MEMBER_CARD",
getDetailBmemberId, 0, 0, "1",dataUserInfo); getDetailBmemberId, 0, 0, "1",0,new BigDecimal(0),new BigDecimal(0),dataUserInfo);
String refundOrderSuccess = refundOrderResult.getString("success"); String refundOrderSuccess = refundOrderResult.getString("success");
String refundOrderGetDetailId = refundOrderResult.getString("result"); String refundOrderGetDetailId = refundOrderResult.getString("result");
Assert.assertEquals(refundOrderSuccess, "true", "创建的C端订单退单失败"); Assert.assertEquals(refundOrderSuccess, "true", "创建的C端订单退单失败");
......
src/main/java/com/xiaomai/cases/lunar/training/TestGetMemberCampScheduleItemList.java
...@@ -39,7 +39,7 @@ public class TestGetMemberCampScheduleItemList extends BaseTestImpl { ...@@ -39,7 +39,7 @@ public class TestGetMemberCampScheduleItemList extends BaseTestImpl {
String memberId = userTools.getMemberInfo().getString("memberId"); String memberId = userTools.getMemberInfo().getString("memberId");
JSONArray data = trainTools.getMemberCampScheduleItemList(TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(),memberId); JSONArray data = trainTools.getMemberCampScheduleItemList(TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(),memberId);
Assert.assertEquals(data.size()>=3,true,"有3条存量的训练营课次数据"); Assert.assertEquals(data.size()>=2,true,"有3条存量的训练营课次数据");
} }
} }
src/main/java/com/xiaomai/cases/polar/admin/TestDepartStudioAdmin.java
...@@ -8,7 +8,6 @@ import com.xiaomai.enums.LoginAccount; ...@@ -8,7 +8,6 @@ import com.xiaomai.enums.LoginAccount;
import com.xiaomai.enums.RequestType; import com.xiaomai.enums.RequestType;
import com.xiaomai.enums.Terminal; import com.xiaomai.enums.Terminal;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test; import org.testng.annotations.Test;
...@@ -50,7 +49,7 @@ public class TestDepartStudioAdmin extends BaseTestImpl { ...@@ -50,7 +49,7 @@ public class TestDepartStudioAdmin extends BaseTestImpl {
int pageIndex = rand.nextInt(pages); int pageIndex = rand.nextInt(pages);
// 随机获取一页的随机员工 // 随机获取一页的随机员工
Random random = new Random(); Random random = new Random();
int index = pageIndex+1 == pages ? random.nextInt(total%20-1)+1 : random.nextInt(19)+1; int index = pageIndex == pages ? random.nextInt(total%20-1) : random.nextInt(19)+1;
body = "{\"size\":20,\"current\":"+pageIndex+",\"state\":\"DUTY\"}"; body = "{\"size\":20,\"current\":"+pageIndex+",\"state\":\"DUTY\"}";
adminPage = adminTools.pageStudioAdmin(body); adminPage = adminTools.pageStudioAdmin(body);
String adminId = adminPage.getJSONObject("result").getJSONArray("records").getJSONObject(index).getString("id"); String adminId = adminPage.getJSONObject("result").getJSONArray("records").getJSONObject(index).getString("id");
...@@ -64,12 +63,12 @@ public class TestDepartStudioAdmin extends BaseTestImpl { ...@@ -64,12 +63,12 @@ public class TestDepartStudioAdmin extends BaseTestImpl {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
// 用手机号查询离职员工是否有这个员工 // 用手机号查询离职员工是否有这个员工
body = "{\"size\":10,\"current\":0,\"state\":\"LEFT\",\"searchContext\":\""+phone+"\"}"; body = "{\"size\":20,\"current\":0,\"state\":\"LEFT\",\"searchContext\":\""+phone+"\"}";
adminPage = adminTools.pageStudioAdmin(body); adminPage = adminTools.pageStudioAdmin(body);
total = Integer.parseInt(adminPage.getJSONObject("result").getString("total")); total = Integer.parseInt(adminPage.getJSONObject("result").getString("total"));
Assert.assertEquals(total,1,"员工离职失败,用手机号查询离职员工未返回数据"); Assert.assertEquals(total,1,"员工离职失败,用手机号查询离职员工未返回数据");
try { try {
Thread.sleep(12000); Thread.sleep(20000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
......
src/main/java/com/xiaomai/cases/polar/admin/TestReinStateStudioAdmin.java
...@@ -68,14 +68,14 @@ public class TestReinStateStudioAdmin extends BaseTestImpl { ...@@ -68,14 +68,14 @@ public class TestReinStateStudioAdmin extends BaseTestImpl {
Assert.assertEquals(total,1,"员工离职失败,用手机号查询离职员工未返回数据"); Assert.assertEquals(total,1,"员工离职失败,用手机号查询离职员工未返回数据");
try { try {
Thread.sleep(15000); Thread.sleep(20000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
// check 2: 生成对应的操作日志 // check 2: 生成对应的操作日志
body = "{\"current\":0,\"size\":20,\"domainId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"content\": \""+name+"\",\"brandId\":\""+xmAppApi.getLoginInfo().getBrandId()+"\",\"studioId\": \""+xmAppApi.getLoginInfo().getStudioId()+"\",\"opEventKey\":\"RESTORE_ADMIN\"}"; body = "{\"current\":0,\"size\":20,\"domainId\":\""+xmAppApi.getLoginInfo().getStudioId()+"\",\"content\": \""+name+"\",\"brandId\":\""+xmAppApi.getLoginInfo().getBrandId()+"\",\"studioId\": \""+xmAppApi.getLoginInfo().getStudioId()+"\",\"opEventKey\":\"RESTORE_ADMIN\"}";
JSONObject response = configTools.getOpauditPage(body); JSONObject response = configTools.getOpauditPage(body);
Assert.assertEquals(response.getJSONObject("result").getJSONArray("records").getJSONObject(0).getJSONObject("target").getString("targetId"),adminId,"员工离职未生成操作日志"); Assert.assertEquals(response.getJSONObject("result").getJSONArray("records").getJSONObject(0).getJSONObject("target").getString("targetId"),adminId,"员工复职未生成操作日志");
} }
......
src/main/java/com/xiaomai/cases/polar/applet/TestSetStyleConfig.java
...@@ -32,7 +32,7 @@ public class TestSetStyleConfig extends XMBaseTest { ...@@ -32,7 +32,7 @@ public class TestSetStyleConfig extends XMBaseTest {
super.beforeTest(); super.beforeTest();
} }
@Test(description = "修改小程序全局配置") //@Test(description = "修改小程序全局配置")
public void testSetStyleConfig(){ public void testSetStyleConfig(){
Random random = new Random(); Random random = new Random();
String[] themeColor = {"132, 111, 234","40, 115, 255","51, 202, 105"};//紫、蓝、绿 String[] themeColor = {"132, 111, 234","40, 115, 255","51, 202, 105"};//紫、蓝、绿
......
src/main/java/com/xiaomai/cases/polar/data/financeData/TestGetOrderData.java
package com.xiaomai.cases.polar.data.financeData; package com.xiaomai.cases.polar.data.financeData;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.admin.AdminTools;
import com.xiaomai.cases.polar.finance.order.OrderTools; import com.xiaomai.cases.polar.finance.order.OrderTools;
import com.xiaomai.cases.polar.member.Tools; import com.xiaomai.cases.polar.member.Tools;
import com.xiaomai.cases.polar.memberCard.CardTools; import com.xiaomai.cases.polar.memberCard.CardTools;
...@@ -26,6 +27,7 @@ public class TestGetOrderData extends XMBaseTest { ...@@ -26,6 +27,7 @@ public class TestGetOrderData extends XMBaseTest {
CardTools cardTools=new CardTools(); CardTools cardTools=new CardTools();
FinanceDataTools financeDataTools=new FinanceDataTools(); FinanceDataTools financeDataTools=new FinanceDataTools();
AdminTools adminTools=new AdminTools();
String memberId; String memberId;
String cardId; String cardId;
...@@ -212,9 +214,17 @@ public class TestGetOrderData extends XMBaseTest { ...@@ -212,9 +214,17 @@ public class TestGetOrderData extends XMBaseTest {
if(checkRefundableAmountResult == true) { if(checkRefundableAmountResult == true) {
String ownerName=adminTools.getStudioAdmin(xmAppApi.getLoginInfo().getAdminId()).getJSONObject("result").getString("nickName");
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
//退单-会员卡 //退单-会员卡
JSONObject refundOrderResult = orderTools.refundOrder(0, listUserRefundableId, quantity, price , "MEMBER_CARD", JSONObject refundOrderResult = orderTools.refundOrder(xmAppApi.getLoginInfo().getAdminId(),ownerName,0, listUserRefundableId, quantity, price , "MEMBER_CARD",
memberId, price, price , "1"); memberId, price, price , "1",0,new BigDecimal(price),new BigDecimal(price));
String refundOrderGetDetailId = refundOrderResult.getString("result");//退单订单ID String refundOrderGetDetailId = refundOrderResult.getString("result");//退单订单ID
try { try {
......
src/main/java/com/xiaomai/cases/polar/data/salesData/TestCenterData.java
package com.xiaomai.cases.polar.data.salesData; package com.xiaomai.cases.polar.data.salesData;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.admin.AdminTools;
import com.xiaomai.cases.polar.finance.order.OrderTools; import com.xiaomai.cases.polar.finance.order.OrderTools;
import com.xiaomai.cases.polar.member.Tools; import com.xiaomai.cases.polar.member.Tools;
import com.xiaomai.cases.polar.memberCard.CardTools; import com.xiaomai.cases.polar.memberCard.CardTools;
...@@ -27,6 +28,8 @@ public class TestCenterData extends XMBaseTest { ...@@ -27,6 +28,8 @@ public class TestCenterData extends XMBaseTest {
SalesDataTools salesDataTools=new SalesDataTools(); SalesDataTools salesDataTools=new SalesDataTools();
AdminTools adminTools=new AdminTools();
String memberId; String memberId;
String cardId; String cardId;
...@@ -234,9 +237,12 @@ public class TestCenterData extends XMBaseTest { ...@@ -234,9 +237,12 @@ public class TestCenterData extends XMBaseTest {
} }
if(checkRefundableAmountResult == true) { if(checkRefundableAmountResult == true) {
String ownerName=adminTools.getStudioAdmin(xmAppApi.getLoginInfo().getAdminId()).getJSONObject("result").getString("nickName");
//退单-会员卡 //退单-会员卡
JSONObject refundOrderResult = orderTools.refundOrder(0, listUserRefundableId, quantity, price - price / 2, "MEMBER_CARD", JSONObject refundOrderResult = orderTools.refundOrder(xmAppApi.getLoginInfo().getAdminId(),ownerName,0, listUserRefundableId, quantity, price - price / 2, "MEMBER_CARD",
memberId, price - price / 2, price - price / 2, "1"); memberId, price - price / 2, price - price / 2, "1",0,new BigDecimal(price - price / 2),new BigDecimal(price - price / 2));
String refundOrderGetDetailId = refundOrderResult.getString("result"); String refundOrderGetDetailId = refundOrderResult.getString("result");
try { try {
......
src/main/java/com/xiaomai/cases/polar/entry/TestManual.java
package com.xiaomai.cases.polar.entry; package com.xiaomai.cases.polar.entry;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.admin.AdminTools;
import com.xiaomai.cases.polar.experienceCard.ExperienceCardTools; import com.xiaomai.cases.polar.experienceCard.ExperienceCardTools;
import com.xiaomai.cases.polar.finance.order.OrderTools; import com.xiaomai.cases.polar.finance.order.OrderTools;
import com.xiaomai.cases.polar.member.Tools; import com.xiaomai.cases.polar.member.Tools;
...@@ -29,6 +30,7 @@ public class TestManual extends XMBaseTest { ...@@ -29,6 +30,7 @@ public class TestManual extends XMBaseTest {
Tools tools = new Tools(); Tools tools = new Tools();
CardTools cardTools = new CardTools(); CardTools cardTools = new CardTools();
ExperienceCardTools experienceCardTools = new ExperienceCardTools(); ExperienceCardTools experienceCardTools = new ExperienceCardTools();
AdminTools adminTools=new AdminTools();
String memberId; String memberId;
String memberCardId; String memberCardId;
String title; String title;
...@@ -156,8 +158,10 @@ public class TestManual extends XMBaseTest { ...@@ -156,8 +158,10 @@ public class TestManual extends XMBaseTest {
BigDecimal entryQuantity1 = new BigDecimal(XMJSONPath.readPath(res1, "$.result.venueBenefit.leftPurchaseBalance")); BigDecimal entryQuantity1 = new BigDecimal(XMJSONPath.readPath(res1, "$.result.venueBenefit.leftPurchaseBalance"));
Float entryPrice1 = Float.valueOf(XMJSONPath.readPath(res1, "$.result.venueBenefit.leftBenefitAmount")); Float entryPrice1 = Float.valueOf(XMJSONPath.readPath(res1, "$.result.venueBenefit.leftBenefitAmount"));
String ownerName=adminTools.getStudioAdmin(xmAppApi.getLoginInfo().getAdminId()).getJSONObject("result").getString("nickName");
//操作退卡 //操作退卡
orderTools.refundOrder1(2, 1,entryVoucherId, quantity, entryQuantity1,price, entryPrice1,"EXPERIENCE_CARD", memberId, "1"); orderTools.refundOrder1(xmAppApi.getLoginInfo().getAdminId(),ownerName,2, 1,entryVoucherId, quantity, entryQuantity1,price, entryPrice1,"EXPERIENCE_CARD", memberId, "1",0,new BigDecimal(price+entryPrice1),new BigDecimal(price+entryPrice1));
} }
} }
src/main/java/com/xiaomai/cases/polar/experienceCard/TestActiveExperienceCard.java
package com.xiaomai.cases.polar.experienceCard; package com.xiaomai.cases.polar.experienceCard;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.admin.AdminTools;
import com.xiaomai.cases.polar.finance.order.OrderTools; import com.xiaomai.cases.polar.finance.order.OrderTools;
import com.xiaomai.cases.polar.experienceCard.ExperienceCardTools; import com.xiaomai.cases.polar.experienceCard.ExperienceCardTools;
...@@ -27,6 +28,7 @@ public class TestActiveExperienceCard extends XMBaseTest { ...@@ -27,6 +28,7 @@ public class TestActiveExperienceCard extends XMBaseTest {
ExperienceCardTools experienceCardTools = new ExperienceCardTools(); ExperienceCardTools experienceCardTools = new ExperienceCardTools();
CardTools cardTools = new CardTools(); CardTools cardTools = new CardTools();
OrderTools orderTools = new OrderTools(); OrderTools orderTools = new OrderTools();
AdminTools adminTools=new AdminTools();
String memberCardId; String memberCardId;
String title; String title;
BigDecimal quantity; //可用次数 BigDecimal quantity; //可用次数
...@@ -108,8 +110,11 @@ public class TestActiveExperienceCard extends XMBaseTest { ...@@ -108,8 +110,11 @@ public class TestActiveExperienceCard extends XMBaseTest {
Assert.assertTrue(totalBefore == 1, "会员购卡后没生成购买的消耗记录"); Assert.assertTrue(totalBefore == 1, "会员购卡后没生成购买的消耗记录");
Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].consumeType").equals("PURCHASE"), "会员购卡后生成消耗记录不是购买"); Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].consumeType").equals("PURCHASE"), "会员购卡后生成消耗记录不是购买");
String ownerName=adminTools.getStudioAdmin(xmAppApi.getLoginInfo().getAdminId()).getJSONObject("result").getString("nickName");
//操作退卡 //操作退卡
orderTools.refundOrder1(2, 1,memberAccountCardId, quantity, entryQuantity,price, entryPrice,"EXPERIENCE_CARD", "1805435813468483586", "1"); orderTools.refundOrder1(xmAppApi.getLoginInfo().getAdminId(),ownerName,2, 1,memberAccountCardId, quantity, entryQuantity,price, entryPrice,"EXPERIENCE_CARD", "1805435813468483586", "1",0,new BigDecimal(price+entryPrice),new BigDecimal(price+entryPrice));
String refundOrderId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result"); String refundOrderId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result");
......
src/main/java/com/xiaomai/cases/polar/finance/cashier/TestOfflinePay.java
...@@ -36,7 +36,7 @@ public class TestOfflinePay extends XMBaseTest { ...@@ -36,7 +36,7 @@ public class TestOfflinePay extends XMBaseTest {
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Finance) xmAppApi.setApiModule(ApiModule.Polar_Finance)
.setApiName("API_offlinePay") .setApiName("API_offlinePay")
.setLoginUser(LoginAccount.YFF_PROD) .setLoginUser(LoginAccount.GYM_PROD)
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
dal.setCase_owner("yff") dal.setCase_owner("yff")
.setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]); .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);
......
src/main/java/com/xiaomai/cases/polar/finance/order/OrderTools.java
...@@ -2,6 +2,7 @@ package com.xiaomai.cases.polar.finance.order; ...@@ -2,6 +2,7 @@ package com.xiaomai.cases.polar.finance.order;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.admin.AdminTools;
import com.xiaomai.client.DataUserInfo; import com.xiaomai.client.DataUserInfo;
import com.xiaomai.enums.ApiModule; import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.RequestType; import com.xiaomai.enums.RequestType;
...@@ -748,6 +749,8 @@ public class OrderTools extends XMBaseTest { ...@@ -748,6 +749,8 @@ public class OrderTools extends XMBaseTest {
/** /**
* @param * @param
* @description:退单 * @description:退单
* @param ownerId：业绩归属人ID --可用员工
* @param ownerName：业绩归属人昵称 --可用员工
* @param giftQuantity：退出赠送数量 * @param giftQuantity：退出赠送数量
* @param memberCardId:会员的卡id 从listUserRefundableCard中的id获取 不是买的时候的卡id * @param memberCardId:会员的卡id 从listUserRefundableCard中的id获取 不是买的时候的卡id
* @param quantity：退出购买数量 * @param quantity：退出购买数量
...@@ -757,10 +760,18 @@ public class OrderTools extends XMBaseTest { ...@@ -757,10 +760,18 @@ public class OrderTools extends XMBaseTest {
* @param receivableAmount：应退金额 * @param receivableAmount：应退金额
* @param amount：支付金额 * @param amount：支付金额
* @param paymentWay：支付方式 * @param paymentWay：支付方式
* @param fee：手续费（全额退的情况下，就是0；这个字段是如果没有全额退的情况下，部分退出之后，剩余的钱就会变成手续费；可看下面的例子）
* @param refundableAmount：可退金额（全额退的情况：这个就是实收的钱和下面的refundAmount_actual传一样的就好，如果是双权益，那就是两个权益的实收加一起；如果是部分退，那就是实收-手续费；可看下面的例子）
* @param refundAmount_actual：真实退出金额（全额退的情况：一般这个就是实收的钱和上面的refundableAmount传一样的就好，如果是双权益，那就是两个权益的实收加一起；如果是部分退，那就是实收-手续费；可看下面的例子）
* （fee,refundableAmount,refundAmount_actual 这三个字段举个例子
* 买了一个卡花了1元
* 全额退就是fee=0，refundableAmount=1，refundAmount_actual=1；
* 部分退0.2的情况：fee=0.2，refundableAmount=0.8，refundAmount_actual=0.8；）
*
* @author: yangfangfang * @author: yangfangfang
**/ **/
public JSONObject refundOrder(int giftQuantity, String memberCardId,BigDecimal quantity,float refundAmount,String commodityCardType,String memberId, float receivableAmount, public JSONObject refundOrder(String ownerId,String ownerName,int giftQuantity, String memberCardId,BigDecimal quantity,float refundAmount,String commodityCardType,String memberId, float receivableAmount,
float amount,String paymentWay,DataUserInfo...dataUserInfos){ float amount,String paymentWay,int fee,BigDecimal refundableAmount,BigDecimal refundAmount_actual,DataUserInfo...dataUserInfos){
dataApi.setApiModule(ApiModule.Polar_Finance) dataApi.setApiModule(ApiModule.Polar_Finance)
.setApiName("API_refundOrder") .setApiName("API_refundOrder")
...@@ -770,6 +781,15 @@ public class OrderTools extends XMBaseTest { ...@@ -770,6 +781,15 @@ public class OrderTools extends XMBaseTest {
JSONObject jsonObject=new JSONObject(); JSONObject jsonObject=new JSONObject();
jsonObject.put("operationTime",TimeUtils.getCurrentTime()); jsonObject.put("operationTime",TimeUtils.getCurrentTime());
JSONArray businessOwners=new JSONArray();
JSONObject businessOwners1=new JSONObject();
businessOwners1.put("ownerId",ownerId);
businessOwners1.put("ownerName",ownerName);
businessOwners1.put("percent",100);
businessOwners.add(businessOwners1);
jsonObject.put("businessOwners",businessOwners);
JSONObject card=new JSONObject(); JSONObject card=new JSONObject();
card.put("giftQuantity",giftQuantity); card.put("giftQuantity",giftQuantity);
card.put("memberCardId",memberCardId); card.put("memberCardId",memberCardId);
...@@ -799,6 +819,9 @@ public class OrderTools extends XMBaseTest { ...@@ -799,6 +819,9 @@ public class OrderTools extends XMBaseTest {
jsonObject.put("paymentWays",paymentWays); jsonObject.put("paymentWays",paymentWays);
jsonObject.put("brandId",dataApi.getLoginInfo().getBrandId()); jsonObject.put("brandId",dataApi.getLoginInfo().getBrandId());
jsonObject.put("fee",fee);
jsonObject.put("refundableAmount",refundableAmount);
jsonObject.put("refundAmount",refundAmount_actual);
dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true); dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
...@@ -807,8 +830,8 @@ public class OrderTools extends XMBaseTest { ...@@ -807,8 +830,8 @@ public class OrderTools extends XMBaseTest {
} }
//双权益退卡 //双权益退卡
public JSONObject refundOrder1(int giftQuantity,int entryGiftQuantity, String memberCardId,BigDecimal quantity,BigDecimal entryQuantity,float refundAmount,float entryRefundAmount,String commodityCardType,String memberId, public JSONObject refundOrder1(String ownerId,String ownerName,int giftQuantity,int entryGiftQuantity, String memberCardId,BigDecimal quantity,BigDecimal entryQuantity,float refundAmount,float entryRefundAmount,String commodityCardType,String memberId,
String paymentWay,DataUserInfo...dataUserInfos){ String paymentWay,int fee,BigDecimal refundableAmount,BigDecimal refundAmount_actual,DataUserInfo...dataUserInfos){
dataApi.setApiModule(ApiModule.Polar_Finance) dataApi.setApiModule(ApiModule.Polar_Finance)
.setApiName("API_refundOrder") .setApiName("API_refundOrder")
...@@ -818,6 +841,14 @@ public class OrderTools extends XMBaseTest { ...@@ -818,6 +841,14 @@ public class OrderTools extends XMBaseTest {
JSONObject jsonObject=new JSONObject(); JSONObject jsonObject=new JSONObject();
jsonObject.put("operationTime",TimeUtils.getCurrentTime()); jsonObject.put("operationTime",TimeUtils.getCurrentTime());
JSONArray businessOwners=new JSONArray();
JSONObject businessOwners1=new JSONObject();
businessOwners1.put("ownerId",ownerId);
businessOwners1.put("ownerName",ownerName);
businessOwners1.put("percent",100);
businessOwners.add(businessOwners1);
jsonObject.put("businessOwners",businessOwners);
JSONObject card=new JSONObject(); JSONObject card=new JSONObject();
card.put("giftQuantity",giftQuantity); card.put("giftQuantity",giftQuantity);
card.put("memberCardId",memberCardId); card.put("memberCardId",memberCardId);
...@@ -850,6 +881,9 @@ public class OrderTools extends XMBaseTest { ...@@ -850,6 +881,9 @@ public class OrderTools extends XMBaseTest {
jsonObject.put("paymentWays",paymentWays); jsonObject.put("paymentWays",paymentWays);
jsonObject.put("brandId",dataApi.getLoginInfo().getBrandId()); jsonObject.put("brandId",dataApi.getLoginInfo().getBrandId());
jsonObject.put("fee",fee);
jsonObject.put("refundableAmount",refundableAmount);
jsonObject.put("refundAmount",refundAmount_actual);
dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true); dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
......
src/main/java/com/xiaomai/cases/polar/finance/order/TestDiscard.java
...@@ -2,6 +2,7 @@ package com.xiaomai.cases.polar.finance.order; ...@@ -2,6 +2,7 @@ package com.xiaomai.cases.polar.finance.order;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.admin.AdminTools;
import com.xiaomai.cases.polar.finance.revenueAndExpenditure.RevenueAndExpenditureTools; import com.xiaomai.cases.polar.finance.revenueAndExpenditure.RevenueAndExpenditureTools;
import com.xiaomai.cases.polar.member.Tools; import com.xiaomai.cases.polar.member.Tools;
import com.xiaomai.cases.polar.memberCard.CardTools; import com.xiaomai.cases.polar.memberCard.CardTools;
...@@ -28,6 +29,7 @@ public class TestDiscard extends XMBaseTest { ...@@ -28,6 +29,7 @@ public class TestDiscard extends XMBaseTest {
RevenueAndExpenditureTools revenueAndExpenditureTools=new RevenueAndExpenditureTools(); RevenueAndExpenditureTools revenueAndExpenditureTools=new RevenueAndExpenditureTools();
CardTools cardTools=new CardTools(); CardTools cardTools=new CardTools();
AdminTools adminTools=new AdminTools();
@BeforeMethod @BeforeMethod
public void beforeTest(){ public void beforeTest(){
...@@ -135,9 +137,12 @@ public class TestDiscard extends XMBaseTest { ...@@ -135,9 +137,12 @@ public class TestDiscard extends XMBaseTest {
} }
if(checkRefundableAmountResult == true) { if(checkRefundableAmountResult == true) {
String ownerName=adminTools.getStudioAdmin(xmAppApi.getLoginInfo().getAdminId()).getJSONObject("result").getString("nickName");
//退单-会员卡 //退单-会员卡
JSONObject refundOrderResult=orderTools.refundOrder(0,listUserRefundableId,quantity,price - price / 2,"MEMBER_CARD", JSONObject refundOrderResult=orderTools.refundOrder(xmAppApi.getLoginInfo().getAdminId(),ownerName,0,listUserRefundableId,quantity,price - price / 2,"MEMBER_CARD",
memberId,price - price / 2,price - price / 2,"1"); memberId,price - price / 2,price - price / 2,"1",0,new BigDecimal(price - price / 2),new BigDecimal(price - price / 2));
String refundOrderGetDetailId=refundOrderResult.getString("result"); String refundOrderGetDetailId=refundOrderResult.getString("result");
try { try {
......
src/main/java/com/xiaomai/cases/polar/finance/order/TestRefundOrder.java
...@@ -2,6 +2,7 @@ package com.xiaomai.cases.polar.finance.order; ...@@ -2,6 +2,7 @@ package com.xiaomai.cases.polar.finance.order;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.admin.AdminTools;
import com.xiaomai.cases.polar.finance.revenueAndExpenditure.RevenueAndExpenditureTools; import com.xiaomai.cases.polar.finance.revenueAndExpenditure.RevenueAndExpenditureTools;
import com.xiaomai.cases.polar.member.Tools; import com.xiaomai.cases.polar.member.Tools;
import com.xiaomai.cases.polar.memberCard.CardTools; import com.xiaomai.cases.polar.memberCard.CardTools;
...@@ -32,6 +33,7 @@ public class TestRefundOrder extends XMBaseTest { ...@@ -32,6 +33,7 @@ public class TestRefundOrder extends XMBaseTest {
RevenueAndExpenditureTools revenueAndExpenditureTools=new RevenueAndExpenditureTools(); RevenueAndExpenditureTools revenueAndExpenditureTools=new RevenueAndExpenditureTools();
CardTools cardTools=new CardTools(); CardTools cardTools=new CardTools();
AdminTools adminTools=new AdminTools();
@BeforeMethod @BeforeMethod
public void beforeTest(){ public void beforeTest(){
...@@ -138,9 +140,12 @@ public class TestRefundOrder extends XMBaseTest { ...@@ -138,9 +140,12 @@ public class TestRefundOrder extends XMBaseTest {
if(checkRefundableAmountResult == true){ if(checkRefundableAmountResult == true){
String ownerName=adminTools.getStudioAdmin(xmAppApi.getLoginInfo().getAdminId()).getJSONObject("result").getString("nickName");
//退单-会员卡 //退单-会员卡
JSONObject refundOrderResult=orderTools.refundOrder(0,listUserRefundableId,quantity,price - price / 2,"MEMBER_CARD", JSONObject refundOrderResult=orderTools.refundOrder(xmAppApi.getLoginInfo().getAdminId(),ownerName,0,listUserRefundableId,quantity,price - price / 2,"MEMBER_CARD",
memberId,price - price / 2,price - price / 2,"1"); memberId,price - price / 2,price - price / 2,"1",0,new BigDecimal(price - price / 2),new BigDecimal(price - price / 2));
String refundOrderSuccess=refundOrderResult.getString("success"); String refundOrderSuccess=refundOrderResult.getString("success");
String refundOrderGetDetailId=refundOrderResult.getString("result"); String refundOrderGetDetailId=refundOrderResult.getString("result");
......
src/main/java/com/xiaomai/cases/polar/finance/order/TestRefundOrderByDeposit.java
...@@ -2,6 +2,7 @@ package com.xiaomai.cases.polar.finance.order; ...@@ -2,6 +2,7 @@ package com.xiaomai.cases.polar.finance.order;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.admin.AdminTools;
import com.xiaomai.cases.polar.member.Tools; import com.xiaomai.cases.polar.member.Tools;
import com.xiaomai.cases.polar.memberCard.CardTools; import com.xiaomai.cases.polar.memberCard.CardTools;
import com.xiaomai.enums.ApiModule; import com.xiaomai.enums.ApiModule;
...@@ -17,6 +18,7 @@ import org.testng.annotations.BeforeMethod; ...@@ -17,6 +18,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.UUID; import java.util.UUID;
public class TestRefundOrderByDeposit extends XMBaseTest { public class TestRefundOrderByDeposit extends XMBaseTest {
...@@ -28,6 +30,9 @@ public class TestRefundOrderByDeposit extends XMBaseTest { ...@@ -28,6 +30,9 @@ public class TestRefundOrderByDeposit extends XMBaseTest {
@Resource(name = "cardTools") @Resource(name = "cardTools")
CardTools cardTools; CardTools cardTools;
@Resource(name = "adminTools")
AdminTools adminTools;
@BeforeMethod @BeforeMethod
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Finance) xmAppApi.setApiModule(ApiModule.Polar_Finance)
...@@ -88,6 +93,16 @@ public class TestRefundOrderByDeposit extends XMBaseTest { ...@@ -88,6 +93,16 @@ public class TestRefundOrderByDeposit extends XMBaseTest {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("operationTime", TimeUtils.getCurrentTime()); jsonObject.put("operationTime", TimeUtils.getCurrentTime());
JSONArray businessOwners=new JSONArray();
JSONObject businessOwners1=new JSONObject();
businessOwners1.put("ownerId",xmAppApi.getLoginInfo().getAdminId());
String ownerName=adminTools.getStudioAdmin(xmAppApi.getLoginInfo().getAdminId()).getJSONObject("result").getString("nickName");
businessOwners1.put("ownerName",ownerName);
businessOwners1.put("percent",100);
businessOwners.add(businessOwners1);
jsonObject.put("businessOwners",businessOwners);
jsonObject.put("card",card); jsonObject.put("card",card);
jsonObject.put("objectId", UUID.randomUUID().toString()); jsonObject.put("objectId", UUID.randomUUID().toString());
jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId()); jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId());
...@@ -99,6 +114,9 @@ public class TestRefundOrderByDeposit extends XMBaseTest { ...@@ -99,6 +114,9 @@ public class TestRefundOrderByDeposit extends XMBaseTest {
jsonObject.put("depositGiveAmount",price); jsonObject.put("depositGiveAmount",price);
jsonObject.put("depositCardId",depositCardId); jsonObject.put("depositCardId",depositCardId);
jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId()); jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId());
jsonObject.put("fee",0);
jsonObject.put("refundableAmount",price);
jsonObject.put("refundAmount",price);
//调用请求 //调用请求
xmAppApi.doRequest(RequestType.JSON,params,jsonObject.toJSONString(),headers).assetsSuccess(true); xmAppApi.doRequest(RequestType.JSON,params,jsonObject.toJSONString(),headers).assetsSuccess(true);
......
src/main/java/com/xiaomai/cases/polar/finance/order/TestRefundOrderDeposit.java
...@@ -2,6 +2,7 @@ package com.xiaomai.cases.polar.finance.order; ...@@ -2,6 +2,7 @@ package com.xiaomai.cases.polar.finance.order;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.admin.AdminTools;
import com.xiaomai.cases.polar.member.Tools; import com.xiaomai.cases.polar.member.Tools;
import com.xiaomai.cases.polar.memberCard.CardTools; import com.xiaomai.cases.polar.memberCard.CardTools;
import com.xiaomai.enums.ApiModule; import com.xiaomai.enums.ApiModule;
...@@ -27,6 +28,8 @@ public class TestRefundOrderDeposit extends XMBaseTest { ...@@ -27,6 +28,8 @@ public class TestRefundOrderDeposit extends XMBaseTest {
OrderTools orderTools; OrderTools orderTools;
@Resource(name = "cardTools") @Resource(name = "cardTools")
CardTools cardTools; CardTools cardTools;
@Resource(name = "adminTools")
AdminTools adminTools;
@BeforeMethod @BeforeMethod
public void beforeTest(){ public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Finance) xmAppApi.setApiModule(ApiModule.Polar_Finance)
...@@ -71,6 +74,16 @@ public class TestRefundOrderDeposit extends XMBaseTest { ...@@ -71,6 +74,16 @@ public class TestRefundOrderDeposit extends XMBaseTest {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("operationTime",System.currentTimeMillis()); jsonObject.put("operationTime",System.currentTimeMillis());
JSONArray businessOwners=new JSONArray();
JSONObject businessOwners1=new JSONObject();
businessOwners1.put("ownerId",xmAppApi.getLoginInfo().getAdminId());
String ownerName=adminTools.getStudioAdmin(xmAppApi.getLoginInfo().getAdminId()).getJSONObject("result").getString("nickName");
businessOwners1.put("ownerName",ownerName);
businessOwners1.put("percent",100);
businessOwners.add(businessOwners1);
jsonObject.put("businessOwners",businessOwners);
jsonObject.put("card",card); jsonObject.put("card",card);
jsonObject.put("objectId", UUID.randomUUID().toString()); jsonObject.put("objectId", UUID.randomUUID().toString());
jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId()); jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId());
...@@ -79,6 +92,9 @@ public class TestRefundOrderDeposit extends XMBaseTest { ...@@ -79,6 +92,9 @@ public class TestRefundOrderDeposit extends XMBaseTest {
jsonObject.put("operatorId",xmAppApi.getLoginInfo().getAdminId()); jsonObject.put("operatorId",xmAppApi.getLoginInfo().getAdminId());
jsonObject.put("paymentWays",new JSONArray()); jsonObject.put("paymentWays",new JSONArray());
jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId()); jsonObject.put("brandId",xmAppApi.getLoginInfo().getBrandId());
jsonObject.put("fee",0);
jsonObject.put("refundableAmount",0);
jsonObject.put("refundAmount",0);
//调用请求 //调用请求
xmAppApi.doRequest(RequestType.JSON,params,jsonObject.toJSONString(),headers).assetsSuccess(true); xmAppApi.doRequest(RequestType.JSON,params,jsonObject.toJSONString(),headers).assetsSuccess(true);
......
src/main/java/com/xiaomai/cases/polar/finance/salary/TestSettleSubmitOrUpdateOrDelete.java
...@@ -106,7 +106,7 @@ public class TestSettleSubmitOrUpdateOrDelete extends BaseTestImpl { ...@@ -106,7 +106,7 @@ public class TestSettleSubmitOrUpdateOrDelete extends BaseTestImpl {
settleDetailId = fetchSettleResult.getJSONObject(i).getString("id"); settleDetailId = fetchSettleResult.getJSONObject(i).getString("id");
Assert.assertTrue(fetchSettleResult.getJSONObject(i).getDouble("totalAmount")>0,"结算单结算明细中结算金额小于0"); Assert.assertTrue(fetchSettleResult.getJSONObject(i).getDouble("totalAmount")>0,"结算单结算明细中结算金额小于0");
Assert.assertTrue(fetchSettleResult.getJSONObject(i).getJSONObject("coachPay").getDouble("amount")>0,"结算单结算明细中上课绩效结算金额小于0"); Assert.assertTrue(fetchSettleResult.getJSONObject(i).getJSONObject("coachPay").getDouble("amount")>0,"结算单结算明细中上课绩效结算金额小于0");
Assert.assertTrue(fetchSettleResult.getJSONObject(i).getJSONObject("salePay").getDouble("amount")>0,"结算单结算明细中销售绩效结算金额小于0"); Assert.assertTrue(fetchSettleResult.getJSONObject(i).getJSONObject("salePay").getDouble("amount")>=0,"结算单结算明细中销售绩效结算金额小于0");
break; break;
} }
} }
......
src/main/java/com/xiaomai/cases/polar/goods/TestGoodsOrderByDeposit.java
...@@ -3,6 +3,7 @@ package com.xiaomai.cases.polar.goods; ...@@ -3,6 +3,7 @@ package com.xiaomai.cases.polar.goods;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.lunar.goods.GoodCTools; import com.xiaomai.cases.lunar.goods.GoodCTools;
import com.xiaomai.cases.lunar.user.UserTools; import com.xiaomai.cases.lunar.user.UserTools;
import com.xiaomai.cases.polar.admin.AdminTools;
import com.xiaomai.cases.polar.data.financeData.FinanceDataTools; import com.xiaomai.cases.polar.data.financeData.FinanceDataTools;
import com.xiaomai.cases.polar.finance.order.OrderTools; import com.xiaomai.cases.polar.finance.order.OrderTools;
import com.xiaomai.cases.polar.goods.Tools.GoodTools; import com.xiaomai.cases.polar.goods.Tools.GoodTools;
...@@ -37,6 +38,7 @@ public class TestGoodsOrderByDeposit extends XMBaseTest { ...@@ -37,6 +38,7 @@ public class TestGoodsOrderByDeposit extends XMBaseTest {
CardTools cardTools=new CardTools(); CardTools cardTools=new CardTools();
FinanceDataTools financeDataTools=new FinanceDataTools(); FinanceDataTools financeDataTools=new FinanceDataTools();
AdminTools adminTools=new AdminTools();
String memberId; String memberId;
...@@ -184,8 +186,10 @@ public class TestGoodsOrderByDeposit extends XMBaseTest { ...@@ -184,8 +186,10 @@ public class TestGoodsOrderByDeposit extends XMBaseTest {
BigDecimal amount=new BigDecimal(getLeftGoodsItem.getJSONObject("result").getString("leftConsumeAmount")); BigDecimal amount=new BigDecimal(getLeftGoodsItem.getJSONObject("result").getString("leftConsumeAmount"));
String ownerName=adminTools.getStudioAdmin(xmAppApi.getLoginInfo().getAdminId()).getJSONObject("result").getString("nickName");
//退货退款物品 //退货退款物品
JSONObject refundGoods=goodTools.refundGoods(quantity,refundAmount,true,voucherItemId,memberId,receivableAmount,amount,"1",cardPrice,cardBalance,cardId1); JSONObject refundGoods=goodTools.refundGoods(xmAppApi.getLoginInfo().getAdminId(),ownerName,quantity,refundAmount,true,voucherItemId,memberId,receivableAmount,amount,"1",cardPrice,cardBalance,cardId1,0,amount,amount);
String refundOrderId1=refundGoods.getString("result"); String refundOrderId1=refundGoods.getString("result");
......
src/main/java/com/xiaomai/cases/polar/goods/TestRefundGoods.java
...@@ -3,6 +3,7 @@ package com.xiaomai.cases.polar.goods; ...@@ -3,6 +3,7 @@ package com.xiaomai.cases.polar.goods;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.lunar.goods.GoodCTools; import com.xiaomai.cases.lunar.goods.GoodCTools;
import com.xiaomai.cases.lunar.user.UserTools; import com.xiaomai.cases.lunar.user.UserTools;
import com.xiaomai.cases.polar.admin.AdminTools;
import com.xiaomai.cases.polar.data.financeData.FinanceDataTools; import com.xiaomai.cases.polar.data.financeData.FinanceDataTools;
import com.xiaomai.cases.polar.finance.order.OrderTools; import com.xiaomai.cases.polar.finance.order.OrderTools;
import com.xiaomai.cases.polar.goods.Tools.GoodTools; import com.xiaomai.cases.polar.goods.Tools.GoodTools;
...@@ -33,6 +34,7 @@ public class TestRefundGoods extends XMBaseTest { ...@@ -33,6 +34,7 @@ public class TestRefundGoods extends XMBaseTest {
OrderTools orderTools=new OrderTools(); OrderTools orderTools=new OrderTools();
FinanceDataTools financeDataTools=new FinanceDataTools(); FinanceDataTools financeDataTools=new FinanceDataTools();
AdminTools adminTools=new AdminTools();
String memberId; String memberId;
...@@ -155,8 +157,10 @@ public class TestRefundGoods extends XMBaseTest { ...@@ -155,8 +157,10 @@ public class TestRefundGoods extends XMBaseTest {
BigDecimal amount=new BigDecimal(getLeftGoodsItem.getJSONObject("result").getString("leftConsumeAmount")); BigDecimal amount=new BigDecimal(getLeftGoodsItem.getJSONObject("result").getString("leftConsumeAmount"));
String ownerName=adminTools.getStudioAdmin(xmAppApi.getLoginInfo().getAdminId()).getJSONObject("result").getString("nickName");
//退货退款物品 //退货退款物品
JSONObject refundGoods=goodTools.refundGoods(quantity,refundAmount,true,voucherItemId,memberId,receivableAmount,amount,"1",new BigDecimal("0.00"),new BigDecimal("0.00"),""); JSONObject refundGoods=goodTools.refundGoods(xmAppApi.getLoginInfo().getAdminId(),ownerName,quantity,refundAmount,true,voucherItemId,memberId,receivableAmount,amount,"1",new BigDecimal("0.00"),new BigDecimal("0.00"),"",0,amount,amount);
String refundOrderId1=refundGoods.getString("result"); String refundOrderId1=refundGoods.getString("result");
...@@ -232,7 +236,7 @@ public class TestRefundGoods extends XMBaseTest { ...@@ -232,7 +236,7 @@ public class TestRefundGoods extends XMBaseTest {
//仅退款物品 //仅退款物品
JSONObject refundGoods_onlyAmount=goodTools.refundGoods(quantity_onlyAmount,refundAmount_onlyAmount,false,voucherItemId_onlyAmount,memberId,receivableAmount_onlyAmount,amount_onlyAmount,"1",new BigDecimal("0.00"),new BigDecimal("0.00"),""); JSONObject refundGoods_onlyAmount=goodTools.refundGoods(xmAppApi.getLoginInfo().getAdminId(),ownerName,quantity_onlyAmount,refundAmount_onlyAmount,false,voucherItemId_onlyAmount,memberId,receivableAmount_onlyAmount,amount_onlyAmount,"1",new BigDecimal("0.00"),new BigDecimal("0.00"),"",0,amount_onlyAmount,amount_onlyAmount);
String refundOrderId2_onlyAmount=refundGoods_onlyAmount.getString("result"); String refundOrderId2_onlyAmount=refundGoods_onlyAmount.getString("result");
......
src/main/java/com/xiaomai/cases/polar/goods/Tools/GoodTools.java
...@@ -991,8 +991,9 @@ public class GoodTools extends XMBaseTest { ...@@ -991,8 +991,9 @@ public class GoodTools extends XMBaseTest {
* @author: yff * @author: yff
**/ **/
public JSONObject refundGoods(int quantity, BigDecimal refundAmount,boolean refundInventory,String voucherItemId,String memberId,BigDecimal receivableAmount, public JSONObject refundGoods(String ownerId,String ownerName,int quantity, BigDecimal refundAmount,boolean refundInventory,String voucherItemId,String memberId,BigDecimal receivableAmount,
BigDecimal amount,String paymentWay,BigDecimal depositRechargeAmount,BigDecimal depositGiveAmount,String depositCardId,DataUserInfo...userInfos){ BigDecimal amount,String paymentWay,BigDecimal depositRechargeAmount,BigDecimal depositGiveAmount,String depositCardId,
int fee,BigDecimal refundableAmount,BigDecimal refundAmount_actual,DataUserInfo...userInfos){
dataApi.setApiModule(ApiModule.Polar_Goods) dataApi.setApiModule(ApiModule.Polar_Goods)
.setApiName("API_refundGoods") .setApiName("API_refundGoods")
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
...@@ -1002,6 +1003,14 @@ public class GoodTools extends XMBaseTest { ...@@ -1002,6 +1003,14 @@ public class GoodTools extends XMBaseTest {
JSONObject refundGoods=new JSONObject(); JSONObject refundGoods=new JSONObject();
refundGoods.put("operationTime", TimeUtils.getTodayTime()); refundGoods.put("operationTime", TimeUtils.getTodayTime());
JSONArray businessOwners=new JSONArray();
JSONObject businessOwners1=new JSONObject();
businessOwners1.put("ownerId",ownerId);
businessOwners1.put("ownerName",ownerName);
businessOwners1.put("percent",100);
businessOwners.add(businessOwners1);
refundGoods.put("businessOwners",businessOwners);
JSONObject goods=new JSONObject(); JSONObject goods=new JSONObject();
goods.put("quantity",quantity); goods.put("quantity",quantity);
goods.put("refundAmount",refundAmount); goods.put("refundAmount",refundAmount);
...@@ -1026,6 +1035,9 @@ public class GoodTools extends XMBaseTest { ...@@ -1026,6 +1035,9 @@ public class GoodTools extends XMBaseTest {
refundGoods.put("depositRechargeAmount",depositRechargeAmount); refundGoods.put("depositRechargeAmount",depositRechargeAmount);
refundGoods.put("depositGiveAmount",depositGiveAmount); refundGoods.put("depositGiveAmount",depositGiveAmount);
refundGoods.put("depositCardId",depositCardId); refundGoods.put("depositCardId",depositCardId);
refundGoods.put("fee",fee);
refundGoods.put("refundableAmount",refundableAmount);
refundGoods.put("refundAmount",refundAmount_actual);
dataApi.doRequest(RequestType.JSON,dataparams,refundGoods.toString(),dataheadrs).assetsSuccess(true); dataApi.doRequest(RequestType.JSON,dataparams,refundGoods.toString(),dataheadrs).assetsSuccess(true);
......
src/main/java/com/xiaomai/cases/polar/member/TestForceUpdate.java
...@@ -2,6 +2,7 @@ package com.xiaomai.cases.polar.member; ...@@ -2,6 +2,7 @@ package com.xiaomai.cases.polar.member;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.admin.AdminTools;
import com.xiaomai.cases.polar.clue.MemberTools; import com.xiaomai.cases.polar.clue.MemberTools;
import com.xiaomai.cases.polar.finance.order.OrderTools; import com.xiaomai.cases.polar.finance.order.OrderTools;
import com.xiaomai.cases.polar.memberCard.CardTools; import com.xiaomai.cases.polar.memberCard.CardTools;
...@@ -30,6 +31,7 @@ public class TestForceUpdate extends XMBaseTest { ...@@ -30,6 +31,7 @@ public class TestForceUpdate extends XMBaseTest {
Tools tools= new Tools(); Tools tools= new Tools();
MemberTools memberTools=new MemberTools(); MemberTools memberTools=new MemberTools();
AdminTools adminTools=new AdminTools();
@BeforeMethod @BeforeMethod
...@@ -210,9 +212,12 @@ public class TestForceUpdate extends XMBaseTest { ...@@ -210,9 +212,12 @@ public class TestForceUpdate extends XMBaseTest {
} }
if (checkRefundableAmountResult == true) { if (checkRefundableAmountResult == true) {
String ownerName=adminTools.getStudioAdmin(xmAppApi.getLoginInfo().getAdminId()).getJSONObject("result").getString("nickName");
//退单-会员卡 //退单-会员卡
JSONObject refundOrderResult = orderTools.refundOrder(0, listUserRefundableId, quantity, price - price / 2, "MEMBER_CARD", JSONObject refundOrderResult = orderTools.refundOrder(xmAppApi.getLoginInfo().getAdminId(),ownerName,0, listUserRefundableId, quantity, price - price / 2, "MEMBER_CARD",
memberId, price - price / 2, price - price / 2, "1"); memberId, price - price / 2, price - price / 2, "1",0,new BigDecimal(price - price / 2),new BigDecimal(price - price / 2));
try { try {
Thread.sleep(3000); Thread.sleep(3000);
} catch (InterruptedException e) { } catch (InterruptedException e) {
......
src/main/java/com/xiaomai/cases/polar/memberCard/CardTools.java
...@@ -12,6 +12,7 @@ import com.xiaomai.utils.XMBaseTest; ...@@ -12,6 +12,7 @@ import com.xiaomai.utils.XMBaseTest;
import com.xiaomai.utils.XMJSONPath; import com.xiaomai.utils.XMJSONPath;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
...@@ -891,7 +892,7 @@ public class CardTools extends XMBaseTest { ...@@ -891,7 +892,7 @@ public class CardTools extends XMBaseTest {
} }
//储值卡操作退卡 //储值卡操作退卡
public JSONObject refundOrderDeposit(String memberCardId,String giftAmount,String rechargeAmount,String refundAmount,String memberId,String receivableAmount,List paymentWays,DataUserInfo...userInfos){ public JSONObject refundOrderDeposit(String memberCardId, String giftAmount, String rechargeAmount, String refundAmount, String memberId, String receivableAmount, List paymentWays, int fee, BigDecimal refundableAmount, BigDecimal refundAmount_actual, DataUserInfo...userInfos){
dataApi.setApiModule(ApiModule.Polar_Finance) dataApi.setApiModule(ApiModule.Polar_Finance)
.setApiName("API_refundOrderDeposit") .setApiName("API_refundOrderDeposit")
.setTerminal(Terminal.B); .setTerminal(Terminal.B);
...@@ -914,6 +915,9 @@ public class CardTools extends XMBaseTest { ...@@ -914,6 +915,9 @@ public class CardTools extends XMBaseTest {
jsonObject.put("operatorId",dataApi.getLoginInfo().getAdminId()); jsonObject.put("operatorId",dataApi.getLoginInfo().getAdminId());
jsonObject.put("paymentWays",paymentWays); jsonObject.put("paymentWays",paymentWays);
jsonObject.put("brandId",dataApi.getLoginInfo().getBrandId()); jsonObject.put("brandId",dataApi.getLoginInfo().getBrandId());
jsonObject.put("fee",fee);
jsonObject.put("refundableAmount",refundableAmount);
jsonObject.put("refundAmount",refundAmount_actual);
dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true); dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
return dataApi.getBodyInJSON(); return dataApi.getBodyInJSON();
......
src/main/java/com/xiaomai/cases/polar/memberCard/TestActivateMemberCard.java
package com.xiaomai.cases.polar.memberCard; package com.xiaomai.cases.polar.memberCard;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.admin.AdminTools;
import com.xiaomai.cases.polar.finance.order.OrderTools; import com.xiaomai.cases.polar.finance.order.OrderTools;
import com.xiaomai.enums.ApiModule; import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.LoginAccount; import com.xiaomai.enums.LoginAccount;
...@@ -12,6 +13,7 @@ import org.testng.annotations.BeforeClass; ...@@ -12,6 +13,7 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal;
/** /**
* 售卖记录详情-会员卡开卡 * 售卖记录详情-会员卡开卡
...@@ -25,6 +27,8 @@ public class TestActivateMemberCard extends GetMemberCardBaseInfoForSign { ...@@ -25,6 +27,8 @@ public class TestActivateMemberCard extends GetMemberCardBaseInfoForSign {
CardTools cardTools; CardTools cardTools;
@Resource(name = "orderTools") @Resource(name = "orderTools")
OrderTools orderTools; OrderTools orderTools;
@Resource(name = "adminTools")
AdminTools adminTools;
@BeforeClass @BeforeClass
@Override @Override
public void beforeTest() { public void beforeTest() {
...@@ -66,9 +70,11 @@ public class TestActivateMemberCard extends GetMemberCardBaseInfoForSign { ...@@ -66,9 +70,11 @@ public class TestActivateMemberCard extends GetMemberCardBaseInfoForSign {
Assert.assertTrue(totalBefore==1,"会员购卡后没生成购买的消耗记录"); Assert.assertTrue(totalBefore==1,"会员购卡后没生成购买的消耗记录");
Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].consumeType").equals("PURCHASE"),"会员购卡后生成消耗记录不是购买"); Assert.assertTrue(XMJSONPath.readPath(dataApi.getApi_response(),"$.result.records[0].consumeType").equals("PURCHASE"),"会员购卡后生成消耗记录不是购买");
String ownerName=adminTools.getStudioAdmin(xmAppApi.getLoginInfo().getAdminId()).getJSONObject("result").getString("nickName");
//操作退卡 //操作退卡
orderTools.refundOrder(2,memberAccountCardId,quantity,price,"MEMBER_CARD", orderTools.refundOrder(xmAppApi.getLoginInfo().getAdminId(),ownerName,2,memberAccountCardId,quantity,price,"MEMBER_CARD",
memberId,price,price,"1"); memberId,price,price,"1",0,new BigDecimal(price),new BigDecimal(price));
String refundOrderId=XMJSONPath.readPath(dataApi.getApi_response(),"$.result"); String refundOrderId=XMJSONPath.readPath(dataApi.getApi_response(),"$.result");
......
src/main/java/com/xiaomai/cases/polar/memberCard/TestCreateTerm.java
...@@ -52,7 +52,7 @@ public class TestCreateTerm extends XMBaseTest { ...@@ -52,7 +52,7 @@ public class TestCreateTerm extends XMBaseTest {
Object.put("price","1"); Object.put("price","1");
benefitList.add(Object); benefitList.add(Object);
String title="期限-自动化会员卡"+RandomStringUtil.randomString(3); String title="期限-自动化会员卡"+RandomStringUtil.randomString(4);
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
......
src/main/java/com/xiaomai/cases/polar/membercluster/TestCreateMemberCluster.java
...@@ -168,6 +168,11 @@ public class TestCreateMemberCluster extends BaseTestImpl { ...@@ -168,6 +168,11 @@ public class TestCreateMemberCluster extends BaseTestImpl {
Thread.sleep(2000); Thread.sleep(2000);
//7.1 批量发放微信消息 //7.1 批量发放微信消息
memberClusterTools.batchMessagePushForMemberCluster(clusterIdA, "WECHAT_COMMON"); memberClusterTools.batchMessagePushForMemberCluster(clusterIdA, "WECHAT_COMMON");
if("分群数据同步中，请稍后再操作".equals(XMJSONPath.readPath(dataApi.getApi_response(), "$.message"))){
Thread.sleep(10000);
memberClusterTools.batchMessagePushForMemberCluster(clusterIdA, "WECHAT_COMMON");
}
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.success")) == true, "调用接口返回结果：" + XMJSONPath.readPath(dataApi.getApi_response(), "$.message")); Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.success")) == true, "调用接口返回结果：" + XMJSONPath.readPath(dataApi.getApi_response(), "$.message"));
Thread.sleep(2000); Thread.sleep(2000);
......
src/main/java/com/xiaomai/cases/polar/reserve/group/TestBatchReserveGroup.java
...@@ -177,11 +177,11 @@ public class TestBatchReserveGroup extends BaseTestImpl { ...@@ -177,11 +177,11 @@ public class TestBatchReserveGroup extends BaseTestImpl {
//获取会员卡信息 //获取会员卡信息
//获取会员卡列表,没有则新建一个 //获取会员卡列表,没有则新建一个
int cardTotal = Integer.parseInt(orderTools.fetchPageOfMemberCard("次卡-100天-100次", "MEMBER_CARD").getJSONObject("result").getString("total")); int cardTotal = Integer.parseInt(orderTools.fetchPageOfMemberCard("次卡不低于7次卡", "MEMBER_CARD").getJSONObject("result").getString("total"));
if (cardTotal == 0) { if (cardTotal == 0) {
cardId = cardTools.memberCardCreate("次卡-约课会员卡" + TimeUtils.getCurrentTime()).getString("result"); cardId = cardTools.memberCardCreate("次卡不低于7次卡卡" + TimeUtils.getCurrentTime()).getString("result");
} }
JSONObject memberCard = orderTools.fetchPageOfMemberCard("次卡", "MEMBER_CARD"); JSONObject memberCard = orderTools.fetchPageOfMemberCard("次卡不低于7次卡", "MEMBER_CARD");
cardId = memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id"); cardId = memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
BigDecimal quantity = new BigDecimal(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getJSONArray("benefitList").getJSONObject(0).getString("balance")); BigDecimal quantity = new BigDecimal(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getJSONArray("benefitList").getJSONObject(0).getString("balance"));
float price = Float.parseFloat(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("price")); float price = Float.parseFloat(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("price"));
...@@ -240,11 +240,11 @@ public class TestBatchReserveGroup extends BaseTestImpl { ...@@ -240,11 +240,11 @@ public class TestBatchReserveGroup extends BaseTestImpl {
//获取会员卡信息 //获取会员卡信息
//获取会员卡列表,没有则新建一个 //获取会员卡列表,没有则新建一个
int cardTotal = Integer.parseInt(orderTools.fetchPageOfMemberCard("次卡", "MEMBER_CARD").getJSONObject("result").getString("total")); int cardTotal = Integer.parseInt(orderTools.fetchPageOfMemberCard("次卡不低于7次卡", "MEMBER_CARD").getJSONObject("result").getString("total"));
if (cardTotal == 0) { if (cardTotal == 0) {
cardId = cardTools.memberCardCreate("次卡-创建订单会员卡" + TimeUtils.getCurrentTime()).getString("result"); cardId = cardTools.memberCardCreate("次卡不低于7次卡卡" + TimeUtils.getCurrentTime()).getString("result");
} }
JSONObject memberCard = orderTools.fetchPageOfMemberCard("次卡", "MEMBER_CARD"); JSONObject memberCard = orderTools.fetchPageOfMemberCard("次卡不低于7次卡", "MEMBER_CARD");
cardId = memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id"); cardId = memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("id");
BigDecimal quantity = new BigDecimal(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getJSONArray("benefitList").getJSONObject(0).getString("balance")); BigDecimal quantity = new BigDecimal(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getJSONArray("benefitList").getJSONObject(0).getString("balance"));
float price = Float.parseFloat(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("price")); float price = Float.parseFloat(memberCard.getJSONObject("result").getJSONArray("records").getJSONObject(0).getString("price"));
......
src/main/java/com/xiaomai/cases/polar/reserve/personal/TestCreateNormalDate.java
...@@ -13,7 +13,6 @@ import org.testng.annotations.Test; ...@@ -13,7 +13,6 @@ import org.testng.annotations.Test;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
/** /**
* @BelongsProject: xm-sportstest * @BelongsProject: xm-sportstest
...@@ -97,6 +96,11 @@ public class TestCreateNormalDate extends BaseTestImpl { ...@@ -97,6 +96,11 @@ public class TestCreateNormalDate extends BaseTestImpl {
// 设置常规可约时间 // 设置常规可约时间
reserveTools.createNormalDate(xmAppApi.getLoginInfo().getAdminId(),normalTimeInfoRequests); reserveTools.createNormalDate(xmAppApi.getLoginInfo().getAdminId(),normalTimeInfoRequests);
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
JSONArray personalCoachTime = reserveTools.getPersonalCoachTime(xmAppApi.getLoginInfo().getAdminId(),"normalTimeVOS"); JSONArray personalCoachTime = reserveTools.getPersonalCoachTime(xmAppApi.getLoginInfo().getAdminId(),"normalTimeVOS");
for (int i = 0; i < personalCoachTime.size(); i++){ for (int i = 0; i < personalCoachTime.size(); i++){
......
src/main/java/com/xiaomai/cases/polar/schedule/camp/TestGetCampScheduleItemDetail.java
...@@ -18,6 +18,7 @@ import org.testng.annotations.BeforeClass; ...@@ -18,6 +18,7 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.Set; import java.util.Set;
/** /**
...@@ -120,7 +121,7 @@ public class TestGetCampScheduleItemDetail extends SelectTargetTrainingCampAndGe ...@@ -120,7 +121,7 @@ public class TestGetCampScheduleItemDetail extends SelectTargetTrainingCampAndGe
Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(xmAppApi.getApi_response(), "$.result.venueAreaIds").isEmpty(), "创建排课时场地设置为空，但是课次详情中显示不为空哦"); Assert.assertTrue(XMJSONPath.getJSONArrayByReadPath(xmAppApi.getApi_response(), "$.result.venueAreaIds").isEmpty(), "创建排课时场地设置为空，但是课次详情中显示不为空哦");
//会员退款订单check //会员退款订单check
trainingTools.refundCampOrder(memberId, this.price, memberCardId, this.totalClassHour); trainingTools.refundCampOrder(memberId, this.price, memberCardId, this.totalClassHour,0,new BigDecimal(this.price),new BigDecimal(this.price));
Thread.sleep(2000); Thread.sleep(2000);
//退单后再次check课次详情 //退单后再次check课次详情
campScheduleTools.getCampScheduleItemDetail(scheduleId); campScheduleTools.getCampScheduleItemDetail(scheduleId);
......
src/main/java/com/xiaomai/cases/polar/schedule/camp/TestTrainingSign.java
...@@ -43,7 +43,7 @@ public class TestTrainingSign extends BaseTestImpl { ...@@ -43,7 +43,7 @@ public class TestTrainingSign extends BaseTestImpl {
@Test(description = "训练营签到") @Test(description = "训练营签到")
public void testTrainingSign() { public void testTrainingSign() {
// 训练营课表查询存量的训练营课次 // 训练营课表查询存量的训练营课次
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(), "1818220193259798530"); JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(), "1887314841778122754"); // 造存量训练营活动，最多课次只能排200个课时，所以需要训练营排课时间结束之后重新造训练营数据（因报名人数很多，所以可以进行批量导入）
scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId"); scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId");
// 训练营课次详情 // 训练营课次详情
...@@ -91,7 +91,7 @@ public class TestTrainingSign extends BaseTestImpl { ...@@ -91,7 +91,7 @@ public class TestTrainingSign extends BaseTestImpl {
String[] result = new String[]{"id", "benefitId", "reserveMemberNum", "courseType", "reserveState", "scheduleId", "signInState"}; String[] result = new String[]{"id", "benefitId", "reserveMemberNum", "courseType", "reserveState", "scheduleId", "signInState"};
String[] resultData = new String[]{reserveId, benefitId, "1", "TRAINING_CAMP", "SUCCESS", scheduleId, "SIGNED"}; String[] resultData = new String[]{reserveId, benefitId, "1", "TRAINING_CAMP", "SUCCESS", scheduleId, "SIGNED"};
// check 2.1 预约记录列表 // check 2.1 预约记录列表
JSONArray getPageByStudio = reserveTools.getPageByStudio("", "SUCCESS", "SIGNED", "", TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(), memberId, "TRAINING_CAMP", "1818220193259798530"); JSONArray getPageByStudio = reserveTools.getPageByStudio("", "SUCCESS", "SIGNED", "", TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(), memberId, "TRAINING_CAMP", "1887314841778122754");
boolean success = false; boolean success = false;
for (int i = 0; i < getPageByStudio.size(); i++) { for (int i = 0; i < getPageByStudio.size(); i++) {
if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)) { if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)) {
...@@ -123,7 +123,7 @@ public class TestTrainingSign extends BaseTestImpl { ...@@ -123,7 +123,7 @@ public class TestTrainingSign extends BaseTestImpl {
@Test(description = "训练营请假", priority = 1) @Test(description = "训练营请假", priority = 1)
public void testTrainingSign_Leave() { public void testTrainingSign_Leave() {
// 训练营课表查询存量的训练营课次 // 训练营课表查询存量的训练营课次
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1818220193259798530"); JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1887314841778122754");
scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId"); scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId");
// 训练营课次详情 // 训练营课次详情
...@@ -170,7 +170,7 @@ public class TestTrainingSign extends BaseTestImpl { ...@@ -170,7 +170,7 @@ public class TestTrainingSign extends BaseTestImpl {
String[] result = new String[] {"id","benefitId","reserveMemberNum","courseType","reserveState","scheduleId","signInState"}; String[] result = new String[] {"id","benefitId","reserveMemberNum","courseType","reserveState","scheduleId","signInState"};
String[] resultData = new String[] {reserveId,benefitId,"1","TRAINING_CAMP","SUCCESS",scheduleId,"LEAVE"}; String[] resultData = new String[] {reserveId,benefitId,"1","TRAINING_CAMP","SUCCESS",scheduleId,"LEAVE"};
// check 2.1 预约记录列表 // check 2.1 预约记录列表
JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","LEAVE","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1818220193259798530"); JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","LEAVE","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1887314841778122754");
boolean success = false; boolean success = false;
for(int i =0;i<getPageByStudio.size();i++){ for(int i =0;i<getPageByStudio.size();i++){
if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){ if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){
...@@ -204,7 +204,7 @@ public class TestTrainingSign extends BaseTestImpl { ...@@ -204,7 +204,7 @@ public class TestTrainingSign extends BaseTestImpl {
@Test(description = "训练营请假补签到", priority = 2) @Test(description = "训练营请假补签到", priority = 2)
public void testTrainingSign_SIGNED() { public void testTrainingSign_SIGNED() {
// 训练营课表查询存量的训练营课次 // 训练营课表查询存量的训练营课次
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1818220193259798530"); JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1887314841778122754");
scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId"); scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId");
// 训练营课次详情 // 训练营课次详情
...@@ -259,7 +259,7 @@ public class TestTrainingSign extends BaseTestImpl { ...@@ -259,7 +259,7 @@ public class TestTrainingSign extends BaseTestImpl {
String[] result = new String[] {"id","benefitId","reserveMemberNum","courseType","reserveState","scheduleId","signInState"}; String[] result = new String[] {"id","benefitId","reserveMemberNum","courseType","reserveState","scheduleId","signInState"};
String[] resultData = new String[] {reserveId,benefitId,"1","TRAINING_CAMP","SUCCESS",scheduleId,"SIGNED"}; String[] resultData = new String[] {reserveId,benefitId,"1","TRAINING_CAMP","SUCCESS",scheduleId,"SIGNED"};
// check 2.1 预约记录列表 // check 2.1 预约记录列表
JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","SIGNED","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1818220193259798530"); JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","SIGNED","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1887314841778122754");
boolean success = false; boolean success = false;
for(int i =0;i<getPageByStudio.size();i++){ for(int i =0;i<getPageByStudio.size();i++){
if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){ if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){
...@@ -294,7 +294,7 @@ public class TestTrainingSign extends BaseTestImpl { ...@@ -294,7 +294,7 @@ public class TestTrainingSign extends BaseTestImpl {
@Test(description = "训练营请假标记已补", priority = 3) @Test(description = "训练营请假标记已补", priority = 3)
public void testTrainingSign_MARK_REMEDIAL() { public void testTrainingSign_MARK_REMEDIAL() {
// 训练营课表查询存量的训练营课次 // 训练营课表查询存量的训练营课次
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1818220193259798530"); JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1887314841778122754");
scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId"); scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId");
// 训练营课次详情 // 训练营课次详情
...@@ -354,7 +354,7 @@ public class TestTrainingSign extends BaseTestImpl { ...@@ -354,7 +354,7 @@ public class TestTrainingSign extends BaseTestImpl {
String[] result = new String[] {"id","benefitId","reserveMemberNum","courseType","reserveState","scheduleId","signInState","remedialSignState"}; String[] result = new String[] {"id","benefitId","reserveMemberNum","courseType","reserveState","scheduleId","signInState","remedialSignState"};
String[] resultData = new String[] {reserveId,benefitId,"1","TRAINING_CAMP","SUCCESS",scheduleId,"LEAVE","MARK_REMEDIAL"}; String[] resultData = new String[] {reserveId,benefitId,"1","TRAINING_CAMP","SUCCESS",scheduleId,"LEAVE","MARK_REMEDIAL"};
// check 2.1 预约记录列表 // check 2.1 预约记录列表
JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","LEAVE","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1818220193259798530"); JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","LEAVE","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1887314841778122754");
boolean success = false; boolean success = false;
for(int i =0;i<getPageByStudio.size();i++){ for(int i =0;i<getPageByStudio.size();i++){
if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){ if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){
...@@ -388,7 +388,7 @@ public class TestTrainingSign extends BaseTestImpl { ...@@ -388,7 +388,7 @@ public class TestTrainingSign extends BaseTestImpl {
@Test(description = "训练营请假无需补课", priority = 3) @Test(description = "训练营请假无需补课", priority = 3)
public void testTrainingSign_NEED_NOT_REMEDIAL() { public void testTrainingSign_NEED_NOT_REMEDIAL() {
// 训练营课表查询存量的训练营课次 // 训练营课表查询存量的训练营课次
JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1818220193259798530"); JSONArray getCampScheduleTable = campScheduleTools.getCampScheduleTable(TimeUtils.getTodayTime(), TimeUtils.getTodayEndTime(),"1887314841778122754");
scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId"); scheduleId = getCampScheduleTable.getJSONObject(0).getString("scheduleId");
// 训练营课次详情 // 训练营课次详情
...@@ -448,7 +448,7 @@ public class TestTrainingSign extends BaseTestImpl { ...@@ -448,7 +448,7 @@ public class TestTrainingSign extends BaseTestImpl {
String[] result = new String[] {"id","benefitId","reserveMemberNum","courseType","reserveState","scheduleId","signInState","remedialSignState"}; String[] result = new String[] {"id","benefitId","reserveMemberNum","courseType","reserveState","scheduleId","signInState","remedialSignState"};
String[] resultData = new String[] {reserveId,benefitId,"1","TRAINING_CAMP","SUCCESS",scheduleId,"LEAVE","NEED_NOT_REMEDIAL"}; String[] resultData = new String[] {reserveId,benefitId,"1","TRAINING_CAMP","SUCCESS",scheduleId,"LEAVE","NEED_NOT_REMEDIAL"};
// check 2.1 预约记录列表 // check 2.1 预约记录列表
JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","LEAVE","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1818220193259798530"); JSONArray getPageByStudio = reserveTools.getPageByStudio("","SUCCESS","LEAVE","",TimeUtils.getTodayTime(),TimeUtils.getTodayEndTime(), memberId,"TRAINING_CAMP","1887314841778122754");
boolean success = false; boolean success = false;
for(int i =0;i<getPageByStudio.size();i++){ for(int i =0;i<getPageByStudio.size();i++){
if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){ if (getPageByStudio.getJSONObject(i).getString("id").equals(reserveId)){
......
src/main/java/com/xiaomai/cases/polar/setting/venue/TestSignAreaTimesOrder.java
...@@ -23,6 +23,7 @@ import org.testng.annotations.BeforeMethod; ...@@ -23,6 +23,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -200,7 +201,7 @@ public class TestSignAreaTimesOrder extends XMBaseTest { ...@@ -200,7 +201,7 @@ public class TestSignAreaTimesOrder extends XMBaseTest {
//作废优惠券 //作废优惠券
couponTools.abandonMembercouponReceiveRecord(userCouponId); couponTools.abandonMembercouponReceiveRecord(userCouponId);
//退优惠券 //退优惠券
cardTools.refundOrderDeposit(depositCardId,"1000","0","0",memberId,"0",new JSONArray()); cardTools.refundOrderDeposit(depositCardId,"1000","0","0",memberId,"0",new JSONArray(),0,new BigDecimal(0),new BigDecimal(0));
} }
} }
src/main/java/com/xiaomai/cases/polar/training/TestDoSignCampOrder.java
...@@ -18,6 +18,7 @@ import org.testng.annotations.BeforeClass; ...@@ -18,6 +18,7 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -72,7 +73,7 @@ public class TestDoSignCampOrder extends SelectTargetTrainingCampAndGetInfo { ...@@ -72,7 +73,7 @@ public class TestDoSignCampOrder extends SelectTargetTrainingCampAndGetInfo {
//报名详情-训练营报名退款 //报名详情-训练营报名退款
trainingTools.refundCampOrder(memberId, this.price, memberCardId, this.totalClassHour); trainingTools.refundCampOrder(memberId, this.price, memberCardId, this.totalClassHour,0,new BigDecimal(this.price),new BigDecimal(this.price));
Thread.sleep(1000); Thread.sleep(1000);
...@@ -116,6 +117,9 @@ public class TestDoSignCampOrder extends SelectTargetTrainingCampAndGetInfo { ...@@ -116,6 +117,9 @@ public class TestDoSignCampOrder extends SelectTargetTrainingCampAndGetInfo {
payObject.put("paymentWay", "1"); payObject.put("paymentWay", "1");
payObject.put("voucherResourceIds", new JSONArray()); payObject.put("voucherResourceIds", new JSONArray());
body.put("paymentWays", paymentWays); body.put("paymentWays", paymentWays);
body.put("fee",0);
body.put("refundableAmount",this.price);
body.put("refundAmount",this.price);
xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers).assetsSuccess(false); xmAppApi.doRequest(RequestType.JSON, params, body.toString(), headers).assetsSuccess(false);
Assert.assertEquals(XMJSONPath.readPath(xmAppApi.getApi_response(), "$.message"), "签单失败，已报名该训练营无需重复操作"); Assert.assertEquals(XMJSONPath.readPath(xmAppApi.getApi_response(), "$.message"), "签单失败，已报名该训练营无需重复操作");
} }
......
src/main/java/com/xiaomai/cases/polar/training/TrainingTools.java
...@@ -11,6 +11,7 @@ import org.springframework.stereotype.Component; ...@@ -11,6 +11,7 @@ import org.springframework.stereotype.Component;
import org.testng.Assert; import org.testng.Assert;
import org.testng.Reporter; import org.testng.Reporter;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
...@@ -396,7 +397,7 @@ public class TrainingTools extends XMBaseTest { ...@@ -396,7 +397,7 @@ public class TrainingTools extends XMBaseTest {
* @param memberCampId 会员的训练营账户ID * @param memberCampId 会员的训练营账户ID
* @param quantity 退出购买数量 * @param quantity 退出购买数量
*/ */
public void refundCampOrder(String memberId, Double refundAmount, String memberCampId, int quantity) { public void refundCampOrder(String memberId, Double refundAmount, String memberCampId, int quantity, int fee, BigDecimal refundableAmount,BigDecimal refundAmount_actual) {
setUP("API_refundCampOrder"); setUP("API_refundCampOrder");
JSONObject body = new JSONObject(); JSONObject body = new JSONObject();
body.put("operatorId", dataApi.getLoginInfo().getAdminId()); body.put("operatorId", dataApi.getLoginInfo().getAdminId());
...@@ -422,6 +423,10 @@ public class TrainingTools extends XMBaseTest { ...@@ -422,6 +423,10 @@ public class TrainingTools extends XMBaseTest {
payObject.put("voucherResourceIds", new JSONArray()); payObject.put("voucherResourceIds", new JSONArray());
paymentWays.add(payObject); paymentWays.add(payObject);
body.put("paymentWays", paymentWays); body.put("paymentWays", paymentWays);
body.put("fee",fee);
body.put("refundableAmount",refundableAmount);
body.put("refundAmount",refundAmount_actual);
dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs); dataApi.doRequest(RequestType.JSON, dataparams, body.toString(), dataheadrs);
Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.success")) == true, "调用接口返回结果：" + XMJSONPath.readPath(dataApi.getApi_response(), "$.message")); Assert.assertTrue(Boolean.valueOf(XMJSONPath.readPath(dataApi.getApi_response(), "$.success")) == true, "调用接口返回结果：" + XMJSONPath.readPath(dataApi.getApi_response(), "$.message"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment