From 5b122a6277c2fe4e80f0b16a7295ce4db685819b Mon Sep 17 00:00:00 2001 From: 彭雪彬 <1724387007@qq.com> Date: Wed, 16 Jul 2025 12:20:22 +0800 Subject: [PATCH] 骑手接单修改 --- oying-system/src/main/java/com/oying/modules/rider/utils/Constants.java | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/oying-system/src/main/java/com/oying/modules/rider/utils/Constants.java b/oying-system/src/main/java/com/oying/modules/rider/utils/Constants.java index c8c2fbd..af9f5c5 100644 --- a/oying-system/src/main/java/com/oying/modules/rider/utils/Constants.java +++ b/oying-system/src/main/java/com/oying/modules/rider/utils/Constants.java @@ -53,13 +53,26 @@ String ORDER_SOURCE_OTHER = "4"; /** - * 订单状态: 1-待取货 2-配送中 3-已完成 4-商家取消 5-骑手取消 6-客户取消 7-系统取消 + * 订单状态:0-已接单 1-已到店 2-配送中 3-已完成 4-商家取消 5-骑手取消 6-客户取消 7-系统取消 */ - String ORDER_STATUS_WAIT = "1"; + String ORDER_STATUS_OK = "0"; + String ORDER_STATUS_StORE = "1"; String ORDER_STATUS_DELIVERY = "2"; String ORDER_STATUS_FINISH = "3"; String ORDER_STATUS_CANCEL_MERCHANT = "4"; String ORDER_STATUS_CANCEL_RIDER = "5"; String ORDER_STATUS_CANCEL_CUSTOMER = "6"; String ORDER_STATUS_CANCEL_SYSTEM = "7"; + + /** + * 订单操作类型:1-上报到店 2-取货配送 + */ + String ORDER_OPERATION_TYPE_STORE = "1"; + String ORDER_OPERATION_TYPE_DELIVERY = "2"; + /** + * 收入类型:1-配送费,2-奖励,3-补贴 + */ + String INCOME_TYPE_DELIVERY = "1"; + String INCOME_TYPE_REWARD = "2"; + String INCOME_TYPE_SUBSIDY = "3"; } -- Gitblit v1.9.3