From 4ab710d8d70017f090dd9601099ded1a50a58a10 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 27 四月 2026 22:34:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/core/constants/Constants.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 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 fab08af..478b52a 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
@@ -50,6 +50,22 @@
public static final String USER_AGREEMENT ="USER_AGREEMENT" ;
public static final String PRIVACY_AGREEMENT ="PRIVACY_AGREEMENT" ;
+ public static final String STORE_RISK_COMMITMENT = "STORE_RISK_COMMITMENT";
+ public static final String STORE_COOPERATION_AGREEMENT = "STORE_COOPERATION_AGREEMENT";
+ public static final String STORE_LUGGAGE_STORAGE_NOTICE = "STORE_LUGGAGE_STORAGE_NOTICE";
+ public static final String STORE_PRIVACY_POLICY = "STORE_PRIVACY_POLICY";
+ public static final String OWNER_LUGGAGE_STORAGE_NOTICE = "OWNER_LUGGAGE_STORAGE_NOTICE";
+ public static final String OWNER_SERVICE_AGREEMENT = "OWNER_SERVICE_AGREEMENT";
+ public static final String OWNER_RISK_COMMITMENT = "OWNER_RISK_COMMITMENT";
+ public static final String ERRAND_RISK_COMMITMENT = "ERRAND_RISK_COMMITMENT";
+ public static final String ERRAND_SERVICE_AGREEMENT = "ERRAND_SERVICE_AGREEMENT";
+ public static final String ERRAND_LUGGAGE_STORAGE_NOTICE = "ERRAND_LUGGAGE_STORAGE_NOTICE";
+ public static final String USER_SERVICE_AGREEMENT = "USER_SERVICE_AGREEMENT";
+ public static final String USER_PRIVACY_POLICY = "USER_PRIVACY_POLICY";
+ public static final String DRIVER_PRIVACY_POLICY = "DRIVER_PRIVACY_POLICY";
+ public static final String PRICE_DESCRIPTION = "PRICE_DESCRIPTION";
+ public static final String PROHIBITED_ITEMS = "PROHIBITED_ITEMS";
+
public static final String ACCESS_ID="ACCESS_ID";
public static final String BUCKETNAME = "BUCKETNAME";
@@ -64,6 +80,7 @@
public static final Integer FOUR = 4;
public static final Integer SIX = 6;
public static final Integer FIVE = 5;
+ public static final Integer SEVEN = 7;
public static final String INENTITY_FILES = "INENTITY_FILES";
public static final String MEMBER_FILES = "MEMBER_FILES";
public static final String CATEGORY_FILES = "CATEGORY_FILES";
@@ -84,6 +101,7 @@
public static final String OP_AUTO_CONFIRM_RECEIPT = "AUTO_CONFIRM_RECEIPT";
public static final String OP_NO_GRAB_NOTIFY_TIME = "NO_GRAB_NOTIFY_TIME";
public static final String OP_NO_GRAB_NOTIFY_USERS = "NO_GRAB_NOTIFY_USERS";
+ public static final String OP_DEFAULT_DELIVERY_RANGE = "DEFAULT_DELIVERY_RANGE";
public static boolean WORKORDER_SHE_EMAIL_SENDING = false;
public static boolean DEALING_COMPANY_SYNC = false ;
public static boolean DEALING_MEMBER_SYNC = false ;
@@ -303,6 +321,8 @@
@Getter
@AllArgsConstructor
public enum OrderLogType {
+ createOrder(1, "鍒涘缓璁㈠崟", "浼氬憳鍒涘缓瀵勫瓨璁㈠崟锛岃鍗曠紪鍙枫�恵param}銆�"),
+ payOrder(1, "璁㈠崟鏀粯", "浼氬憳鏀粯鎴愬姛锛屾敮浠橀噾棰濄�恵param}銆戝厓"),
urgent(2, "骞冲彴鍔犳��", "骞冲彴鍔犳�ワ紝濂栧姳閲戙�恵param}銆戝厓"),
assignDriver(3, "骞冲彴鎸囨淳", "骞冲彴鎸囨淳鍙告満銆恵param}銆戞帴鍗曪紝濂栧姳閲戙�恵param1}銆戝厓"),
memberCancel(4, "浼氬憳鍙栨秷璁㈠崟", "{param}"),
@@ -392,7 +412,7 @@
if(Constants.equalsInteger(type,Constants.ZERO)){
return "寰呭彇浠�";
}else{
- return Constants.equalsInteger(type,Constants.ONE)?"宸插埌搴�":"宸查�佽揪";
+ return "宸查�佽揪";
}
}
return c.getValue();
@@ -413,9 +433,11 @@
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.cancelled.status}),
+ refund(5, "鍙栨秷", new int[]{OrderStatus.cancelled.status}),
home(6, "棣栭〉鏌ヨ", new int[]{OrderStatus.waitPay.status, OrderStatus.waitDeposit.status, OrderStatus.deposited.status
- , OrderStatus.accepted.status, OrderStatus.delivering.status, OrderStatus.arrived.status})
+ , OrderStatus.accepted.status, OrderStatus.delivering.status, OrderStatus.arrived.status}),
+ shopHome(7, "闂ㄥ簵棣栭〉鏌ヨ", new int[]{OrderStatus.waitDeposit.status, OrderStatus.deposited.status
+ , OrderStatus.delivering.status, OrderStatus.arrived.status})
;
private final int key;
private final String desc;
--
Gitblit v1.9.3