From f9146aaa3db3dfe21a2ded68bb3b9b14983ad8c0 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Mon, 17 Nov 2025 21:02:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=82=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heyu/api/data/enums/OrderActionEnums.java | 25 ++++++++++++- .../api/data/enums/ReverseStatusEnums.java | 6 +-- ...ctAction.java => AbstractOrderAction.java} | 6 +-- .../service/impl/AbstractReverseAction.java | 37 +++++++++++++++++++ .../impl/VvTradeOrderConvertServiceImpl.java | 2 +- .../api/service/impl/order/ApplyRefund.java | 4 +- .../service/impl/order/ApplyReturnRefund.java | 4 +- .../api/service/impl/order/CancelAction.java | 4 +- .../api/service/impl/order/CloseAction.java | 4 +- .../api/service/impl/order/DeleteAction.java | 4 +- .../service/impl/order/DeliveredAction.java | 4 +- .../api/service/impl/order/ShippedAction.java | 4 +- .../service/impl/order/ToShippingAction.java | 4 +- .../service/impl/order/UnShippingAction.java | 4 +- .../reverse/BuyerCloseReverseOrderAction.java | 22 +++++++++++ .../BuyerUploadReverseTrackNumberAction.java | 21 +++++++++++ .../impl/reverse/SellerAgreeCancelAction.java | 27 ++++++++++++++ .../impl/reverse/SellerAgreeRefundAction.java | 25 +++++++++++++ .../SellerAgreeReturnRefundAction.java | 26 +++++++++++++ .../reverse/SellerAgreeSignReceiptAction.java | 21 +++++++++++ .../reverse/SellerQaCheckFinishedAction.java | 21 +++++++++++ .../reverse/SellerRejectCancelAction.java | 28 ++++++++++++++ .../reverse/SellerRejectRefundAction.java | 27 ++++++++++++++ .../SellerRejectReturnRefundAction.java | 26 +++++++++++++ .../SellerRejectSignReceiptAction.java | 21 +++++++++++ 25 files changed, 351 insertions(+), 26 deletions(-) rename api-third/src/main/java/com/heyu/api/service/impl/{AbstractAction.java => AbstractOrderAction.java} (89%) create mode 100644 api-third/src/main/java/com/heyu/api/service/impl/AbstractReverseAction.java create mode 100644 api-third/src/main/java/com/heyu/api/service/impl/reverse/BuyerCloseReverseOrderAction.java create mode 100644 api-third/src/main/java/com/heyu/api/service/impl/reverse/BuyerUploadReverseTrackNumberAction.java create mode 100644 api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerAgreeCancelAction.java create mode 100644 api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerAgreeRefundAction.java create mode 100644 api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerAgreeReturnRefundAction.java create mode 100644 api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerAgreeSignReceiptAction.java create mode 100644 api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerQaCheckFinishedAction.java create mode 100644 api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerRejectCancelAction.java create mode 100644 api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerRejectRefundAction.java create mode 100644 api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerRejectReturnRefundAction.java create mode 100644 api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerRejectSignReceiptAction.java diff --git a/api-mapper/src/main/java/com/heyu/api/data/enums/OrderActionEnums.java b/api-mapper/src/main/java/com/heyu/api/data/enums/OrderActionEnums.java index eba437f..7ef5a3f 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/enums/OrderActionEnums.java +++ b/api-mapper/src/main/java/com/heyu/api/data/enums/OrderActionEnums.java @@ -21,7 +21,30 @@ public enum OrderActionEnums { App_Apply_Refund("App_Apply_Refund", "app申请退款,接口参数refundType传1 ", "/app/reverse/add"), - App_Apply_Return_Refund("App_Apply_Return_Refund", "app申请退货退款，接口参数refundType传2", "/app/reverse/add"); + App_Apply_Return_Refund("App_Apply_Return_Refund", "app申请退货退款，接口参数refundType传2", "/app/reverse/add"), + + Admin_Seller_Agree_Cancel("Admin_Seller_Agree_Cancel", "卖家同意取消", "/mm/reverse/approve"), + + Admin_Seller_Reject_Cancel("Admin_Seller_Reject_Cancel", "卖家拒绝取消", "/mm/reverse/approve"), + + Admin_Seller_Agree_Refund("Admin_Seller_Agree_Refund", "卖家同意退款", "/mm/reverse/approve"), + + Admin_Seller_Reject_Refund("Admin_Seller_Reject_Refund", "卖家拒绝退款", "/mm/reverse/approve"), + + Admin_Seller_Agree_Return_Refund("Admin_Seller_Agree_Refund", "卖家同意退货退款", "/mm/reverse/approve"), + + Admin_Seller_Reject_Return_Refund("Admin_Seller_Reject_Refund", "卖家拒绝退货退款", "/mm/reverse/approve"), + + App_Buyer_Upload_Reverse_TrackNumber("App_Buyer_Upload_Reverse_TrackNumber", "买家上传逆向tracknumber", "/app/reverse/tracknumber"), + + Admin_Seller_Agree_Sign_Receipt("Admin_Seller_Agree_Sign_Receipt", "卖家同意签收", "/mm/reverse/approve"), + + Admin_Seller_Reject_Sign_Receipt("Admin_Seller_Reject_Sign_Receipt", "卖家拒绝签收", "/mm/reverse/approve"), + + Admin_Seller_Qa_Check_Finished("Admin_Seller_Qa_Check_Finished", "卖家质检完成", "/mm/reverse/approve"), + + App_Buyer_Reverse_Order_Close("App_Buyer_Reverse_Order_Close", "买家申请退款后，可关闭逆向订单", "/app/reverse/close"), + ; /*** diff --git a/api-mapper/src/main/java/com/heyu/api/data/enums/ReverseStatusEnums.java b/api-mapper/src/main/java/com/heyu/api/data/enums/ReverseStatusEnums.java index 65a3fc1..055e5f6 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/enums/ReverseStatusEnums.java +++ b/api-mapper/src/main/java/com/heyu/api/data/enums/ReverseStatusEnums.java @@ -16,15 +16,15 @@ public enum ReverseStatusEnums { buyer_apply_cancel("buyer_apply_cancel", "买家申请订单取消"), - cancel("cancel", "卖家同意订单取消"), + seller_agree_cancel("seller_agree_cancel", "卖家同意订单取消"), - seller_reject_cancel("seller_reject_cancel", "买家拒绝取消"), + seller_reject_cancel("seller_reject_cancel", "卖家拒绝取消"), buyer_apply_refund_wait_seller_agree("buyer_apply_refund_wait_seller_agree", "买家申请仅退款，等待卖家同意,"), buyer_apply_return_wait_seller_agree("buyer_apply_return_wait_seller_agree", "买家申请退货退款，等待卖家同意,"), - seller_agree_return_wait_buyer_post("seller_agree_return_wait_buyer_post", "卖家同意退货，买家邮寄"), + seller_agree_return_wait_buyer_post("seller_agree_return_wait_buyer_post", "卖家同意退货，等待买家邮寄"), reject_return("reject_return", "卖家拒绝退货退款"), diff --git a/api-third/src/main/java/com/heyu/api/service/impl/AbstractAction.java b/api-third/src/main/java/com/heyu/api/service/impl/AbstractOrderAction.java similarity index 89% rename from api-third/src/main/java/com/heyu/api/service/impl/AbstractAction.java rename to api-third/src/main/java/com/heyu/api/service/impl/AbstractOrderAction.java index 1d6068f..292c061 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/AbstractAction.java +++ b/api-third/src/main/java/com/heyu/api/service/impl/AbstractOrderAction.java @@ -9,13 +9,13 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -public abstract class AbstractAction { +public abstract class AbstractOrderAction { public abstract OrderActionEnums getAction(VvTradeOrderLineEntity vvTradeOrderLineEntity, boolean isApp); - public static final List actions = Arrays.asList( + public static final List actions = Arrays.asList( new ApplyReturnRefund(), new CancelAction(), new CloseAction(), @@ -28,7 +28,7 @@ public abstract class AbstractAction { public static List getOrderActionDTO(VvTradeOrderLineEntity vvTradeOrderLineEntity, boolean isApp) { List actionDTOS = new ArrayList<>(); - for (AbstractAction action : actions) { + for (AbstractOrderAction action : actions) { OrderActionEnums orderActionEnums = action.getAction(vvTradeOrderLineEntity, isApp); if (orderActionEnums != null) { OrderActionDTO orderActionDTO = new OrderActionDTO(); diff --git a/api-third/src/main/java/com/heyu/api/service/impl/AbstractReverseAction.java b/api-third/src/main/java/com/heyu/api/service/impl/AbstractReverseAction.java new file mode 100644 index 0000000..5279fd6 --- /dev/null +++ b/api-third/src/main/java/com/heyu/api/service/impl/AbstractReverseAction.java @@ -0,0 +1,37 @@ +package com.heyu.api.service.impl; + +import com.heyu.api.alibaba.request.mm.order.resp.OrderActionDTO; +import com.heyu.api.data.entity.vv.VvReverseOrderEntity; +import com.heyu.api.data.enums.OrderActionEnums; +import com.heyu.api.service.impl.reverse.SellerAgreeCancelAction; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public abstract class AbstractReverseAction { + + + public abstract OrderActionEnums getAction(VvReverseOrderEntity vvReverseOrderEntity, boolean isApp,boolean isAdmin); + + + public static final List actions = Arrays.asList( + new SellerAgreeCancelAction() + ); + + public static List getOrderActionDTO(VvReverseOrderEntity vvReverseOrderEntity, boolean isApp) { + List actionDTOS = new ArrayList<>(); + for (AbstractReverseAction action : actions) { + OrderActionEnums orderActionEnums = action.getAction(vvReverseOrderEntity, isApp,!isApp); + if (orderActionEnums != null) { + OrderActionDTO orderActionDTO = new OrderActionDTO(); + orderActionDTO.setDesc(orderActionEnums.getDesc()); + orderActionDTO.setButtonName(orderActionEnums.getButtonName()); + orderActionDTO.setInterfaceUri(orderActionEnums.getInterfaceUri()); + actionDTOS.add(orderActionDTO); + } + } + return actionDTOS; + + } +} diff --git a/api-third/src/main/java/com/heyu/api/service/impl/VvTradeOrderConvertServiceImpl.java b/api-third/src/main/java/com/heyu/api/service/impl/VvTradeOrderConvertServiceImpl.java index 0f373af..1318da6 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/VvTradeOrderConvertServiceImpl.java +++ b/api-third/src/main/java/com/heyu/api/service/impl/VvTradeOrderConvertServiceImpl.java @@ -73,7 +73,7 @@ public class VvTradeOrderConvertServiceImpl implements VvTradeOrderConvertServic BeanUtils.copyProperties(vvPackage,adminPackageDTO); } adminPackageDTO.setVvTradeOrderLineDOList(mergeTradeOrderLine); - List orderActionList = AbstractAction.getOrderActionDTO(mergeTradeOrderLine.get(0), isApp); + List orderActionList = AbstractOrderAction.getOrderActionDTO(mergeTradeOrderLine.get(0), isApp); adminPackageDTO.setOrderActionList(orderActionList); packageList.add(adminPackageDTO); diff --git a/api-third/src/main/java/com/heyu/api/service/impl/order/ApplyRefund.java b/api-third/src/main/java/com/heyu/api/service/impl/order/ApplyRefund.java index 96d3431..0a8cc47 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/order/ApplyRefund.java +++ b/api-third/src/main/java/com/heyu/api/service/impl/order/ApplyRefund.java @@ -3,9 +3,9 @@ package com.heyu.api.service.impl.order; import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity; import com.heyu.api.data.enums.OrderActionEnums; import com.heyu.api.data.enums.OrderStatusEnums; -import com.heyu.api.service.impl.AbstractAction; +import com.heyu.api.service.impl.AbstractOrderAction; -public class ApplyRefund extends AbstractAction { +public class ApplyRefund extends AbstractOrderAction { @Override public OrderActionEnums getAction(VvTradeOrderLineEntity vvTradeOrderLineEntity, boolean isApp) { diff --git a/api-third/src/main/java/com/heyu/api/service/impl/order/ApplyReturnRefund.java b/api-third/src/main/java/com/heyu/api/service/impl/order/ApplyReturnRefund.java index da614b9..bb35d72 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/order/ApplyReturnRefund.java +++ b/api-third/src/main/java/com/heyu/api/service/impl/order/ApplyReturnRefund.java @@ -3,9 +3,9 @@ package com.heyu.api.service.impl.order; import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity; import com.heyu.api.data.enums.OrderActionEnums; import com.heyu.api.data.enums.OrderStatusEnums; -import com.heyu.api.service.impl.AbstractAction; +import com.heyu.api.service.impl.AbstractOrderAction; -public class ApplyReturnRefund extends AbstractAction { +public class ApplyReturnRefund extends AbstractOrderAction { @Override diff --git a/api-third/src/main/java/com/heyu/api/service/impl/order/CancelAction.java b/api-third/src/main/java/com/heyu/api/service/impl/order/CancelAction.java index c4e9db3..f785757 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/order/CancelAction.java +++ b/api-third/src/main/java/com/heyu/api/service/impl/order/CancelAction.java @@ -3,9 +3,9 @@ package com.heyu.api.service.impl.order; import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity; import com.heyu.api.data.enums.OrderActionEnums; import com.heyu.api.data.enums.OrderStatusEnums; -import com.heyu.api.service.impl.AbstractAction; +import com.heyu.api.service.impl.AbstractOrderAction; -public class CancelAction extends AbstractAction { +public class CancelAction extends AbstractOrderAction { @Override public OrderActionEnums getAction(VvTradeOrderLineEntity vvTradeOrderLineEntity, boolean isApp) { if ( diff --git a/api-third/src/main/java/com/heyu/api/service/impl/order/CloseAction.java b/api-third/src/main/java/com/heyu/api/service/impl/order/CloseAction.java index b82bde3..13c8adb 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/order/CloseAction.java +++ b/api-third/src/main/java/com/heyu/api/service/impl/order/CloseAction.java @@ -4,9 +4,9 @@ package com.heyu.api.service.impl.order; import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity; import com.heyu.api.data.enums.OrderActionEnums; import com.heyu.api.data.enums.OrderStatusEnums; -import com.heyu.api.service.impl.AbstractAction; +import com.heyu.api.service.impl.AbstractOrderAction; -public class CloseAction extends AbstractAction { +public class CloseAction extends AbstractOrderAction { @Override public OrderActionEnums getAction(VvTradeOrderLineEntity vvTradeOrderLineEntity, boolean isApp) { if ( diff --git a/api-third/src/main/java/com/heyu/api/service/impl/order/DeleteAction.java b/api-third/src/main/java/com/heyu/api/service/impl/order/DeleteAction.java index d43d9da..b30ac75 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/order/DeleteAction.java +++ b/api-third/src/main/java/com/heyu/api/service/impl/order/DeleteAction.java @@ -3,9 +3,9 @@ package com.heyu.api.service.impl.order; import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity; import com.heyu.api.data.enums.OrderActionEnums; import com.heyu.api.data.enums.OrderStatusEnums; -import com.heyu.api.service.impl.AbstractAction; +import com.heyu.api.service.impl.AbstractOrderAction; -public class DeleteAction extends AbstractAction { +public class DeleteAction extends AbstractOrderAction { @Override public OrderActionEnums getAction(VvTradeOrderLineEntity vvTradeOrderLineEntity, boolean isApp) { diff --git a/api-third/src/main/java/com/heyu/api/service/impl/order/DeliveredAction.java b/api-third/src/main/java/com/heyu/api/service/impl/order/DeliveredAction.java index e94ee59..1b6c16a 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/order/DeliveredAction.java +++ b/api-third/src/main/java/com/heyu/api/service/impl/order/DeliveredAction.java @@ -3,9 +3,9 @@ package com.heyu.api.service.impl.order; import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity; import com.heyu.api.data.enums.OrderActionEnums; import com.heyu.api.data.enums.OrderStatusEnums; -import com.heyu.api.service.impl.AbstractAction; +import com.heyu.api.service.impl.AbstractOrderAction; -public class DeliveredAction extends AbstractAction { +public class DeliveredAction extends AbstractOrderAction { @Override public OrderActionEnums getAction(VvTradeOrderLineEntity vvTradeOrderLineEntity, boolean isApp) { diff --git a/api-third/src/main/java/com/heyu/api/service/impl/order/ShippedAction.java b/api-third/src/main/java/com/heyu/api/service/impl/order/ShippedAction.java index 734ffcc..05b874a 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/order/ShippedAction.java +++ b/api-third/src/main/java/com/heyu/api/service/impl/order/ShippedAction.java @@ -3,9 +3,9 @@ package com.heyu.api.service.impl.order; import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity; import com.heyu.api.data.enums.OrderActionEnums; import com.heyu.api.data.enums.OrderStatusEnums; -import com.heyu.api.service.impl.AbstractAction; +import com.heyu.api.service.impl.AbstractOrderAction; -public class ShippedAction extends AbstractAction { +public class ShippedAction extends AbstractOrderAction { @Override public OrderActionEnums getAction(VvTradeOrderLineEntity vvTradeOrderLineEntity, boolean isApp) { if ( diff --git a/api-third/src/main/java/com/heyu/api/service/impl/order/ToShippingAction.java b/api-third/src/main/java/com/heyu/api/service/impl/order/ToShippingAction.java index 39f38ac..48547c2 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/order/ToShippingAction.java +++ b/api-third/src/main/java/com/heyu/api/service/impl/order/ToShippingAction.java @@ -3,9 +3,9 @@ package com.heyu.api.service.impl.order; import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity; import com.heyu.api.data.enums.OrderActionEnums; import com.heyu.api.data.enums.OrderStatusEnums; -import com.heyu.api.service.impl.AbstractAction; +import com.heyu.api.service.impl.AbstractOrderAction; -public class ToShippingAction extends AbstractAction { +public class ToShippingAction extends AbstractOrderAction { @Override public OrderActionEnums getAction(VvTradeOrderLineEntity vvTradeOrderLineEntity, boolean isApp) { if ( diff --git a/api-third/src/main/java/com/heyu/api/service/impl/order/UnShippingAction.java b/api-third/src/main/java/com/heyu/api/service/impl/order/UnShippingAction.java index acfbd91..78f695a 100644 --- a/api-third/src/main/java/com/heyu/api/service/impl/order/UnShippingAction.java +++ b/api-third/src/main/java/com/heyu/api/service/impl/order/UnShippingAction.java @@ -4,9 +4,9 @@ package com.heyu.api.service.impl.order; import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity; import com.heyu.api.data.enums.OrderActionEnums; import com.heyu.api.data.enums.OrderStatusEnums; -import com.heyu.api.service.impl.AbstractAction; +import com.heyu.api.service.impl.AbstractOrderAction; -public class UnShippingAction extends AbstractAction { +public class UnShippingAction extends AbstractOrderAction { @Override public OrderActionEnums getAction(VvTradeOrderLineEntity vvTradeOrderLineEntity, boolean isApp) { if ( diff --git a/api-third/src/main/java/com/heyu/api/service/impl/reverse/BuyerCloseReverseOrderAction.java b/api-third/src/main/java/com/heyu/api/service/impl/reverse/BuyerCloseReverseOrderAction.java new file mode 100644 index 0000000..cb314fa --- /dev/null +++ b/api-third/src/main/java/com/heyu/api/service/impl/reverse/BuyerCloseReverseOrderAction.java @@ -0,0 +1,22 @@ +package com.heyu.api.service.impl.reverse; + + +import com.heyu.api.data.entity.vv.VvReverseOrderEntity; +import com.heyu.api.data.enums.OrderActionEnums; +import com.heyu.api.data.enums.ReverseStatusEnums; +import com.heyu.api.service.impl.AbstractReverseAction; + +public class BuyerCloseReverseOrderAction extends AbstractReverseAction { + @Override + public OrderActionEnums getAction(VvReverseOrderEntity vvReverseOrderEntity, boolean isApp, boolean isAdmin) { + if ( + + ReverseStatusEnums.buyer_apply_cancel.getStatus().equals(vvReverseOrderEntity.getStatus()) + ) { + if (isApp) { + return OrderActionEnums.App_Buyer_Reverse_Order_Close; + } + } + return null; + } +} diff --git a/api-third/src/main/java/com/heyu/api/service/impl/reverse/BuyerUploadReverseTrackNumberAction.java b/api-third/src/main/java/com/heyu/api/service/impl/reverse/BuyerUploadReverseTrackNumberAction.java new file mode 100644 index 0000000..1536c47 --- /dev/null +++ b/api-third/src/main/java/com/heyu/api/service/impl/reverse/BuyerUploadReverseTrackNumberAction.java @@ -0,0 +1,21 @@ +package com.heyu.api.service.impl.reverse; + +import com.heyu.api.data.entity.vv.VvReverseOrderEntity; +import com.heyu.api.data.enums.OrderActionEnums; +import com.heyu.api.data.enums.ReverseStatusEnums; +import com.heyu.api.service.impl.AbstractReverseAction; + + +public class BuyerUploadReverseTrackNumberAction extends AbstractReverseAction { + @Override + public OrderActionEnums getAction(VvReverseOrderEntity vvReverseOrderEntity, boolean isApp, boolean isAdmin) { + if ( + ReverseStatusEnums.seller_agree_return_wait_buyer_post.getStatus().equals(vvReverseOrderEntity.getStatus()) + ) { + if (isApp) { + return OrderActionEnums.App_Buyer_Upload_Reverse_TrackNumber; + } + } + return null; + } +} diff --git a/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerAgreeCancelAction.java b/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerAgreeCancelAction.java new file mode 100644 index 0000000..5b64ea2 --- /dev/null +++ b/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerAgreeCancelAction.java @@ -0,0 +1,27 @@ +package com.heyu.api.service.impl.reverse; + +import com.heyu.api.data.entity.vv.VvReverseOrderEntity; +import com.heyu.api.data.enums.OrderActionEnums; +import com.heyu.api.data.enums.ReverseStatusEnums; +import com.heyu.api.service.impl.AbstractReverseAction; + +/*** + * 卖家同意取消 + */ +public class SellerAgreeCancelAction extends AbstractReverseAction { + + @Override + public OrderActionEnums getAction(VvReverseOrderEntity vvReverseOrderEntity, boolean isApp, boolean isAdmin) { + if ( + ReverseStatusEnums.buyer_apply_cancel.getStatus().equals(vvReverseOrderEntity.getStatus()) + ) { + if (isAdmin) { + return OrderActionEnums.Admin_Seller_Agree_Cancel; + } + } + return null; + } + + + +} diff --git a/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerAgreeRefundAction.java b/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerAgreeRefundAction.java new file mode 100644 index 0000000..b8a78ff --- /dev/null +++ b/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerAgreeRefundAction.java @@ -0,0 +1,25 @@ +package com.heyu.api.service.impl.reverse; + +import com.heyu.api.data.entity.vv.VvReverseOrderEntity; +import com.heyu.api.data.enums.OrderActionEnums; +import com.heyu.api.data.enums.ReverseStatusEnums; +import com.heyu.api.service.impl.AbstractReverseAction; + +/*** + * 卖家同意取消 + */ +public class SellerAgreeRefundAction extends AbstractReverseAction { + + @Override + public OrderActionEnums getAction(VvReverseOrderEntity vvReverseOrderEntity, boolean isApp, boolean isAdmin) { + if ( + ReverseStatusEnums.buyer_apply_refund_wait_seller_agree.getStatus().equals(vvReverseOrderEntity.getStatus()) + || ReverseStatusEnums.qa_check_finished.getStatus().equals(vvReverseOrderEntity.getStatus()) + ) { + if (isAdmin) { + return OrderActionEnums.Admin_Seller_Agree_Refund; + } + } + return null; + } +} diff --git a/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerAgreeReturnRefundAction.java b/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerAgreeReturnRefundAction.java new file mode 100644 index 0000000..920fafe --- /dev/null +++ b/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerAgreeReturnRefundAction.java @@ -0,0 +1,26 @@ +package com.heyu.api.service.impl.reverse; + +import com.heyu.api.data.entity.vv.VvReverseOrderEntity; +import com.heyu.api.data.enums.OrderActionEnums; +import com.heyu.api.data.enums.ReverseStatusEnums; +import com.heyu.api.service.impl.AbstractReverseAction; + +/*** + * 卖家同意取消 + */ +public class SellerAgreeReturnRefundAction extends AbstractReverseAction { + + @Override + public OrderActionEnums getAction(VvReverseOrderEntity vvReverseOrderEntity, boolean isApp, boolean isAdmin) { + if ( + ReverseStatusEnums.buyer_apply_return_wait_seller_agree.getStatus().equals(vvReverseOrderEntity.getStatus()) + ) { + if (isAdmin) { + return OrderActionEnums.Admin_Seller_Agree_Return_Refund; + } + } + return null; + + + } +} diff --git a/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerAgreeSignReceiptAction.java b/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerAgreeSignReceiptAction.java new file mode 100644 index 0000000..2bf1e78 --- /dev/null +++ b/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerAgreeSignReceiptAction.java @@ -0,0 +1,21 @@ +package com.heyu.api.service.impl.reverse; + +import com.heyu.api.data.entity.vv.VvReverseOrderEntity; +import com.heyu.api.data.enums.OrderActionEnums; +import com.heyu.api.data.enums.ReverseStatusEnums; +import com.heyu.api.service.impl.AbstractReverseAction; + +public class SellerAgreeSignReceiptAction extends AbstractReverseAction { + @Override + public OrderActionEnums getAction(VvReverseOrderEntity vvReverseOrderEntity, boolean isApp, boolean isAdmin) { + if ( + ReverseStatusEnums.shipped.getStatus().equals(vvReverseOrderEntity.getStatus()) + ) { + if (isAdmin) { + return OrderActionEnums.Admin_Seller_Agree_Sign_Receipt; + } + } + return null; + + } +} diff --git a/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerQaCheckFinishedAction.java b/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerQaCheckFinishedAction.java new file mode 100644 index 0000000..166eede --- /dev/null +++ b/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerQaCheckFinishedAction.java @@ -0,0 +1,21 @@ +package com.heyu.api.service.impl.reverse; + + +import com.heyu.api.data.entity.vv.VvReverseOrderEntity; +import com.heyu.api.data.enums.OrderActionEnums; +import com.heyu.api.data.enums.ReverseStatusEnums; +import com.heyu.api.service.impl.AbstractReverseAction; + +public class SellerQaCheckFinishedAction extends AbstractReverseAction { + @Override + public OrderActionEnums getAction(VvReverseOrderEntity vvReverseOrderEntity, boolean isApp, boolean isAdmin) { + if ( + ReverseStatusEnums.agree_sign_receipt.getStatus().equals(vvReverseOrderEntity.getStatus()) + ) { + if (isAdmin) { + return OrderActionEnums.Admin_Seller_Qa_Check_Finished; + } + } + return null; + } +} diff --git a/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerRejectCancelAction.java b/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerRejectCancelAction.java new file mode 100644 index 0000000..d2d7ae4 --- /dev/null +++ b/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerRejectCancelAction.java @@ -0,0 +1,28 @@ +package com.heyu.api.service.impl.reverse; + +import com.heyu.api.data.entity.vv.VvReverseOrderEntity; +import com.heyu.api.data.enums.OrderActionEnums; +import com.heyu.api.data.enums.ReverseStatusEnums; +import com.heyu.api.service.impl.AbstractReverseAction; + + +/*** + * 卖家拒绝取消 + */ +public class SellerRejectCancelAction extends AbstractReverseAction { + + + @Override + public OrderActionEnums getAction(VvReverseOrderEntity vvReverseOrderEntity, boolean isApp, boolean isAdmin) { + if ( + ReverseStatusEnums.buyer_apply_cancel.getStatus().equals(vvReverseOrderEntity.getStatus()) + ) { + if (isAdmin) { + return OrderActionEnums.Admin_Seller_Reject_Cancel; + } + } + return null; + + + } +} diff --git a/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerRejectRefundAction.java b/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerRejectRefundAction.java new file mode 100644 index 0000000..a965147 --- /dev/null +++ b/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerRejectRefundAction.java @@ -0,0 +1,27 @@ +package com.heyu.api.service.impl.reverse; + +import com.heyu.api.data.entity.vv.VvReverseOrderEntity; +import com.heyu.api.data.enums.OrderActionEnums; +import com.heyu.api.data.enums.ReverseStatusEnums; +import com.heyu.api.service.impl.AbstractReverseAction; + +/*** + * 卖家同意取消 + */ +public class SellerRejectRefundAction extends AbstractReverseAction { + + @Override + public OrderActionEnums getAction(VvReverseOrderEntity vvReverseOrderEntity, boolean isApp, boolean isAdmin) { + if ( + ReverseStatusEnums.buyer_apply_refund_wait_seller_agree.getStatus().equals(vvReverseOrderEntity.getStatus()) + || ReverseStatusEnums.qa_check_finished.getStatus().equals(vvReverseOrderEntity.getStatus()) + ) { + if (isAdmin) { + return OrderActionEnums.Admin_Seller_Reject_Refund; + } + } + return null; + + + } +} diff --git a/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerRejectReturnRefundAction.java b/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerRejectReturnRefundAction.java new file mode 100644 index 0000000..df6f343 --- /dev/null +++ b/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerRejectReturnRefundAction.java @@ -0,0 +1,26 @@ +package com.heyu.api.service.impl.reverse; + +import com.heyu.api.data.entity.vv.VvReverseOrderEntity; +import com.heyu.api.data.enums.OrderActionEnums; +import com.heyu.api.data.enums.ReverseStatusEnums; +import com.heyu.api.service.impl.AbstractReverseAction; + +/*** + * + */ +public class SellerRejectReturnRefundAction extends AbstractReverseAction { + + @Override + public OrderActionEnums getAction(VvReverseOrderEntity vvReverseOrderEntity, boolean isApp, boolean isAdmin) { + if ( + ReverseStatusEnums.buyer_apply_return_wait_seller_agree.getStatus().equals(vvReverseOrderEntity.getStatus()) + ) { + if (isAdmin) { + return OrderActionEnums.Admin_Seller_Reject_Return_Refund; + } + } + return null; + + + } +} diff --git a/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerRejectSignReceiptAction.java b/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerRejectSignReceiptAction.java new file mode 100644 index 0000000..1a4813d --- /dev/null +++ b/api-third/src/main/java/com/heyu/api/service/impl/reverse/SellerRejectSignReceiptAction.java @@ -0,0 +1,21 @@ +package com.heyu.api.service.impl.reverse; + +import com.heyu.api.data.entity.vv.VvReverseOrderEntity; +import com.heyu.api.data.enums.OrderActionEnums; +import com.heyu.api.data.enums.ReverseStatusEnums; +import com.heyu.api.service.impl.AbstractReverseAction; + +public class SellerRejectSignReceiptAction extends AbstractReverseAction { + @Override + public OrderActionEnums getAction(VvReverseOrderEntity vvReverseOrderEntity, boolean isApp, boolean isAdmin) { + if ( + ReverseStatusEnums.shipped.getStatus().equals(vvReverseOrderEntity.getStatus()) + ) { + if (isAdmin) { + return OrderActionEnums.Admin_Seller_Reject_Sign_Receipt; + } + } + return null; + + } +}