From 55642c818f14bf8cf52c98e6858014bd8dc3d3a7 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 16 四月 2026 20:10:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/core/constants/Constants.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/constants/Constants.java b/server/services/src/main/java/com/doumee/core/constants/Constants.java
index d49123b..0409d47 100644
--- a/server/services/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/services/src/main/java/com/doumee/core/constants/Constants.java
@@ -18,11 +18,8 @@
*/
public class Constants {
- public static final String HWY_OBS ="HWY_OBS" ;
- public static final String HWY_OBS_ACCESSID ="HWY_OBS_ACCESSID" ;
- public static final String HWY_OBS_ACCESSKEY ="HWY_OBS_ACCESSKEY" ;
- public static final String HWY_OBS_ENDPOINT ="HWY_OBS_ENDPOINT" ;
- public static final String HWY_OBS_BUCKET ="HWY_OBS_BUCKET" ;
+ public static final String OSS ="OSS" ;
+
public static final String RESOURCE_PATH ="RESOURCE_PATH" ;
public static final String QYWX_CORPID = "QYWX_CORPID";
public static final String QYWX_SECRET = "QYWX_SECRET";
@@ -53,6 +50,11 @@
public static final String USER_AGREEMENT ="USER_AGREEMENT" ;
public static final String PRIVACY_AGREEMENT ="PRIVACY_AGREEMENT" ;
+ public static final String ACCESS_ID="ACCESS_ID";
+ public static final String BUCKETNAME = "BUCKETNAME";
+
+ public static final String ACCESS_KEY = "ACCESS_KEY";
+ public static final String ENDPOINT = "ENDPOINT";
public static final String QYWX = "QYWX";
public static final Integer ONE = 1;
@@ -413,7 +415,7 @@
STORAGE_ORDER("storageOrder", "瀵勫瓨璁㈠崟"),
SHOP_DEPOSIT("shopDeposit", "搴楅摵鎶奸噾璁㈠崟"),
DRIVER_DEPOSIT("driverDeposit", "鍙告満鎶奸噾璁㈠崟"),
- OVERDUE_FEE("overdueFee", "閫炬湡璐圭敤璁㈠崟")
+ OVERDUE_FEE("overdueFee", "璁㈠崟閫炬湡璐圭敤")
;
private final String key;
@@ -475,8 +477,8 @@
public enum OrderCombinedStatus {
waitPay(0, "寰呮敮浠�", new int[]{OrderStatus.waitPay.status}),
waitDeposit(1, "寰呮牳楠�", new int[]{OrderStatus.waitDeposit.status}),
- waitDeliver(2, "寰呴厤閫�", new int[]{OrderStatus.deposited.status}),
- waitReceive(3, "寰呮敹璐�", new int[]{OrderStatus.accepted.status, OrderStatus.delivering.status, OrderStatus.arrived.status}),
+ waitDeliver(2, "寰呴厤閫�", new int[]{OrderStatus.accepted.status}),
+ waitReceive(3, "寰呮敹璐�", new int[]{ OrderStatus.delivering.status, OrderStatus.arrived.status}),
finished(4, "宸插畬鎴�", new int[]{OrderStatus.finished.status}),
refund(5, "閫�娆�", new int[]{OrderStatus.closed.status, OrderStatus.cancelling.status})
;
--
Gitblit v1.9.3