From ed8eeb20e85871b44b5a0d51b96f5efa43d14d56 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 19 一月 2026 10:08:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java | 53 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 30 insertions(+), 23 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 67eb4b5..115c4fb 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
@@ -856,44 +856,43 @@
* 绉垎绫诲瀷
*/
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),
- ORDER_DONATE(15,"璁㈠崟璧犻�佺Н鍒�","璁㈠崟璧犻�佺Н鍒�",0),
- ORDER_DONE_AMOUNT(16,"璁㈠崟缁撶畻閲戦","璁㈠崟缁撶畻閲戦",0),
+ REGISTER(0, "骞冲彴娉ㄥ唽", "骞冲彴娉ㄥ唽",0,0),
+ SIGNIN(1, "绛惧埌", "绛惧埌",0,0),
+ SHARE(2, "鍒嗕韩閭�璇�", "鍒嗕韩閭�璇�",0,0),
+ INVITENEWUSER(3, "閭�璇锋柊鐢ㄦ埛", "閭�璇锋柊鐢ㄦ埛",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),
+ SHOP_ORDER(9,"绉垎鎶垫墸鍟嗗搧","绉垎鎶垫墸鍟嗗搧",1,0),
+ AFTERSALE_BACK(10,"鍞悗閫�娆�","鍞悗閫�娆�",1,0),
+ EXCHANGE_CARD(11,"鍗″厖鍊�","鍗″厖鍊�",0,0),
+ SYSTEM_RECHARGE(12,"骞冲彴鍏呭��","骞冲彴鍏呭��",0,0),
+ SYSTEM_DEDUCT(13,"骞冲彴鎵ｆ","骞冲彴鎵ｆ",0,0),
+ SHOP_ORDER_CANCEL(14,"绉垎鎶垫墸鍟嗗搧閫�杩�","绉垎鎶垫墸鍟嗗搧閫�杩�",0,0),
- WITHDRAW_APPLY(17,"浣欓鎻愮幇","浣欓鎻愮幇",0), //缁忛攢鍟嗕笅鍗曠粨绠楅噾棰�
+ ORDER_DONATE(15,"璁㈠崟璧犻�佺Н鍒�","璁㈠崟璧犻�佺Н鍒�",0,0),
+ ORDER_DONE_AMOUNT(16,"璁㈠崟缁撶畻閲戦","璁㈠崟缁撶畻閲戦",0,1),
+ WITHDRAW_APPLY(17,"浣欓鎻愮幇","浣欓鎻愮幇",0,1),
-
-
- SHOP_ORDER_CANCEL_SETTLEMENT(17,"鍙栨秷璁㈠崟缁撶畻閲戦杩旇繕","鍙栨秷璁㈠崟缁撶畻閲戦杩旇繕",0), //鍙栨秷璁㈠崟缁撶畻閲戦杩旇繕
- SHOP_YEAR_SETTLEMENT(18,"骞村害缁撶畻","骞村害缁撶畻",0) //骞村害缁撶畻
+ SHOP_YEAR_SETTLEMENT(18,"骞村害缁撶畻","骞村害缁撶畻",0,1)
;
// 鎴愬憳鍙橀噺
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;
}
// 鏅�氭柟娉�
@@ -916,6 +915,14 @@
return null;
}
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
// get set 鏂规硶
public String getName() {
return name;
--
Gitblit v1.9.3