From 8fd09daba5c89106b4a9aacd8d5ef9354afc93be Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期六, 28 二月 2026 14:22:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java | 205 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 147 insertions(+), 58 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 711f9bf..0957b51 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
@@ -2,10 +2,7 @@
import cn.binarywang.wx.miniapp.bean.WxMaCodeLineColor;
import com.doumee.core.wx.WxMiniConfig;
-import com.doumee.dao.business.model.Areas;
-import io.swagger.annotations.ApiModelProperty;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import java.io.ByteArrayInputStream;
@@ -13,8 +10,6 @@
import java.math.BigDecimal;
import java.net.URLDecoder;
import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
@Slf4j
public class Constants {
@@ -27,41 +22,51 @@
public static final int FOUR = 4 ;
public static final String LABELS_IMG ="LABELS_IMG" ;
public static final String ORDERSET_REG_INTEGRAL_REWARD_STATUS = "ORDERSET_REG_INTEGRAL_REWARD_STATUS";
- public static final String ORDERSET_SHARE_INTEGRAL_REWARD_STATUS="ORDERSET_SHARE_INTEGRAL_REWARD_STATUS";
- public static final String ORDERSET_REG_COUPON_REWARD_STATUS="ORDERSET_REG_COUPON_REWARD_STATUS";
- public static final String ORDERSET_SHARE_COUPON_REWARD_STATUS="ORDERSET_SHARE_COUPON_REWARD_STATUS";
- public static final String ORDERSET_REG_INTEGRAL_REWARD="ORDERSET_REG_INTEGRAL_REWARD";
- public static final String ORDERSET_SHARE_INTEGRAL_REWARD="ORDERSET_SHARE_INTEGRAL_REWARD";
- public static final String ORDERSET_REG_COUPON_REWARD_LIST="ORDERSET_REG_COUPON_REWARD_LIST";
- public static final String ORDERSET_SHARE_COUPON_REWARD_LIST="ORDERSET_SHARE_COUPON_REWARD_LIST";
- public static final String ORDERSET_RETURN_MEMBER_INTEGRAL_STATUS="ORDERSET_RETURN_MEMBER_INTEGRAL_STATUS";
- 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 ORDERSET_SHARE_INTEGRAL_REWARD_STATUS="ORDERSET_SHARE_INTEGRAL_REWARD_STATUS";
+ public static final String ORDERSET_REG_COUPON_REWARD_STATUS="ORDERSET_REG_COUPON_REWARD_STATUS";
+ public static final String ORDERSET_SHARE_COUPON_REWARD_STATUS="ORDERSET_SHARE_COUPON_REWARD_STATUS";
+ public static final String ORDERSET_REG_INTEGRAL_REWARD="ORDERSET_REG_INTEGRAL_REWARD";
+ public static final String ORDERSET_SHARE_INTEGRAL_REWARD="ORDERSET_SHARE_INTEGRAL_REWARD";
+ public static final String ORDERSET_REG_COUPON_REWARD_LIST="ORDERSET_REG_COUPON_REWARD_LIST";
+ public static final String ORDERSET_SHARE_COUPON_REWARD_LIST="ORDERSET_SHARE_COUPON_REWARD_LIST";
+ public static final String ORDERSET_RETURN_MEMBER_INTEGRAL_STATUS="ORDERSET_RETURN_MEMBER_INTEGRAL_STATUS";
+ 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 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 ORDERSET_TOTAL_RATE="ORDERSET_TOTAL_RATE";
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_";
+ public static final String PRIVACY_AGREEMENT = "PRIVACY_AGREEMENT";
+ public static final String ABOUT_US = "ABOUT_US";
+ public static final String SERVER_INTRODUCE = "SERVER_INTRODUCE";
+ public static final String SERVER_PHONE ="SERVER_PHONE" ;
+ public static final String SHOP_INTEGRAL_BG ="SHOP_INTEGRAL_BG" ;
+ public static final String USER_INVITE_BG ="USER_INVITE_BG" ;
+ public static final String CENTER_INVITE_BG ="CENTER_INVITE_BG" ;
+ public static final String USER_SHARE_BG ="USER_SHARE_BG" ;
+
+
/**
* mq tag
*/
public interface MQ_TAG{
- String order = "order";
+ String order = "order";
String activity = "activity";
}
public interface MQ_KEY{
- String activity_looknum = "looknum";
- String activity_signup = "signup";
+ String activity_looknum = "looknum";
+ String activity_signup = "signup";
}
public static final String SUCCESS_STR = "SUCCESS" ;
@@ -122,23 +127,23 @@
public static final String POST_COMMENTS="POST_COMMENTS";//鍙戝竷璇勮
public static final String COFFEE_MAP_CONSUME="COFFEE_MAP_CONSUME";//鍜栧暋鍦板浘娑堣垂
- //锛堝彂鐜帮級
+ //锛堝彂鐜帮級
public static final String ACTIVITY_FILE = "ACTIVITY";
- //杞挱锛�
+ //杞挱锛�
public static final String BANNER_FILE = "BANNER";
- //(鍟嗗搧)
+ //(鍟嗗搧)
public static final String GOODS_FILE = "GOODS";
- //(鐢ㄦ埛锛�
+ //(鐢ㄦ埛锛�
public static final String MEMBER_FILE = "MEMBER";
- //鍟嗗
+ //鍟嗗
public static final String SHOP_FILE = "SHOP";
- //(绯荤粺閰嶇疆绛夛級
+ //(绯荤粺閰嶇疆绛夛級
public static final String SYSTEM_FILE = "SYSTEM";
- //(璇勮锛�
+ //(璇勮锛�
public static final String COMMENT_FILE = "COMMENT";
- //鍏朵粬锛�
+ //鍏朵粬锛�
public static final String OTHER_FILE = "OTHER";
- //
+ //
public static final String AFTERSALE_FILE = "AFTERSALE";
public static final String COFFEE_ARTICLE_BACKGROUND = "COFFEE_ARTICLE_BACKGROUND";
@@ -357,6 +362,7 @@
AFTERSALE_APPLY(8, "鐢宠鍞悗琛ュ厖璇存槑闄勪欢", "鐢宠鍞悗琛ュ厖璇存槑闄勪欢"),
AFTERSALE_KD(9, "鐢宠鍞悗閭瘎璇存槑闄勪欢", "鐢宠鍞悗閭瘎璇存槑闄勪欢"),
TRANSFER_FILE(10, "鎵撴鍑瘉", "鎵撴鍑瘉"),
+ COMMENT_FILE(11, "璇勮闄勪欢", "璇勮闄勪欢"),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -623,8 +629,7 @@
DONE(3, "浜ゆ槗瀹屾垚", "浜ゆ槗瀹屾垚"),
CLOSE(4, "宸插叧闂�", "宸插叧闂�"),
PART_DONE(5, "閮ㄥ垎鍙戣揣", "閮ㄥ垎鍙戣揣"),
-
-
+ REFUND(6, "璁㈠崟閫�娆�", "璁㈠崟閫�娆�"),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -749,7 +754,7 @@
}
public enum ShareType{
-// 0娲诲姩1鎺㈠簵2鍜ㄨ3搴楅摵 4鍟嗗搧5鍒嗕韩閭�璇锋捣鎶�
+ // 0娲诲姩1鎺㈠簵2鍜ㄨ3搴楅摵 4鍟嗗搧5鍒嗕韩閭�璇锋捣鎶�
SHARE_ACTIVITY_ACTIVITY(0,"娲诲姩","娲诲姩"),
SHARE_ACTIVITY_VISITSHOP(1,"鎺㈠簵","鍜ㄨ"),
SHARE_ACTIVITY_NEW(2,"鍜ㄨ","鍜ㄨ"),
@@ -851,29 +856,95 @@
+ //瀵硅薄绫诲瀷 0鍟嗗煄璁㈠崟 1绉垎娴佹按 2浼樻儬鍒稿彂鏀� 3杩囨湡鎻愰啋 4绀惧尯娑堟伅
public enum NoticeType{
+ NOTICE_ORDER_SEND(10,"鍟嗗煄璁㈠崟",0,0,"璁㈠崟宸插彂璐�","鎮ㄨ喘涔扮殑鍟嗗搧璁㈠崟锛歿param} 宸插彂璐�"),
+ NOTICE_ORDER_WRITE_OFF(11,"鍟嗗煄璁㈠崟",0,0,"璁㈠崟宸叉牳閿�","鎮ㄨ喘涔扮殑鍟嗗搧璁㈠崟锛歿param} 宸叉牳閿�"),
+ NOTICE_ORDER_REFUND(12,"鍟嗗煄璁㈠崟",0,0,"璁㈠崟宸查��娆�","鎮ㄨ喘涔扮殑鍟嗗搧璁㈠崟锛歿param} 宸查��娆�"),
-// 0璁㈠崟閫氱煡 1绯荤粺娑堟伅 2浜掑姩娑堟伅 3浼樻儬鍒告彁閱� 4瀹樻柟瀹㈡湇 5娲诲姩鎺ㄨ崘 6鎴戠殑鍏虫敞
+ INTEGRAL_INVITE(20,"绉垎娴佹按",1,0,"绉垎鍙樺姩閫氱煡","閭�璇峰ソ鍙嬫垚鍔燂紝鑾峰緱{param}绉垎"),
- NOTICE_ORDER(0,"0璁㈠崟閫氱煡","0璁㈠崟閫氱煡"),
- NOTICE_SYSTEM(1,"1绯荤粺娑堟伅","1绯荤粺娑堟伅"),
- NOTICE_INTERACTION(2,"浜掑姩娑堟伅","浜掑姩娑堟伅"),
- NOTICE_MEMBER_COUPON(3,"浼樻儬鍒告彁閱�","浼樻儬鍒告彁閱�"),
- NOTICE_ACTIVITY(5,"娲诲姩鎺ㄨ崘","娲诲姩鎺ㄨ崘"),
- NOTICE_MEMBER_FOLLOW(6,"鎴戠殑鍏虫敞","鎴戠殑鍏虫敞")
+ COUPON(30,"浼樻儬鍒稿彂鏀�",2,0,"浼樻儬鍒稿彂鏀�","宸茶幏寰椾紭鎯犲埜锛寋param}"),
+
+
+ EXPIRE_INTEGRAL(40,"绉垎杩囨湡鎻愰啋",3,0,"绉垎鍗冲皢杩囨湡","鎮ㄦ湁{param}绉垎鍗冲皢杩囨湡"),
+ EXPIRE_COUPON(41,"浼樻儬鍒稿彂鏀�",3,0,"浼樻儬鍒稿彂鏀�","鎮ㄦ湁{param}寮犱紭鎯犲埜灏嗗湪{param2}杩囨湡"),
+
+ COMMENT(50,"绀惧尯娑堟伅",4,1,"鏀跺埌璇勮","{param}鍥炲浜嗘偍鐨勮瘎璁�"),
+
;
private Integer key;
+ private String info; //娑堟伅鍚嶇О
+ private Integer objType; //瀵硅薄绫诲瀷 0鍟嗗煄璁㈠崟 1绉垎娴佹按 2浼樻儬鍒稿彂鏀� 3杩囨湡鎻愰啋 4绀惧尯娑堟伅
+ private Integer noticeType; //娑堟伅绫诲瀷 0=绯荤粺娑堟伅锛�1=绀惧尯娑堟伅
+ private String title;//鏍囬
+ private String content; //鎻愮ず鏂囨
- private String type;
-
- private String content;
-
- NoticeType(Integer key, String type, String content) {
+ NoticeType(Integer key,String info, Integer objType, Integer noticeType,String title,String content) {
this.key = key;
- this.type = type;
+ this.objType = objType;
+ this.noticeType = noticeType;
+ this.info = info;
+ this.title = title;
this.content = content;
}
+
+
+ public Integer getKey() {
+ return key;
+ }
+
+ public void setKey(Integer key) {
+ this.key = key;
+ }
+
+
+ public Integer getObjType() {
+ return objType;
+ }
+
+ public void setObjType(Integer objType) {
+ this.objType = objType;
+ }
+
+
+ public Integer getNoticeType() {
+ return noticeType;
+ }
+
+ public void setNoticeType(Integer noticeType) {
+ this.noticeType = noticeType;
+ }
+
+
+ public String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
+
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+
}
/**
@@ -881,23 +952,26 @@
*/
public enum IntegralObjType {
REGISTER(0, "娉ㄥ唽绉垎濂栧姳", "娉ㄥ唽鎴愬姛锛岃幏寰�${param}绉垎",0,0),
- INVITENEWUSER(3, "閭�璇峰ソ鍙嬪緱绉垎", "鎺ㄨ崘濂藉弸${param}鎴愬姛锛岃幏寰�${param1}绉垎",0,0),
+ INVITENEWUSER(3, "閭�璇峰ソ鍙嬪緱绉垎", "鎺ㄨ崘濂藉弸${param1}鎴愬姛锛岃幏寰�${param}绉垎",0,0),
SYSTEM_RECHARGE(12,"绉垎鍙戞斁","骞冲彴濂栧姳锛岃幏寰�${param}绉垎",0,0),
SYSTEM_DEDUCT(13,"绉垎鎵ｉ櫎","骞冲彴鎵ｅ噺锛屾秷鑰�${param}绉垎",0,0),
MEMBER_ORDER_CANCEL(14,"鍙栨秷璁㈠崟閫�鍥�","浜ゆ槗閫�娆鹃��鍥烇紝鑾峰緱${param}绉垎",0,0),
+ MEMBER_ORDER_REFUND(28,"璁㈠崟閫�娆�","璁㈠崟閫�娆撅紝杩旇繕璁㈠崟娑堣��${param}绉垎",0,0),
MEMBER_ORDER(9,"涓嬪崟鎶垫墸","娑堣垂鎶垫墸锛屾秷鑰�${param}绉垎",1,0),
ORDER_DONATE(15,"娑堣垂杩旂Н鍒�","璐墿鎴愬姛锛岃幏寰�${param}绉垎",0,0),
SHOP_YEAR_SETTLEMENT(18,"绉垎杩囨湡","绉垎杩囨湡锛屾秷鑰�${param}绉垎",0,0),
+ MEMBER_ORDER_REFUND_RETURN(27,"璁㈠崟閫�娆�","璁㈠崟閫�娆撅紝鎵ｉ櫎璁㈠崟杩旇繕${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}閲戦
+ ORDER_DONE_AMOUNT(16,"璁㈠崟缁撶畻","${param1}璁㈠崟缁撶畻鎴愬姛锛岃幏寰楋骏${param}",0,1),//${param}璁㈠崟缂栧彿锛�${param1}閲戦
+ WITHDRAW_APPLY(17,"浣欓鎻愮幇","浣欓鎻愮幇宸叉彁浜わ紝娑堣�楋骏${param}",0,1),
+ WITHDRAW_APPLY_BACK(19,"鎻愮幇閫�鍥�","浣欓鎻愮幇澶辫触锛岃幏寰楋骏${param}",0,1),
+ SHOP_ORDER_REFUND_CASH(25,"璁㈠崟缁撶畻閫�鍥�","${param1}璁㈠崟閫�娆撅紝鎵ｉ櫎缁撶畻閲戦锟�${param}",0,0),
- SHOP_ORDER(21,"娑堣垂杩旂Н鍒�","浼氬憳${param}浜ゆ槗鎴愬姛锛岃幏寰�${param1}绉垎",0,0),//${param}鏄电О-鎵嬫満鍙�
- SHOP_ORDER_CANCEL(22,"璁㈠崟鍙栨秷閫�鍥�","璁㈠崟鍙栨秷閫�鍥烇紝閫�鍥�${param}绉垎",0,0),
+ SHOP_ORDER(21,"娑堣垂杩旂Н鍒�","浼氬憳${param1}浜ゆ槗鎴愬姛锛岃幏寰�${param}绉垎",0,0),//${param}鏄电О-鎵嬫満鍙�
+ // SHOP_ORDER_CANCEL(22,"璁㈠崟鍙栨秷閫�鍥�","璁㈠崟鍙栨秷閫�鍥烇紝閫�鍥�${param}绉垎",0,0),
+ SHOP_ORDER_REFUND_INTEGRAL(26,"璁㈠崟閫�娆�","璁㈠崟閫�娆撅紝鎵ｉ櫎璁㈠崟杩旇繕${param}绉垎",0,0),
SHOP_SYSTEM_RECHARGE(23,"绉垎鍙戞斁","骞冲彴濂栧姳锛岃幏寰�${param}绉垎",0,0),
SHOP_SYSTEM_DEDUCT(24,"绉垎鎵ｉ櫎","骞冲彴鎵ｅ噺锛屾秷鑰�${param}绉垎",0,0),
@@ -1311,7 +1385,7 @@
// 鍦烘櫙鐮侊紝涓庡墠绔害瀹氾紝鏈�缁堟槸闇�瑕佸墠绔В鏋�
body.put("scene", scene);
// 姝ｅ紡鐗堜负 "release"锛屼綋楠岀増涓� "trial"锛屽紑鍙戠増涓� "develop"銆傞粯璁ゆ槸姝ｅ紡鐗堛��
- String env_version = "release";
+ String env_version = "develop";
body.put("env_version", env_version);
if(isUsePage){
body.put("page", page);
@@ -1351,4 +1425,19 @@
}
return null;
}
+
+ public static String getBankInfo(String bankName, String bankAccount){
+ return bankName + "("+
+ bankAccount.
+ replaceAll("^.*(.{4})$", "$1")
+ + ")";
+ }
+
+
+
+
+
+
+
+
}
--
Gitblit v1.9.3