From 16e8c7adbee6c9ee9bac09a80d44d3bfd3fe2f0c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 09:45:38 +0800
Subject: [PATCH] Merge branch '2.0.2' into 2.0.1
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 61 +++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 7 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index 0a131b0..51c282c 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -64,10 +64,8 @@
public static final String PRIVACY ="PRIVACY";
public static final String USE ="USE";
-
public static final String GOODS_IMG_DIR ="GOODS_IMG_DIR";
public static final String CREDIT_CODE_REGEX = "[0-9A-HJ-NPQRTUWXY]{2}\\d{6}[0-9A-HJ-NPQRTUWXY]{10}";
-
public static final String ROOT_PATH="ROOT_PATH";//鏈湴鏂囦欢涓婁紶鍦板潃閰嶇疆
public static final String FILE_DIR="FILE_DIR";//鏈湴鏂囦欢璁块棶鍦板潃閰嶇疆
@@ -107,6 +105,38 @@
public static final String SIGN_DONE_NOTIFY_URL = "SIGN_DONE_NOTIFY_URL";
public static final int FOUR = 4;
public static final String COMPANY_PHONE_AUTH ="COMPANY_PHONE_AUTH" ;
+
+ /*RISK_TIMES_OPEN 椋庨櫓鎻愰啋璁剧疆-澶氭鍑虹幇鎻愰啋鏄惁寮�鍚細0=鍚︼紱1=鏄紱
+ RISK_TIMES_REPORT_TIMES 椋庨櫓鎻愰啋璁剧疆-澶氭鍑虹幇鎶ユ娆℃暟鎻愰啋
+ RISK_REPEAT_REPORT_OPEN 椋庨櫓鎻愰啋璁剧疆-閲嶅鎶ユ鏄惁寮�鍚細0=鍚︼紱1=鏄�;
+ RISK_REPEAT_REPORT_TIME_UNIT 椋庨櫓鎻愰啋璁剧疆-閲嶅鎶ユ鏃堕棿鍗曚綅锛�0鍒嗛挓 1灏忔椂 2澶�
+ RISK_REPEAT_REPORT_TIME 椋庨櫓鎻愰啋璁剧疆-閲嶅鎶ユ鏃堕棿
+ RISK_CLAIM_TIMES_OPEN 椋庨櫓鎻愰啋璁剧疆-绱㈣禂娆℃暟杩囧鏄惁寮�鍚細0=鍚︼紱1=鏄紱
+ RISK_CLAIM_TIMES 椋庨櫓鎻愰啋璁剧疆-绱㈣禂娆℃暟
+ RISK_NEW_MEMBER_OPEN 椋庨櫓鎻愰啋璁剧疆-鏂板憳宸ュ嚭闄╂彁閱掓槸鍚﹀紑鍚細0=鍚︼紱1=鏄�;
+ RISK_NEW_MEMBER_TIME_UNIT 椋庨櫓鎻愰啋璁剧疆-鏂板憳宸ュ嚭闄╂彁閱掓椂闂村崟浣嶏細0鍒嗛挓 1灏忔椂 2澶�
+ RISK_NEW_MEMBER_TIME 椋庨櫓鎻愰啋璁剧疆-鏂板憳宸ュ嚭闄╂彁閱掓椂闂�
+ RISK_SENSITIVE_WORDS_OPEN 椋庨櫓鎻愰啋璁剧疆-鏁忔劅璇嶆彁閱掓槸鍚﹀紑鍚細0=鍚︼紱1=鏄紱
+ RISK_SENSITIVE_WORDS 椋庨櫓鎻愰啋璁剧疆-澶氭鍑虹幇鎶ユ娆℃暟鎻愰啋*/
+
+ public static final String RISK_TIMES_OPEN ="RISK_TIMES_OPEN" ;
+ public static final String RISK_TIMES_REPORT_TIMES ="RISK_TIMES_REPORT_TIMES" ;
+ public static final String RISK_REPEAT_REPORT_OPEN ="RISK_REPEAT_REPORT_OPEN" ;
+ public static final String RISK_REPEAT_REPORT_TIME_UNIT ="RISK_REPEAT_REPORT_TIME_UNIT" ;
+ public static final String RISK_REPEAT_REPORT_TIME ="RISK_REPEAT_REPORT_TIME" ;
+ public static final String RISK_CLAIM_TIMES_OPEN ="RISK_CLAIM_TIMES_OPEN" ;
+ public static final String RISK_CLAIM_TIMES ="RISK_CLAIM_TIMES" ;
+ public static final String RISK_NEW_MEMBER_OPEN ="RISK_NEW_MEMBER_OPEN" ;
+ public static final String RISK_NEW_MEMBER_TIME_UNIT ="RISK_NEW_MEMBER_TIME_UNIT" ;
+ public static final String RISK_NEW_MEMBER_TIME ="RISK_NEW_MEMBER_TIME" ;
+ public static final String RISK_SENSITIVE_WORDS_OPEN ="RISK_SENSITIVE_WORDS_OPEN" ;
+ public static final String RISK_SENSITIVE_WORDS ="RISK_SENSITIVE_WORDS" ;
+
+
+
+
+
+
/**
@@ -734,6 +764,11 @@
CONTRACT_DONE_PDF(28, "鍚堝悓绛剧讲闄勪欢", "鍚堝悓绛剧讲闄勪欢"),
COMPANY_SOLUTION_SIGN_PDF(29, "浼佷笟绛剧讲鍚庢柟妗堢‘璁や功", "浼佷笟绛剧讲鍚庢柟妗堢‘璁や功"),
COMPANY_USER_APPLY(30, "浼佷笟鐢宠闆嗗洟鐢ㄦ埛闄勪欢", "浼佷笟鐢宠闆嗗洟鐢ㄦ埛闄勪欢"),
+
+ LP_STAMP_FILE(31, "淇濋櫓鍏徃鐞嗚禂鐩栫珷鏂囦欢", "淇濋櫓鍏徃鐞嗚禂鐩栫珷鏂囦欢"),
+ LP_FILE(32, "淇濋櫓鍏徃涓婁紶鐞嗚禂鏉愭枡涓�瑙堣〃", "淇濋櫓鍏徃涓婁紶鐞嗚禂鏉愭枡涓�瑙堣〃"),
+ LP_OTHER_FILE(33, "鐞嗚禂鍏朵粬鏉愭枡", "鐞嗚禂鍏朵粬鏉愭枡"),
+
;
// 鎴愬憳鍙橀噺
private String name;
@@ -1898,11 +1933,23 @@
public enum SettleClaimsStatus {
- WAIT_ACCEPTANCE(0, "寰呭彈鐞�"),
- RETURN_ACCEPTANCE(1, "閫�鍥炲彈鐞�"),
- DEAL_ING(2, "鍙楃悊涓�"),
- CONFIRM_INFORMATION(3, "纭璧勬枡"),
- FINISH_ACCEPTANCE(4, "瀹屾垚鍙楃悊"),
+ //鐘舵�� 0鏆傚瓨涓� 1宸叉姤妗� 2寰呯珛妗� 3宸茬珛妗� 4绔嬫閫�鍥� 5寰呭彈鐞� 6鎷掔粷鍙楃悊 7鍟嗚寰呭鎵�
+ // 8鍟嗚瀹℃壒鎷掔粷 9宸插彈鐞� 10寰呮牳璧� 11宸叉牳璧� 12寰呯粨妗� 13宸茬粨妗� 14宸叉挙妗�
+ WAIT_ACCEPTANCE(0, "鏆傚瓨涓�"),
+ RETURN_ACCEPTANCE(1, "宸叉姤妗�"),
+ DEAL_ING(2, "寰呯珛妗�"),
+ CONFIRM_INFORMATION(3, "宸茬珛妗�"),
+ FINISH_ACCEPTANCE(4, "绔嬫閫�鍥�"),
+ WAIT_DEAL(5, "寰呭彈鐞�"),
+ REJECT_DEAL(6, "鎷掔粷鍙楃悊"),
+ WAIT_DISCUSS_AUDIT(7, "寰呭晢璁鎵�"),
+ WAIT_DISCUSS_REJECT(8, "鍟嗚瀹℃壒鎷掔粷"),
+ ACCEPTANCE(9, "宸插彈鐞�"),
+ WAIT_AUDIT_COMPENSATION(10, "寰呮牳璧�"),
+ COMPENSATION(11, "宸叉牳璧�"),
+ WAIT_CLOSE_CASE(12, "寰呯粨妗�"),
+ CLOSE_CASE(13, "寰呯粨妗�"),
+ RETURN(14, "宸叉挙妗�"),
;
// 鎴愬憳鍙橀噺
private String name;
--
Gitblit v1.9.3