Commit 2c827110 by yangfangfang

解决报错

parent b7a6cf20
......@@ -192,7 +192,7 @@ public class TestPurchaseCard extends BaseTestImpl {
//退单-会员卡
JSONObject refundOrderResult = orderTools.refundOrder(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 refundOrderGetDetailId = refundOrderResult.getString("result");
Assert.assertEquals(refundOrderSuccess, "true", "创建的C端订单退单失败");
......
......@@ -214,7 +214,7 @@ public class TestGetOrderData extends XMBaseTest {
//退单-会员卡
JSONObject refundOrderResult = orderTools.refundOrder(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
try {
......
......@@ -236,7 +236,7 @@ public class TestCenterData extends XMBaseTest {
if(checkRefundableAmountResult == true) {
//退单-会员卡
JSONObject refundOrderResult = orderTools.refundOrder(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");
try {
......
......@@ -760,7 +760,7 @@ public class OrderTools extends XMBaseTest {
* @author: yangfangfang
**/
public JSONObject refundOrder(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)
.setApiName("API_refundOrder")
......@@ -769,6 +769,13 @@ public class OrderTools extends XMBaseTest {
JSONObject jsonObject=new JSONObject();
jsonObject.put("operationTime",TimeUtils.getCurrentTime());
JSONArray businessOwners=new JSONArray();
JSONObject businessOwners1=new JSONObject();
businessOwners1.put("ownerId",dataApi.getLoginInfo().getAdminId());
businessOwners1.put("ownerName","");
businessOwners1.put("percent",100);
businessOwners.add(businessOwners1);
jsonObject.put("businessOwners",businessOwners);
JSONObject card=new JSONObject();
card.put("giftQuantity",giftQuantity);
......@@ -799,6 +806,11 @@ public class OrderTools extends XMBaseTest {
jsonObject.put("paymentWays",paymentWays);
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);
......
......@@ -137,7 +137,7 @@ public class TestDiscard extends XMBaseTest {
if(checkRefundableAmountResult == true) {
//退单-会员卡
JSONObject refundOrderResult=orderTools.refundOrder(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");
try {
......
......@@ -140,7 +140,7 @@ public class TestRefundOrder extends XMBaseTest {
//退单-会员卡
JSONObject refundOrderResult=orderTools.refundOrder(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 refundOrderGetDetailId=refundOrderResult.getString("result");
......
......@@ -212,7 +212,7 @@ public class TestForceUpdate extends XMBaseTest {
if (checkRefundableAmountResult == true) {
//退单-会员卡
JSONObject refundOrderResult = orderTools.refundOrder(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 {
Thread.sleep(3000);
} catch (InterruptedException e) {
......
......@@ -12,6 +12,7 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import javax.annotation.Resource;
import java.math.BigDecimal;
/**
* 售卖记录详情-会员卡开卡
......@@ -68,7 +69,7 @@ public class TestActivateMemberCard extends GetMemberCardBaseInfoForSign {
//操作退卡
orderTools.refundOrder(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");
......
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