From 22aaacd9e51da58ed10221639b6bd2fd9a13c6e5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 16 一月 2026 18:49:23 +0800
Subject: [PATCH] 经销商管理
---
server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java | 73 ++++++++++++++++++++++++++++++++++--
1 files changed, 68 insertions(+), 5 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 84e39a4..b2cb97c 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
@@ -1,6 +1,7 @@
package com.doumee.core.utils;
import com.doumee.dao.business.model.Areas;
+import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.collections4.CollectionUtils;
import java.math.BigDecimal;
@@ -30,8 +31,16 @@
public static final String ORDERSET_RETURN_SHOP_INTEGRAL_STATUS="ORDERSET_RETURN_SHOP_INTEGRAL_STATUS";
public static final String ORDERSET_RETURN_MEMBER_INTEGRAL="ORDERSET_RETURN_MEMBER_INTEGRAL";
public static final String ORDERSET_RETURN_SHOP_INTEGRAL="ORDERSET_RETURN_SHOP_INTEGRAL";
+
+ public static final String INTERALSET_DEDUCTINTEGRALLIMIT="INTERALSET_DEDUCTINTEGRALLIMIT";
+ public static final String INTERALSET_MININTEGRALPRICELIMIT="INTERALSET_MININTEGRALPRICELIMIT";
+ public static final String INTERALSET_INTEGRALINVALIDTYPE="INTERALSET_INTEGRALINVALIDTYPE";
+ public static final String INTERALSET_INTEGRALINVALIDCIRCLE="INTERALSET_INTEGRALINVALIDCIRCLE";
+ public static final String INTERALSET_INTEGRALRULEINFO="INTERALSET_INTEGRALRULEINFO";
+
public static final String ORDERSET_TOTAL_RATE="ORDERSET_TOTAL_RATE";
public static final String ORDER_SET ="ORDER_SET" ;
+ public static final String INTEGRAL_SET ="INTEGRAL_SET" ;
/**
* mq tag
@@ -63,6 +72,8 @@
public static final String CASH_EXCHANGE_INTEGRAL_RATA = "CASH_EXCHANGE_INTEGRAL_RATA";//鐜伴噾-绉垎鍏戞崲姣斾緥锛�1鍏冨彲寰楀埌XXX绉垎锛�
+
+
public static final String INITIAL_ROLE = "INITIAL_ROLE";
@@ -847,15 +858,18 @@
SHARE_INFO(6,"鍒嗕韩璧勮","鍒嗕韩璧勮",0),
POST_COMMENTS(7,"鍙戝竷璇勮","鍙戝竷璇勮",0),
COFFEE_MAP_CONSUME(8,"鍜栧暋鍦板浘娑堣垂","鍜栧暋鍦板浘娑堣垂",0),
- SHOP_ORDER(9,"浣欓鎶垫墸鍟嗗搧","浣欓鎶垫墸鍟嗗搧",1),
+ 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) //骞村害缁撶畻
+ SHOP_ORDER_CANCEL(14,"绉垎鎶垫墸鍟嗗搧閫�杩�","绉垎鎶垫墸鍟嗗搧閫�杩�",0),
+ ORDER_DONATE(15,"璁㈠崟璧犻�佺Н鍒�","璁㈠崟璧犻�佺Н鍒�",0),
+ ORDER_DONE_AMOUNT(16,"璁㈠崟缁撶畻閲戦","璁㈠崟缁撶畻閲戦",0),
+
+ SHOP_ORDER_SETTLEMENT(16,"涓嬪崟缁撶畻閲戦","涓嬪崟缁撶畻閲戦",0), //缁忛攢鍟嗕笅鍗曠粨绠楅噾棰�
+ SHOP_ORDER_CANCEL_SETTLEMENT(17,"鍙栨秷璁㈠崟缁撶畻閲戦杩旇繕","鍙栨秷璁㈠崟缁撶畻閲戦杩旇繕",0), //鍙栨秷璁㈠崟缁撶畻閲戦杩旇繕
+ SHOP_YEAR_SETTLEMENT(18,"骞村害缁撶畻","骞村害缁撶畻",0) //骞村害缁撶畻
;
// 鎴愬憳鍙橀噺
private String name;
@@ -945,6 +959,8 @@
BIG_AREA(13, "鍖哄煙鍒嗙被", "鍖哄煙鍒嗙被"),
APPLICABLE_BRAND(14, "閫傜敤鍝佺墝", "閫傜敤鍝佺墝"),
SERIES_BRAND(15, "鍝佺墝绯诲垪", "鍝佺墝绯诲垪"),
+ YUN_FEE(16, "杩愯垂閰嶇疆", "杩愯垂閰嶇疆"),
+ EXPRESS_DELIVERY(17, "蹇�掍俊鎭�", "蹇�掍俊鎭�"),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -1129,5 +1145,52 @@
}
}
+ public enum UserActionType {
+ CHANGE_SHOP(0, "缁忛攢鍟嗘洿鎹�","鐢便��${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