Skip to content

X
xm-sportstest
Commit 0f44a9ca by yangfangfang
Options

订单业绩归属人的代码优化

parent a0b5d679
Showing with 141 additions and 24 deletions
src/main/java/com/xiaomai/cases/lunar/order/TestPurchaseCard.java
......@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.xiaomai.basetest.BaseTestImpl;
import com.xiaomai.cases.lunar.minMemberCard.MinCardTools;
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.memberCard.CardTools;
import com.xiaomai.client.DataUserInfo;
......@@ -32,6 +33,7 @@ public class TestPurchaseCard extends BaseTestImpl {
@Resource(name = "orderTools")
OrderTools orderTools;
DataUserInfo dataUserInfo = new DataUserInfo();
AdminTools adminTools=new AdminTools();
public String memberId;
public String cardId;
......@@ -190,8 +192,17 @@ public class TestPurchaseCard extends BaseTestImpl {
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",0,new BigDecimal(0),new BigDecimal(0),dataUserInfo);
String refundOrderSuccess = refundOrderResult.getString("success");
String refundOrderGetDetailId = refundOrderResult.getString("result");
......
src/main/java/com/xiaomai/cases/polar/data/financeData/TestGetOrderData.java
package com.xiaomai.cases.polar.data.financeData;
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.member.Tools;
import com.xiaomai.cases.polar.memberCard.CardTools;
......@@ -26,6 +27,7 @@ public class TestGetOrderData extends XMBaseTest {
CardTools cardTools=new CardTools();
FinanceDataTools financeDataTools=new FinanceDataTools();
AdminTools adminTools=new AdminTools();
String memberId;
String cardId;
......@@ -212,8 +214,16 @@ public class TestGetOrderData extends XMBaseTest {
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",0,new BigDecimal(price),new BigDecimal(price));
String refundOrderGetDetailId = refundOrderResult.getString("result");//退单订单ID
......
src/main/java/com/xiaomai/cases/polar/data/salesData/TestCenterData.java
package com.xiaomai.cases.polar.data.salesData;
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.member.Tools;
import com.xiaomai.cases.polar.memberCard.CardTools;
......@@ -27,6 +28,8 @@ public class TestCenterData extends XMBaseTest {
SalesDataTools salesDataTools=new SalesDataTools();
AdminTools adminTools=new AdminTools();
String memberId;
String cardId;
......@@ -234,8 +237,11 @@ public class TestCenterData extends XMBaseTest {
}
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",0,new BigDecimal(price - price / 2),new BigDecimal(price - price / 2));
String refundOrderGetDetailId = refundOrderResult.getString("result");
......
src/main/java/com/xiaomai/cases/polar/entry/TestManual.java
package com.xiaomai.cases.polar.entry;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.admin.AdminTools;
import com.xiaomai.cases.polar.experienceCard.ExperienceCardTools;
import com.xiaomai.cases.polar.finance.order.OrderTools;
import com.xiaomai.cases.polar.member.Tools;
......@@ -29,6 +30,7 @@ public class TestManual extends XMBaseTest {
Tools tools = new Tools();
CardTools cardTools = new CardTools();
ExperienceCardTools experienceCardTools = new ExperienceCardTools();
AdminTools adminTools=new AdminTools();
String memberId;
String memberCardId;
String title;
......@@ -156,8 +158,10 @@ public class TestManual extends XMBaseTest {
BigDecimal entryQuantity1 = new BigDecimal(XMJSONPath.readPath(res1, "$.result.venueBenefit.leftPurchaseBalance"));
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",0,new BigDecimal(price+entryPrice1),new BigDecimal(price+entryPrice1));
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;
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.experienceCard.ExperienceCardTools;
......@@ -27,6 +28,7 @@ public class TestActiveExperienceCard extends XMBaseTest {
ExperienceCardTools experienceCardTools = new ExperienceCardTools();
CardTools cardTools = new CardTools();
OrderTools orderTools = new OrderTools();
AdminTools adminTools=new AdminTools();
String memberCardId;
String title;
BigDecimal quantity; //可用次数
......@@ -108,8 +110,11 @@ public class TestActiveExperienceCard extends XMBaseTest {
Assert.assertTrue(totalBefore == 1, "会员购卡后没生成购买的消耗记录");
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",0,new BigDecimal(price+entryPrice),new BigDecimal(price+entryPrice));
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");
......
src/main/java/com/xiaomai/cases/polar/finance/order/OrderTools.java
......@@ -2,6 +2,7 @@ package com.xiaomai.cases.polar.finance.order;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.admin.AdminTools;
import com.xiaomai.client.DataUserInfo;
import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.RequestType;
......@@ -748,6 +749,8 @@ public class OrderTools extends XMBaseTest {
/**
* @param
* @description:退单
* @param ownerId：业绩归属人ID --可用员工
* @param ownerName：业绩归属人昵称 --可用员工
* @param giftQuantity：退出赠送数量
* @param memberCardId:会员的卡id 从listUserRefundableCard中的id获取 不是买的时候的卡id
* @param quantity：退出购买数量
......@@ -757,9 +760,17 @@ public class OrderTools extends XMBaseTest {
* @param receivableAmount：应退金额
* @param amount：支付金额
* @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
**/
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,int fee,BigDecimal refundableAmount,BigDecimal refundAmount_actual,DataUserInfo...dataUserInfos){
dataApi.setApiModule(ApiModule.Polar_Finance)
......@@ -770,13 +781,14 @@ 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);
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();
card.put("giftQuantity",giftQuantity);
......@@ -812,15 +824,13 @@ public class OrderTools extends XMBaseTest {
jsonObject.put("refundAmount",refundAmount_actual);
dataApi.doRequest(RequestType.JSON, dataparams, jsonObject.toJSONString(), dataheadrs).assetsSuccess(true);
JSONObject response=dataApi.getBodyInJSON();
return response;
}
//双权益退卡
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,int fee,BigDecimal refundableAmount,BigDecimal refundAmount_actual,DataUserInfo...dataUserInfos){
dataApi.setApiModule(ApiModule.Polar_Finance)
......@@ -831,6 +841,14 @@ 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",ownerId);
businessOwners1.put("ownerName",ownerName);
businessOwners1.put("percent",100);
businessOwners.add(businessOwners1);
jsonObject.put("businessOwners",businessOwners);
JSONObject card=new JSONObject();
card.put("giftQuantity",giftQuantity);
card.put("memberCardId",memberCardId);
......
src/main/java/com/xiaomai/cases/polar/finance/order/TestDiscard.java
......@@ -2,6 +2,7 @@ package com.xiaomai.cases.polar.finance.order;
import com.alibaba.fastjson.JSONArray;
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.member.Tools;
import com.xiaomai.cases.polar.memberCard.CardTools;
......@@ -28,6 +29,7 @@ public class TestDiscard extends XMBaseTest {
RevenueAndExpenditureTools revenueAndExpenditureTools=new RevenueAndExpenditureTools();
CardTools cardTools=new CardTools();
AdminTools adminTools=new AdminTools();
@BeforeMethod
public void beforeTest(){
......@@ -135,8 +137,11 @@ public class TestDiscard extends XMBaseTest {
}
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",0,new BigDecimal(price - price / 2),new BigDecimal(price - price / 2));
String refundOrderGetDetailId=refundOrderResult.getString("result");
......
src/main/java/com/xiaomai/cases/polar/finance/order/TestRefundOrder.java
......@@ -2,6 +2,7 @@ package com.xiaomai.cases.polar.finance.order;
import com.alibaba.fastjson.JSONArray;
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.member.Tools;
import com.xiaomai.cases.polar.memberCard.CardTools;
......@@ -32,6 +33,7 @@ public class TestRefundOrder extends XMBaseTest {
RevenueAndExpenditureTools revenueAndExpenditureTools=new RevenueAndExpenditureTools();
CardTools cardTools=new CardTools();
AdminTools adminTools=new AdminTools();
@BeforeMethod
public void beforeTest(){
......@@ -138,8 +140,11 @@ public class TestRefundOrder extends XMBaseTest {
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",0,new BigDecimal(price - price / 2),new BigDecimal(price - price / 2));
String refundOrderSuccess=refundOrderResult.getString("success");
......
src/main/java/com/xiaomai/cases/polar/finance/order/TestRefundOrderByDeposit.java
......@@ -2,6 +2,7 @@ package com.xiaomai.cases.polar.finance.order;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.admin.AdminTools;
import com.xiaomai.cases.polar.member.Tools;
import com.xiaomai.cases.polar.memberCard.CardTools;
import com.xiaomai.enums.ApiModule;
......@@ -29,6 +30,9 @@ public class TestRefundOrderByDeposit extends XMBaseTest {
@Resource(name = "cardTools")
CardTools cardTools;
@Resource(name = "adminTools")
AdminTools adminTools;
@BeforeMethod
public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Finance)
......@@ -89,6 +93,16 @@ public class TestRefundOrderByDeposit extends XMBaseTest {
JSONObject jsonObject = new JSONObject();
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("objectId", UUID.randomUUID().toString());
jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId());
......
src/main/java/com/xiaomai/cases/polar/finance/order/TestRefundOrderDeposit.java
......@@ -2,6 +2,7 @@ package com.xiaomai.cases.polar.finance.order;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.admin.AdminTools;
import com.xiaomai.cases.polar.member.Tools;
import com.xiaomai.cases.polar.memberCard.CardTools;
import com.xiaomai.enums.ApiModule;
......@@ -27,6 +28,8 @@ public class TestRefundOrderDeposit extends XMBaseTest {
OrderTools orderTools;
@Resource(name = "cardTools")
CardTools cardTools;
@Resource(name = "adminTools")
AdminTools adminTools;
@BeforeMethod
public void beforeTest(){
xmAppApi.setApiModule(ApiModule.Polar_Finance)
......@@ -71,6 +74,16 @@ public class TestRefundOrderDeposit extends XMBaseTest {
JSONObject jsonObject = new JSONObject();
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("objectId", UUID.randomUUID().toString());
jsonObject.put("studioId",xmAppApi.getLoginInfo().getStudioId());
......
src/main/java/com/xiaomai/cases/polar/goods/TestGoodsOrderByDeposit.java
......@@ -3,6 +3,7 @@ package com.xiaomai.cases.polar.goods;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.lunar.goods.GoodCTools;
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.finance.order.OrderTools;
import com.xiaomai.cases.polar.goods.Tools.GoodTools;
......@@ -37,6 +38,7 @@ public class TestGoodsOrderByDeposit extends XMBaseTest {
CardTools cardTools=new CardTools();
FinanceDataTools financeDataTools=new FinanceDataTools();
AdminTools adminTools=new AdminTools();
String memberId;
......@@ -184,8 +186,10 @@ public class TestGoodsOrderByDeposit extends XMBaseTest {
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,0,amount,amount);
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");
......
src/main/java/com/xiaomai/cases/polar/goods/TestRefundGoods.java
......@@ -3,6 +3,7 @@ package com.xiaomai.cases.polar.goods;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.lunar.goods.GoodCTools;
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.finance.order.OrderTools;
import com.xiaomai.cases.polar.goods.Tools.GoodTools;
......@@ -33,6 +34,7 @@ public class TestRefundGoods extends XMBaseTest {
OrderTools orderTools=new OrderTools();
FinanceDataTools financeDataTools=new FinanceDataTools();
AdminTools adminTools=new AdminTools();
String memberId;
......@@ -155,8 +157,10 @@ public class TestRefundGoods extends XMBaseTest {
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"),"",0,amount,amount);
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");
......@@ -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"),"",0,amount_onlyAmount,amount_onlyAmount);
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");
......
src/main/java/com/xiaomai/cases/polar/goods/Tools/GoodTools.java
......@@ -991,7 +991,7 @@ public class GoodTools extends XMBaseTest {
* @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,
int fee,BigDecimal refundableAmount,BigDecimal refundAmount_actual,DataUserInfo...userInfos){
dataApi.setApiModule(ApiModule.Polar_Goods)
......@@ -1003,6 +1003,14 @@ public class GoodTools extends XMBaseTest {
JSONObject refundGoods=new JSONObject();
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();
goods.put("quantity",quantity);
goods.put("refundAmount",refundAmount);
......
src/main/java/com/xiaomai/cases/polar/member/TestForceUpdate.java
......@@ -2,6 +2,7 @@ package com.xiaomai.cases.polar.member;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.admin.AdminTools;
import com.xiaomai.cases.polar.clue.MemberTools;
import com.xiaomai.cases.polar.finance.order.OrderTools;
import com.xiaomai.cases.polar.memberCard.CardTools;
......@@ -30,6 +31,7 @@ public class TestForceUpdate extends XMBaseTest {
Tools tools= new Tools();
MemberTools memberTools=new MemberTools();
AdminTools adminTools=new AdminTools();
@BeforeMethod
......@@ -210,8 +212,11 @@ public class TestForceUpdate extends XMBaseTest {
}
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",0,new BigDecimal(price - price / 2),new BigDecimal(price - price / 2));
try {
Thread.sleep(3000);
......
src/main/java/com/xiaomai/cases/polar/memberCard/TestActivateMemberCard.java
package com.xiaomai.cases.polar.memberCard;
import com.alibaba.fastjson.JSONObject;
import com.xiaomai.cases.polar.admin.AdminTools;
import com.xiaomai.cases.polar.finance.order.OrderTools;
import com.xiaomai.enums.ApiModule;
import com.xiaomai.enums.LoginAccount;
......@@ -26,6 +27,8 @@ public class TestActivateMemberCard extends GetMemberCardBaseInfoForSign {
CardTools cardTools;
@Resource(name = "orderTools")
OrderTools orderTools;
@Resource(name = "adminTools")
AdminTools adminTools;
@BeforeClass
@Override
public void beforeTest() {
......@@ -67,8 +70,10 @@ public class TestActivateMemberCard extends GetMemberCardBaseInfoForSign {
Assert.assertTrue(totalBefore==1,"会员购卡后没生成购买的消耗记录");
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",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