From 0a206f3acb9af0ec9db650861d34a256cda1c960 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 26 二月 2026 17:48:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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 73fe3ef..7a0c14a 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 {
@@ -899,7 +894,6 @@
ORDER_DONE_AMOUNT(16,"璁㈠崟缁撶畻","${param1}璁㈠崟缁撶畻鎴愬姛锛岃幏寰楋骏${param}",0,1),//${param}璁㈠崟缂栧彿锛�${param1}閲戦
WITHDRAW_APPLY(17,"浣欓鎻愮幇","浣欓鎻愮幇宸叉彁浜わ紝娑堣�楋骏${param}",0,1),
WITHDRAW_APPLY_BACK(19,"鎻愮幇閫�鍥�","浣欓鎻愮幇澶辫触锛岃幏寰楋骏${param}",0,1),
-// ORDER_DONE_AMOUNT_BACK(20,"璁㈠崟缁撶畻閫�鍥�","${param1}璁㈠崟缁撶畻閫�鍥烇紝娑堣�楋骏${param}鍏�",0,1),//${param}璁㈠崟缂栧彿锛�${param1}閲戦
SHOP_ORDER_REFUND_CASH(25,"璁㈠崟閫�娆�","${param1}璁㈠崟閫�娆撅紝鎵ｉ櫎缁撶畻閲戦锟�${param}",0,0),
@@ -1319,7 +1313,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);
@@ -1359,4 +1353,12 @@
}
return null;
}
+
+ public static String getBankInfo(String bankName, String bankAccount){
+ return bankName + "("+
+ bankAccount.
+ replaceAll("^.*(.{4})$", "$1")
+ + ")";
+ }
+
}
--
Gitblit v1.9.3