From 7ece553fd95f30dcfafa66f667ef9d0c064a22e6 Mon Sep 17 00:00:00 2001 From: xin <1099200748@qq.com> Date: Sat, 19 Jul 2025 16:27:12 +0800 Subject: [PATCH] Merge branch 'pxb' into xin --- oying-system/src/main/java/com/oying/modules/rider/utils/Constants.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 51 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 21c3053..ecbb6cc 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 @@ -20,10 +20,59 @@ * HTTP请求成功状态码 */ String HTTP_CODE_SUCCESS = "200"; + int HTTP_CODE_FAIL = 400; /** * 状态 0不生效,1生效 其他平台是否满足接单的条件 */ - String SOURCE_ENABLED_ON = "0"; - String SOURCE_ENABLED_DFF = "1"; + String SOURCE_ENABLED_ON = "1"; + String SOURCE_ENABLED_DFF = "0"; + + /** + * 初始值0 + */ + Integer ZERO = 0; + + /** + * 钱包状态(0冻结,1正常) + */ + String WALLET_STATUS_NORMAL = "1"; + String WALLET_STATUS_FROZEN = "0"; + /** + * 超时状态 1-是 0-否 + */ + String IS_OVERTIME_NO = "0"; + String IS_OVERTIME_YES = "1"; + + /** + * 订单来源: 1-平台派单 2-骑手抢单 3-商家直派 4-其他 + */ + String ORDER_SOURCE_PLATFORM = "1"; + String ORDER_SOURCE_RIDER = "2"; + String ORDER_SOURCE_DIRECT = "3"; + String ORDER_SOURCE_OTHER = "4"; + + /** + * 订单状态:0-已接单 1-已到店 2-配送中 3-已完成 4-商家取消 5-骑手取消 6-客户取消 7-系统取消 + */ + 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