提交悠

This commit is contained in:
quyixiao 2025-11-17 21:02:26 +08:00
parent 4e3eaafef7
commit f9146aaa3d
25 changed files with 351 additions and 26 deletions

View File

@ -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"),
;
/***

View File

@ -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", "卖家拒绝退货退款"),

View File

@ -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<AbstractAction> actions = Arrays.asList(
public static final List<AbstractOrderAction> actions = Arrays.asList(
new ApplyReturnRefund(),
new CancelAction(),
new CloseAction(),
@ -28,7 +28,7 @@ public abstract class AbstractAction {
public static List<OrderActionDTO> getOrderActionDTO(VvTradeOrderLineEntity vvTradeOrderLineEntity, boolean isApp) {
List<OrderActionDTO> actionDTOS = new ArrayList<>();
for (AbstractAction action : actions) {
for (AbstractOrderAction action : actions) {
OrderActionEnums orderActionEnums = action.getAction(vvTradeOrderLineEntity, isApp);
if (orderActionEnums != null) {
OrderActionDTO orderActionDTO = new OrderActionDTO();

View File

@ -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<AbstractReverseAction> actions = Arrays.asList(
new SellerAgreeCancelAction()
);
public static List<OrderActionDTO> getOrderActionDTO(VvReverseOrderEntity vvReverseOrderEntity, boolean isApp) {
List<OrderActionDTO> 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;
}
}

View File

@ -73,7 +73,7 @@ public class VvTradeOrderConvertServiceImpl implements VvTradeOrderConvertServic
BeanUtils.copyProperties(vvPackage,adminPackageDTO);
}
adminPackageDTO.setVvTradeOrderLineDOList(mergeTradeOrderLine);
List<OrderActionDTO> orderActionList = AbstractAction.getOrderActionDTO(mergeTradeOrderLine.get(0), isApp);
List<OrderActionDTO> orderActionList = AbstractOrderAction.getOrderActionDTO(mergeTradeOrderLine.get(0), isApp);
adminPackageDTO.setOrderActionList(orderActionList);
packageList.add(adminPackageDTO);

View File

@ -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) {

View File

@ -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

View File

@ -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 (

View File

@ -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 (

View File

@ -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) {

View File

@ -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) {

View File

@ -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 (

View File

@ -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 (

View File

@ -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 (

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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;
}
}

View File

@ -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;
}
}