From 044a57d2133b2363a6f0d3d167b3eaa587c70b91 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 31 Jul 2025 17:18:47 +0800
Subject: [PATCH] Merge branch 'pxb' into xin
---
oying-system/src/main/java/com/oying/modules/rider/utils/Constants.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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 04da98c..04a90b6 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,13 @@
* 超时状态 1-是 0-否
*/
String IS_OVERTIME_NO = "0";
- String IS_OVERTIME = "1";
+ String IS_OVERTIME_YES = "1";
+
+ /**
+ * 是否有效 1-有效 0-无效
+ */
+ String IS_VALID_YES = "1";
+ String IS_VALID_NO = "0";
/**
* 订单来源： 1-平台派单 2-骑手抢单 3-商家直派 4-其他
@@ -63,4 +69,16 @@
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