From ae917e09a897843344424ca7d36dd22c216f5f50 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 19 一月 2026 18:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java | 127 ++++++++++++++++++++++++++++++++++++------
1 files changed, 108 insertions(+), 19 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java b/server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java
index 9206f05..be04e8f 100644
--- a/server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -42,6 +42,9 @@
public static final String ORDER_SET ="ORDER_SET" ;
public static final String INTEGRAL_SET ="INTEGRAL_SET" ;
+ public static final String MEMBER_PREFIX = "member_";
+ public static final String SHOP_PREFIX = "shop_";
+
/**
* mq tag
*/
@@ -72,6 +75,13 @@
public static final String CASH_EXCHANGE_INTEGRAL_RATA = "CASH_EXCHANGE_INTEGRAL_RATA";//鐜伴噾-绉垎鍏戞崲姣斾緥锛�1鍏冨彲寰楀埌XXX绉垎锛�
+
+
+ public static final String MAIL_CONFIG = "MAIL_CONFIG";
+ public static final String FIRST_WEIGHT = "FIRST_WEIGHT";
+ public static final String CONTINUE_WEIGHT = "CONTINUE_WEIGHT";
+ public static final String FIRST_FEE = "FIRST_FEE";
+ public static final String CONTINUE_FEE = "CONTINUE_FEE";
public static final String INITIAL_ROLE = "INITIAL_ROLE";
@@ -126,11 +136,14 @@
public static final String COFFEE_ARTICLE_BACKGROUND = "COFFEE_ARTICLE_BACKGROUND";
+ public static final String TRANSFER_FILE = "TRANSFER_FILE";
+
public interface RedisKeys {
public static final String GOODSORDER_KEY = "ordercode_";
public static final String ACTIVITY_SIGN_KEY = "actcode_";
public static final String AFTERSALE_KEY = "salecode_";
+ public static final String WITHDRAW_KEY = "withdraw_";
}
/**
* 浼佷笟鏁版嵁鏉ユ簮 0骞冲彴娉ㄥ唽 1鍚庡彴瀵煎叆
@@ -324,6 +337,7 @@
SHOP_PICTURE(7, "鍟嗗鍥剧墖澶氬浘", "鍟嗗鍥剧墖澶氬浘"),
AFTERSALE_APPLY(8, "鐢宠鍞悗琛ュ厖璇存槑闄勪欢", "鐢宠鍞悗琛ュ厖璇存槑闄勪欢"),
AFTERSALE_KD(9, "鐢宠鍞悗閭瘎璇存槑闄勪欢", "鐢宠鍞悗閭瘎璇存槑闄勪欢"),
+ TRANSFER_FILE(10, "鎵撴鍑瘉", "鎵撴鍑瘉"),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -847,37 +861,54 @@
* 绉垎绫诲瀷
*/
public enum IntegralObjType {
- REGISTER(0, "骞冲彴娉ㄥ唽", "骞冲彴娉ㄥ唽",0),
- SIGNIN(1, "绛惧埌", "绛惧埌",0),
- SHARE(2, "鍒嗕韩閭�璇�", "鍒嗕韩閭�璇�",0),
- INVITENEWUSER(3, "閭�璇锋柊鐢ㄦ埛", "閭�璇锋柊鐢ㄦ埛",0),
- EXCHANGEGOODS(4, "鍏戞崲鍟嗗搧", "鍏戞崲鍟嗗搧",1),
- EXCHANGECOUPON(5, "鍏戞崲浼樻儬鍒�", "鍏戞崲浼樻儬鍒�",1),
- SHARE_INFO(6,"鍒嗕韩璧勮","鍒嗕韩璧勮",0),
- POST_COMMENTS(7,"鍙戝竷璇勮","鍙戝竷璇勮",0),
- COFFEE_MAP_CONSUME(8,"鍜栧暋鍦板浘娑堣垂","鍜栧暋鍦板浘娑堣垂",0),
- SHOP_ORDER(9,"浣欓鎶垫墸鍟嗗搧","浣欓鎶垫墸鍟嗗搧",1),
- AFTERSALE_BACK(10,"鍞悗閫�娆�","鍞悗閫�娆�",1),
- EXCHANGE_CARD(11,"鍗″厖鍊�","鍗″厖鍊�",0),
- SYSTEM_RECHARGE(12,"骞冲彴鍏呭��","骞冲彴鍏呭��",0),
- SYSTEM_DEDUCT(13,"骞冲彴鎵ｆ","骞冲彴鎵ｆ",0),
- SHOP_ORDER_CANCEL(14,"浣欓鎶垫墸鍟嗗搧閫�杩�","浣欓鎶垫墸鍟嗗搧閫�杩�",0),
- SHOP_ORDER_SETTLEMENT(15,"涓嬪崟缁撶畻閲戦","涓嬪崟缁撶畻閲戦",0), //缁忛攢鍟嗕笅鍗曠粨绠楅噾棰�
- SHOP_ORDER_CANCEL_SETTLEMENT(16,"鍙栨秷璁㈠崟缁撶畻閲戦杩旇繕","鍙栨秷璁㈠崟缁撶畻閲戦杩旇繕",0), //鍙栨秷璁㈠崟缁撶畻閲戦杩旇繕
- SHOP_YEAR_SETTLEMENT(17,"骞村害缁撶畻","骞村害缁撶畻",0) //骞村害缁撶畻
+ REGISTER(0, "娉ㄥ唽绉垎濂栧姳", "娉ㄥ唽鎴愬姛锛岃幏寰�${param}绉垎",0,0),
+ INVITENEWUSER(3, "閭�璇峰ソ鍙嬪緱绉垎", "鎺ㄨ崘濂藉弸${param}鎴愬姛锛岃幏寰�${param1}绉垎",0,0),
+ SYSTEM_RECHARGE(12,"绉垎鍙戞斁","骞冲彴濂栧姳锛岃幏寰�${param}绉垎",0,0),
+ SYSTEM_DEDUCT(13,"绉垎鎵ｉ櫎","骞冲彴鎵ｅ噺锛屾秷鑰�${param}绉垎",0,0),
+ MEMBER_ORDER_CANCEL(14,"鍙栨秷璁㈠崟閫�鍥�","浜ゆ槗閫�娆鹃��鍥烇紝鑾峰緱${param}绉垎",0,0),
+ MEMBER_ORDER(9,"涓嬪崟鎶垫墸","娑堣垂鎶垫墸锛屾秷鑰�${param}绉垎",1,0),
+ ORDER_DONATE(15,"娑堣垂杩旂Н鍒�","璐墿鎴愬姛锛岃幏寰�${param}绉垎",0,0),
+ SHOP_YEAR_SETTLEMENT(18,"绉垎杩囨湡","绉垎杩囨湡锛屾秷鑰�${param}绉垎",0,0),
+
+
+ ORDER_DONE_AMOUNT(16,"璁㈠崟缁撶畻","${param}璁㈠崟缁撶畻鎴愬姛锛岃幏寰楋骏${param1}鍏�",0,1),//${param}璁㈠崟缂栧彿锛�${param1}閲戦
+ WITHDRAW_APPLY(17,"浣欓鎻愮幇","浣欓鎻愮幇宸叉彁浜わ紝娑堣�楋骏${param}鍏�",0,1),
+ WITHDRAW_APPLY_BACK(19,"鎻愮幇閫�鍥�","浣欓鎻愮幇澶辫触锛岃幏寰楋骏${param}鍏�",0,1),
+ ORDER_DONE_AMOUNT_BACK(20,"璁㈠崟缁撶畻閫�鍥�","${param}璁㈠崟缁撶畻閫�鍥烇紝娑堣�楋骏${param1}鍏�",0,1),//${param}璁㈠崟缂栧彿锛�${param1}閲戦
+
+
+ SHOP_ORDER(21,"娑堣垂杩旂Н鍒�","浼氬憳${param}浜ゆ槗鎴愬姛锛岃幏寰�${param1}绉垎",0,0),//${param}鏄电О-鎵嬫満鍙�
+ SHOP_ORDER_CANCEL(22,"璁㈠崟鍙栨秷閫�鍥�","璁㈠崟鍙栨秷閫�鍥烇紝閫�鍥�${param}绉垎",0,0),
+ SHOP_SYSTEM_RECHARGE(23,"绉垎鍙戞斁","骞冲彴濂栧姳锛岃幏寰�${param}绉垎",0,0),
+ SHOP_SYSTEM_DEDUCT(24,"绉垎鎵ｉ櫎","骞冲彴鎵ｅ噺锛屾秷鑰�${param}绉垎",0,0),
+
+
+ //----------------搴熷純-------start---------
+ SIGNIN(1, "绛惧埌", "绛惧埌",0,0),
+ SHARE(2, "鍒嗕韩閭�璇�", "鍒嗕韩閭�璇�",0,0),
+ EXCHANGEGOODS(4, "鍏戞崲鍟嗗搧", "鍏戞崲鍟嗗搧",1,0),
+ EXCHANGECOUPON(5, "鍏戞崲浼樻儬鍒�", "鍏戞崲浼樻儬鍒�",1,0),
+ SHARE_INFO(6,"鍒嗕韩璧勮","鍒嗕韩璧勮",0,0),
+ POST_COMMENTS(7,"鍙戝竷璇勮","鍙戝竷璇勮",0,0),
+ COFFEE_MAP_CONSUME(8,"鍜栧暋鍦板浘娑堣垂","鍜栧暋鍦板浘娑堣垂",0,0),
+ AFTERSALE_BACK(10,"鍞悗閫�娆�","鍞悗閫�娆�",1,0),
+ EXCHANGE_CARD(11,"鍗″厖鍊�","鍗″厖鍊�",0,0),
+ //----------------搴熷純------end----------
;
// 鎴愬憳鍙橀噺
private String name;
private int key;
private String noteinfo;// 鎻忚堪
private Integer addTitle; // 0 = 鏂板锛�1 = 涓嶆柊澧�
+ private Integer type; // 0 = 绉垎锛�1=鐜伴噾
// 鏋勯�犳柟娉�
- IntegralObjType(int key, String name, String noteinfo ,Integer addTitle) {
+ IntegralObjType(int key, String name, String noteinfo ,Integer addTitle,Integer type) {
this.name = name;
this.key = key;
this.noteinfo = noteinfo;
this.addTitle = addTitle;
+ this.type = type;
}
// 鏅�氭柟娉�
@@ -898,6 +929,14 @@
}
}
return null;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public Integer getType() {
+ return type;
}
// get set 鏂规硶
@@ -954,6 +993,8 @@
BIG_AREA(13, "鍖哄煙鍒嗙被", "鍖哄煙鍒嗙被"),
APPLICABLE_BRAND(14, "閫傜敤鍝佺墝", "閫傜敤鍝佺墝"),
SERIES_BRAND(15, "鍝佺墝绯诲垪", "鍝佺墝绯诲垪"),
+ YUN_FEE(16, "杩愯垂閰嶇疆", "杩愯垂閰嶇疆"),
+ EXPRESS_DELIVERY(17, "蹇�掍俊鎭�", "蹇�掍俊鎭�"),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -1138,5 +1179,53 @@
}
}
+ public enum UserActionType {
+ CHANGE_SHOP(0, "缁忛攢鍟嗘洿鎹�","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愮粡閿�鍟嗘洿鎹€��" ),
+ CHANGE_SALETYPE(1, "缁忛攢鍟嗘洿鎹㈤攢鍞ā寮�","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愰攢鍞ā寮忓彉鏇淬��" ),
+ ;
+ // 鎴愬憳鍙橀噺
+ private int key;
+ private String name;
+ private String info;
+
+ // 鏋勯�犳柟娉�
+ UserActionType(int key, String name,String info ) {
+ this.key = key;
+ this.info = info;
+ this.name = name;
+ }
+ public static String getName(int index) {
+ for (UserActionType c : UserActionType.values()) {
+ if (c.getKey() == index) {
+ return c.name;
+ }
+ }
+ return null;
+ }
+
+ public int getKey() {
+ return key;
+ }
+
+ public void setKey(int key) {
+ this.key = key;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
+ }
}
--
Gitblit v1.9.3