收银和在线退款相关接口

d36541a4 · yangfangfang · c1bf9caf · d36541a4 · d36541a4 · d36541a4
Commit d36541a4 authored Jul 05, 2024 by yangfangfang
8 changed files
--- a/src/main/java/com/xiaomai/cases/lunar/order/TestMiniPay.java
+++ b/src/main/java/com/xiaomai/cases/lunar/order/TestMiniPay.java
@@ -140,7 +140,7 @@ public class TestMiniPay extends BaseTestImpl {
        DataUserInfo dataUserInfo = new DataUserInfo();
        dataUserInfo.setTerminal(Terminal.B);
-        dataUserInfo.setLoginUser(LoginAccount.YFF_PROD);
+        dataUserInfo.setLoginUser(LoginAccount.GYM_PROD);
        //校验获取B端签单订单详情：订单状态应是：已取消
        JSONObject getDetailBResult=orderTools.getDetail(voucherId,dataUserInfo);

--- a/src/main/java/com/xiaomai/cases/polar/finance/cashier/TestCheckBeforeRefund.java
+++ b/src/main/java/com/xiaomai/cases/polar/finance/cashier/TestCheckBeforeRefund.java
@@ -21,7 +21,7 @@ public class TestCheckBeforeRefund extends XMBaseTest {
    public void beforeTest(){
        xmAppApi.setApiModule(ApiModule.Polar_Finance)
                .setApiName("API_checkBeforeRefund")
-                .setLoginUser(LoginAccount.YFF_PROD)
+                .setLoginUser(LoginAccount.GYM_PROD)
                .setTerminal(Terminal.B);
        dal.setCase_owner("yff")
                .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);

--- a/src/main/java/com/xiaomai/cases/polar/finance/cashier/TestGetById.java
+++ b/src/main/java/com/xiaomai/cases/polar/finance/cashier/TestGetById.java
@@ -18,7 +18,7 @@ public class TestGetById extends XMBaseTest {
    public void beforeTest(){
        xmAppApi.setApiModule(ApiModule.Polar_Finance)
                .setApiName("API_getById")
-                .setLoginUser(LoginAccount.YFF_PROD)
+                .setLoginUser(LoginAccount.GYM_PROD)
                .setTerminal(Terminal.B);
        dal.setCase_owner("yff")
                .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);

--- a/src/main/java/com/xiaomai/cases/polar/finance/cashier/TestPage.java
+++ b/src/main/java/com/xiaomai/cases/polar/finance/cashier/TestPage.java
@@ -18,7 +18,7 @@ public class TestPage extends XMBaseTest {
    public void beforeTest(){
        xmAppApi.setApiModule(ApiModule.Polar_Finance)
                .setApiName("API_page")
-                .setLoginUser(LoginAccount.YFF_PROD)
+                .setLoginUser(LoginAccount.GYM_PROD)
                .setTerminal(Terminal.B);
        dal.setCase_owner("yff")
                .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);

--- a/src/main/java/com/xiaomai/cases/polar/finance/cashier/TestPageSettle.java
+++ b/src/main/java/com/xiaomai/cases/polar/finance/cashier/TestPageSettle.java
@@ -16,7 +16,7 @@ public class TestPageSettle extends XMBaseTest {
    public void beforeTest(){
        xmAppApi.setApiModule(ApiModule.Polar_Finance)
                .setApiName("API_pageSettle")
-                .setLoginUser(LoginAccount.YFF_PROD)
+                .setLoginUser(LoginAccount.GYM_PROD)
                .setTerminal(Terminal.B);
        dal.setCase_owner("yff")
                .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);

--- a/src/main/java/com/xiaomai/cases/polar/finance/cashier/TestRefundByRecord.java
+++ b/src/main/java/com/xiaomai/cases/polar/finance/cashier/TestRefundByRecord.java
@@ -20,7 +20,7 @@ public class TestRefundByRecord extends XMBaseTest {
    public void beforeTest(){
        xmAppApi.setApiModule(ApiModule.Polar_Finance)
                .setApiName("API_refundByRecord")
-                .setLoginUser(LoginAccount.YFF_PROD)
+                .setLoginUser(LoginAccount.GYM_PROD)
                .setTerminal(Terminal.B);
        dal.setCase_owner("yff")
                .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);

--- a/src/main/java/com/xiaomai/cases/polar/finance/cashier/TestStatistic.java
+++ b/src/main/java/com/xiaomai/cases/polar/finance/cashier/TestStatistic.java
@@ -17,7 +17,7 @@ public class TestStatistic extends XMBaseTest {
    public void beforeTest(){
        xmAppApi.setApiModule(ApiModule.Polar_Finance)
                .setApiName("API_statistic")
-                .setLoginUser(LoginAccount.YFF_PROD)
+                .setLoginUser(LoginAccount.GYM_PROD)
                .setTerminal(Terminal.B);
        dal.setCase_owner("yff")
                .setCase_name(Thread.currentThread().getStackTrace()[1].getFileName().split("\\.")[0]);

--- a/src/main/java/com/xiaomai/cases/polar/finance/order/OrderTools.java
+++ b/src/main/java/com/xiaomai/cases/polar/finance/order/OrderTools.java
@@ -76,9 +76,6 @@ public class OrderTools extends XMBaseTest {
     * @description:获取会员详情-订单明细列表
     * @param supplierId：卖家ID 场馆ID
     * @param receiverId：会员ID
-     * @param brandId:品牌ID
-     * @param studioId：场馆ID
-     * @param operatorId：操作人ID
     * @author: yangfangfang
     **/
    public JSONObject pageMemberVoucherItem(String supplierId,String receiverId,DataUserInfo...dataUserInfos){
@@ -107,9 +104,6 @@ public class OrderTools extends XMBaseTest {
     * @param
     * @description:获取订单管理-订单管理列表
     * @param supplierId：卖家ID 场馆ID
-     * @param brandId:品牌ID
-     * @param studioId：场馆ID
-     * @param operatorId：操作人ID
     * @author: yangfangfang
     **/
    public JSONObject pageVoucher(String supplierId,DataUserInfo...dataUserInfos){
@@ -166,9 +160,6 @@ public class OrderTools extends XMBaseTest {
     * @param
     * @description:获取订单管理-订单管理金额统计
     * @param supplierId：卖家ID 场馆ID
-     * @param brandId:品牌ID
-     * @param studioId：场馆ID
-     * @param operatorId：操作人ID
     * @author: yangfangfang
     **/
    public JSONObject sumVoucherAmount(String supplierId,DataUserInfo...dataUserInfos){
@@ -195,9 +186,6 @@ public class OrderTools extends XMBaseTest {
     * @param
     * @description:获取订单管理-订单明细列表
     * @param supplierId：卖家ID 场馆ID
-     * @param brandId:品牌ID
-     * @param studioId：场馆ID
-     * @param operatorId：操作人ID
     * @author: yangfangfang
     **/
    public JSONObject pageVoucherItem(String supplierId,DataUserInfo...dataUserInfos){
@@ -224,9 +212,6 @@ public class OrderTools extends XMBaseTest {
     * @param
     * @description:获取订单管理-订单明细金额统计
     * @param supplierId：卖家ID 场馆ID
-     * @param brandId:品牌ID
-     * @param studioId：场馆ID
-     * @param operatorId：操作人ID
     * @author: yangfangfang
     **/
    public JSONObject sumVoucherItemAmount(String supplierId,DataUserInfo...dataUserInfos){
@@ -468,9 +453,6 @@ public class OrderTools extends XMBaseTest {
     * @description:修改对内备注
     * @param voucherId：主键ID 创建订单接口的result  订单id
     * @param supplierInnerMemo：对内备注
-     * @param brandId:品牌ID
-     * @param studioId：场馆ID
-     * @param operatorId：操作人ID
     * @author: yangfangfang
     **/
    public JSONObject modifySupplierInnerMemo(String voucherId,String supplierInnerMemo,  DataUserInfo...dataUserInfos){
@@ -497,9 +479,6 @@ public class OrderTools extends XMBaseTest {
     * @description:修改对外备注
     * @param voucherId：主键ID 创建订单接口的result  订单id
     * @param supplierMemo：对外备注
-     * @param brandId:品牌ID
-     * @param studioId：场馆ID
-     * @param operatorId：操作人ID
     * @author: yangfangfang
     **/
    public JSONObject modifySupplierMemo(String voucherId,String supplierMemo, DataUserInfo...dataUserInfos){
@@ -525,9 +504,6 @@ public class OrderTools extends XMBaseTest {
     * @param
     * @description:校验作废订单
     * @param id：主键ID 创建订单接口的result  订单id
-     * @param brandId:品牌ID
-     * @param studioId：场馆ID
-     * @param operatorId：操作人ID
     * @author: yangfangfang
     **/
    public JSONObject checkDiscardVoucher(String id,  DataUserInfo...dataUserInfos){