From c195fedbf4efd4bec5e2ffa14b57b2b81f15f17d Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Sat, 19 Jul 2025 16:26:13 +0800
Subject: [PATCH] 订单锁
---
oying-system/src/main/java/com/oying/modules/rider/utils/Constants.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 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..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
@@ -42,7 +42,7 @@
* 超时状态 1-是 0-否
*/
String IS_OVERTIME_NO = "0";
- String IS_OVERTIME = "1";
+ String IS_OVERTIME_YES = "1";
/**
* 订单来源： 1-平台派单 2-骑手抢单 3-商家直派 4-其他
@@ -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